JBoss Tools SVN: r24872 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-10 10:43:40 -0400 (Fri, 10 Sep 2010)
New Revision: 24872
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7016 junit test have been added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2010-09-10 14:20:07 UTC (rev 24871)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2010-09-10 14:43:40 UTC (rev 24872)
@@ -11,13 +11,19 @@
package org.jboss.tools.jsf.test.validation;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.wst.validation.ValidationFramework;
+import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import junit.framework.TestCase;
@@ -42,7 +48,16 @@
project.build(IncrementalProjectBuilder.FULL_BUILD,
new NullProgressMonitor());
}
-
+ //junit test add to check JBIDE-7016 by Maksim Areshkau
+ public void testCreatingFile() throws CoreException, IOException{
+ final IFile createdFile = JSF2ResourceUtil
+ .createCompositeComponentFile(project,
+ new Path("/jbide7016/jbide7016test.xhtml"), new String[0]); //$NON-NLS-1$
+ //this method throw exception if file isn't accessible for some reasons
+ InputStream is = createdFile.getContents();
+ is.close();
+ }
+
public void testJSF2ComponentsValidator() throws Exception {
ValidationFramework.getDefault().validate(new IProject[] { project },
false, false, new NullProgressMonitor());
15 years, 7 months
JBoss Tools SVN: r24871 - in trunk/seam: plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-09-10 10:20:07 -0400 (Fri, 10 Sep 2010)
New Revision: 24871
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/ChangeScopeMarkerResolution.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/RenameAnnotationMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6873, https://jira.jboss.org/browse/JBIDE-6871
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -98,6 +98,9 @@
public static final int OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID = 9;
public static final int STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE_ID = 10;
public static final int STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID = 11;
+ public static final int STATEFUL_COMPONENT_WRONG_SCOPE_ID = 12;
+ public static final int ENTITY_COMPONENT_WRONG_SCOPE_ID = 13;
+ public static final int UNKNOWN_COMPONENT_PROPERTY_ID = 14;
private ISeamProject seamProject;
@@ -716,7 +719,7 @@
if(type!=null) {
boolean ok = type.isBinary() || SeamUtil.findProperty(type, name)!=null;
if(!ok) {
- addError(SeamValidationMessages.UNKNOWN_COMPONENT_PROPERTY, SeamPreferences.UNKNOWN_COMPONENT_PROPERTY, new String[]{type.getElementName(), componentName, name}, property, declaration.getResource());
+ addError(SeamValidationMessages.UNKNOWN_COMPONENT_PROPERTY, SeamPreferences.UNKNOWN_COMPONENT_PROPERTY, new String[]{type.getElementName(), componentName, name}, property, declaration.getResource(), UNKNOWN_COMPONENT_PROPERTY_ID);
}
}
}
@@ -730,7 +733,7 @@
ScopeType scope = component.getScope();
if(scope == ScopeType.STATELESS) {
ITextSourceReference location = getScopeLocation(component);
- addError(SeamValidationMessages.ENTITY_COMPONENT_WRONG_SCOPE, SeamPreferences.ENTITY_COMPONENT_WRONG_SCOPE, new String[]{component.getName()}, location, javaDeclaration.getResource());
+ addError(SeamValidationMessages.ENTITY_COMPONENT_WRONG_SCOPE, SeamPreferences.ENTITY_COMPONENT_WRONG_SCOPE, new String[]{component.getName()}, location, javaDeclaration.getResource(), ENTITY_COMPONENT_WRONG_SCOPE_ID);
}
}
}
@@ -764,7 +767,7 @@
ScopeType scope = component.getScope();
if(scope == ScopeType.PAGE || scope == ScopeType.STATELESS) {
ITextSourceReference location = getScopeLocation(component);
- addError(SeamValidationMessages.STATEFUL_COMPONENT_WRONG_SCOPE, SeamPreferences.STATEFUL_COMPONENT_WRONG_SCOPE, new String[]{component.getName()}, location, javaDeclaration.getResource());
+ addError(SeamValidationMessages.STATEFUL_COMPONENT_WRONG_SCOPE, SeamPreferences.STATEFUL_COMPONENT_WRONG_SCOPE, new String[]{component.getName()}, location, javaDeclaration.getResource(), STATEFUL_COMPONENT_WRONG_SCOPE_ID);
}
validateDuplicateComponentMethod(SeamComponentMethodType.REMOVE, component, SeamValidationMessages.DUPLICATE_REMOVE, SeamPreferences.DUPLICATE_REMOVE, DUPLICATE_REMOVE_MESSAGE_ID);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -380,6 +380,8 @@
public static String ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE;
+ public static String CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -213,7 +213,7 @@
}
}
- protected void renameAnnotation(String annotationString){
+ protected void renameAnnotation(String annotationString, String importName, boolean generate){
try{
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
@@ -226,10 +226,18 @@
IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
if(importDeclaration == null || !importDeclaration.exists())
compilationUnit.createImport(qualifiedName, null, new NullProgressMonitor());
+ if(importName != null){
+ importDeclaration = compilationUnit.getImport(importName);
+ if(importDeclaration == null || !importDeclaration.exists())
+ compilationUnit.createImport(importName, null, new NullProgressMonitor());
+
+ }
IBuffer buffer = compilationUnit.getBuffer();
- String name= "(\""+generateComponentName(compilationUnit.findPrimaryType().getElementName())+"\")";
+ String name = "";
+ if(generate)
+ name= "(\""+generateComponentName(compilationUnit.findPrimaryType().getElementName())+"\")";
buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), annotationString+name);
compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/ChangeScopeMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/ChangeScopeMarkerResolution.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/ChangeScopeMarkerResolution.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.marker;
+
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+
+/**
+ * @author Daniel Azarov
+ */
+public class ChangeScopeMarkerResolution extends
+ AbstractSeamMarkerResolution {
+ private String scopeName;
+
+ public ChangeScopeMarkerResolution(String label, String scopeName,
+ IFile file, int start, int end) {
+ super(label, "org.jboss.seam.annotations.Scope", file, start, end); //$NON-NLS-1$
+ this.label = MessageFormat.format(label, new Object[]{scopeName});
+ this.scopeName = scopeName;
+ }
+
+ public void run(IMarker marker) {
+ renameAnnotation("@Scope("+scopeName+")", "org.jboss.seam.ScopeType", false); //$NON-NLS-1$
+ }
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/ChangeScopeMarkerResolution.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/RenameAnnotationMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/RenameAnnotationMarkerResolution.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/RenameAnnotationMarkerResolution.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -25,6 +25,6 @@
}
public void run(IMarker marker) {
- renameAnnotation("@"+getShortName()); //$NON-NLS-1$
+ renameAnnotation("@"+getShortName(), null, true); //$NON-NLS-1$
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -90,6 +90,27 @@
return new IMarkerResolution[]{new AddAnnotatedMethodMarkerResolution(SeamUIMessages.ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE, "javax.ejb.Remove", file, start, end)};
else if(messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID)
return new IMarkerResolution[]{new AddAnnotatedMethodMarkerResolution(SeamUIMessages.ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)};
+ else if(messageId == SeamCoreValidator.STATEFUL_COMPONENT_WRONG_SCOPE_ID)
+ return new IMarkerResolution[]{
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.APPLICATION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.BUSINESS_PROCESS", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.CONVERSATION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.EVENT", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.METHOD", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.SESSION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.UNSPECIFIED", file, start, end)
+ };
+ else if(messageId == SeamCoreValidator.ENTITY_COMPONENT_WRONG_SCOPE_ID)
+ return new IMarkerResolution[]{
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.APPLICATION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.BUSINESS_PROCESS", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.CONVERSATION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.EVENT", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.METHOD", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.PAGE", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.SESSION", file, start, end),
+ new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.UNSPECIFIED", file, start, end)
+ };
return new IMarkerResolution[]{};
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2010-09-10 14:20:07 UTC (rev 24871)
@@ -198,3 +198,4 @@
RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Rename @Name annotation
ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE=Add @Remove annotated method
ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE=Add @Destroy annotated method
+CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE=Change scope to ''{0}''
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -0,0 +1,14 @@
+package org.domain.SeamWebWarTestProject.entity;
+
+import javax.persistence.Entity;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.ScopeType;
+
+@Entity
+(a)Scope(ScopeType.STATELESS)
+@Name("AbcEntity")
+public class EntityComponentWithWrongScope {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -0,0 +1,24 @@
+package org.domain.SeamWebWarTestProject.session;;
+
+import javax.ejb.Stateful;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import javax.ejb.Remove;
+import org.jboss.seam.annotations.Destroy;
+import org.jboss.seam.ScopeType;
+
+(a)Scope(ScopeType.PAGE)
+@Stateful
+@Name("StatefulComponentWithWrongScope")
+public class StatefulComponentWithWrongScope {
+
+ @Remove
+ public void remove() {
+ }
+
+ @Destroy
+ public void destroy() {
+ }
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-10 14:17:29 UTC (rev 24870)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-09-10 14:20:07 UTC (rev 24871)
@@ -28,6 +28,7 @@
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.ui.marker.AddAnnotatedMethodMarkerResolution;
import org.jboss.tools.seam.ui.marker.AddAnnotationMarkerResolution;
+import org.jboss.tools.seam.ui.marker.ChangeScopeMarkerResolution;
import org.jboss.tools.seam.ui.marker.DeleteAnnotationMarkerResolution;
import org.jboss.tools.seam.ui.marker.RenameAnnotationMarkerResolution;
import org.jboss.tools.test.util.JobUtils;
@@ -393,4 +394,52 @@
assertTrue("The quickfix \"Add @Destroy annotated method\" doesn't exist.", found);
}
+ public void testChangeScopeResolution() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ int found = 0;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof ChangeScopeMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Scope", ((ChangeScopeMarkerResolution)resolution).getQualifiedName());
+ found++;
+ }
+ }
+ }
+ assertEquals("Not all quickfixes \"Change scope to...\" found.", 7, found);
+ }
+
+ public void testChangeScopeResolution2() throws CoreException {
+ String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java";
+ IFile file = project.getFile(TARGET_FILE_NAME);
+
+ assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists());
+
+ IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+
+ int found = 0;
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution instanceof ChangeScopeMarkerResolution) {
+ assertEquals("org.jboss.seam.annotations.Scope", ((ChangeScopeMarkerResolution)resolution).getQualifiedName());
+ found++;
+ }
+ }
+ }
+ assertEquals("Not all quickfixes \"Change scope to...\" found.", 8, found);
+ }
+
}
15 years, 7 months
JBoss Tools SVN: r24870 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-10 10:17:29 -0400 (Fri, 10 Sep 2010)
New Revision: 24870
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
Log:
https://jira.jboss.org/browse/JBIDE-7044
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-09-10 14:06:15 UTC (rev 24869)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-09-10 14:17:29 UTC (rev 24870)
@@ -190,7 +190,7 @@
* @see org.jboss.tools.cdi.core.IBean#isSelectedAlternative()
*/
public boolean isSelectedAlternative() {
- if(getDefinition().getAlternativeAnnotation() != null && getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) {
+ if(getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) {
return true;
}
Set<IStereotypeDeclaration> ds = getStereotypeDeclarations();
@@ -198,7 +198,11 @@
IStereotype s = d.getStereotype();
if(s != null && s.isAlternative() &&
getCDIProject().isStereotypeAlternative(s.getSourceType().getFullyQualifiedName()) ) return true;
- }
+ }
+// TODO how it can be selected in this case?
+// if(getDefinition().getAlternativeAnnotation() == null) {
+// return false;
+// }
return false;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-09-10 14:06:15 UTC (rev 24869)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-09-10 14:17:29 UTC (rev 24870)
@@ -243,7 +243,7 @@
* @see org.jboss.tools.cdi.core.IBean#isSelectedAlternative()
*/
public boolean isSelectedAlternative() {
- if(getDefinition().getAlternativeAnnotation() != null && getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) {
+ if(getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) {
return true;
}
Set<IStereotypeDeclaration> ds = getStereotypeDeclarations();
@@ -251,7 +251,12 @@
IStereotype s = d.getStereotype();
if(s != null && s.isAlternative() &&
getCDIProject().isStereotypeAlternative(s.getSourceType().getFullyQualifiedName()) ) return true;
- }
+ }
+// TODO how it can be selected in this case?
+// if(getDefinition().getAlternativeAnnotation() == null) {
+// return false;
+// }
return false;
}
+
}
\ No newline at end of file
15 years, 7 months
JBoss Tools SVN: r24869 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-10 10:06:15 -0400 (Fri, 10 Sep 2010)
New Revision: 24869
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7044
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml 2010-09-10 13:56:27 UTC (rev 24868)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml 2010-09-10 14:06:15 UTC (rev 24869)
@@ -26,6 +26,8 @@
<stereotype>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.DuplicatedAlternativeStereotype</stereotype>
<stereotype>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.DuplicatedAlternativeStereotype</stereotype>
+ <class>org.jboss.jsr299.tck.tests.policy.EnabledSheepProducer</class>
+ <stereotype>org.jboss.jsr299.tck.tests.policy.EnabledPolicyStereotype</stereotype>
</alternatives>
<decorators>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-10 13:56:27 UTC (rev 24868)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-10 14:06:15 UTC (rev 24869)
@@ -34,6 +34,7 @@
import org.jboss.tools.cdi.core.test.tck.QualifierWithMembersTest;
import org.jboss.tools.cdi.core.test.tck.ResolutionByTypeTest;
import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.SelectedAlternativeTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest;
import org.jboss.tools.cdi.core.test.tck.validation.AnnotationsValidationTest;
@@ -83,6 +84,7 @@
suite.addTestSuite(BeansXmlValidationTest.class);
suite.addTestSuite(AnnotationsValidationTest.class);
suite.addTestSuite(CoreValidationTest.class);
+ suite.addTestSuite(SelectedAlternativeTest.class);
suiteAll.addTestSuite(BeansXMLTest.class);
suiteAll.addTestSuite(DependentProjectTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java 2010-09-10 14:06:15 UTC (rev 24869)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IProducer;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class SelectedAlternativeTest extends TCKTest {
+
+ /**
+ * 5.1.1. Declaring selected alternatives for a bean archive
+ * By default, a bean archive has no selected alternatives. An alternative must be explicitly declared using the
+ * <alternatives> element of the beans.xml file of the bean archive. The <alternatives> element contains a list of bean
+ * classes and stereotypes. An alternative is selected for the bean archive if either:
+ *
+ * • the alternative is a managed bean or session bean and the bean class of the bean is listed,
+ */
+ public void testSelectedAlternativeManagedBean() {
+ IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/Cat.java");
+ assertTrue(bean.isSelectedAlternative());
+ }
+
+ /**
+ * • any @Alternative stereotype of the alternative is listed.
+ */
+ public void testSelectedAlternativeStereotype() {
+ IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/policy/Bird.java");
+ assertTrue(bean.isSelectedAlternative());
+ }
+
+ /**
+ * • the alternative is a producer method, field or resource, and the bean class that declares the method or field is listed
+ */
+ public void testSelectedAlternativeProducer() {
+ Set<IBean> beans = cdiProject.getBeans(new Path("/tck/JavaSource/org/jboss/jsr299/tck/tests/policy/EnabledSheepProducer.java"));
+ int producerCount = 0;
+ for (IBean bean: beans) {
+ if(bean instanceof IProducer) {
+ producerCount++;
+ assertTrue(bean.isSelectedAlternative());
+ }
+ }
+ assertEquals(2, producerCount);
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java 2010-09-10 13:56:27 UTC (rev 24868)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java 2010-09-10 14:06:15 UTC (rev 24869)
@@ -18,7 +18,14 @@
* @author Alexey Kazakov
*/
public class BeansXmlValidationTest extends ValidationTest {
+ static int BAR_DECORATOR_LINE = 35; // <class>org.jboss.jsr299.tck.tests.decorators.resolution.BarDecorator</class>
+ static int FOO_LINE = 44; // <class>com.acme.Foo</class>
+ static int CAT_INTERCEPTOR_LINE = FOO_LINE + 1; // <class>org.jboss.jsr299.tck.tests.jbt.validation.interceptors.CatInterceptor</class>
+ static int NON_INTERCEPTOR_LINE = CAT_INTERCEPTOR_LINE + 1; // <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.Foo</class>
+ static int FORD_INTERCEPTOR_1_LINE = CAT_INTERCEPTOR_LINE + 3; // <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.FordInterceptor</class>
+ static int FORD_INTERCEPTOR_2_LINE = FORD_INTERCEPTOR_1_LINE + 1; //
+
/**
* 5.1.1. Declaring selected alternatives for a bean archive
* - Each child <class> element must specify the name of an alternative bean class. If there is no class with the specified
@@ -84,8 +91,8 @@
*/
public void testNonExistantDecoratorClassInBeansXmlNotOK() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 32);
- assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 33);
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 34);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, BAR_DECORATOR_LINE);
}
/**
@@ -95,8 +102,8 @@
*/
public void testEnabledDecoratorNotADecorator() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 35);
- assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 33);
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 37);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, BAR_DECORATOR_LINE);
}
/**
@@ -106,8 +113,8 @@
*/
public void testDecoratorListedTwiceInBeansXmlNotOK() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, 37, 38);
- assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, 33);
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, 39, 40);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, BAR_DECORATOR_LINE);
}
/**
@@ -117,8 +124,8 @@
*/
public void testNonExistantClassInBeansXmlNotOk() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, 42);
- assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, 43);
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, FOO_LINE);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, CAT_INTERCEPTOR_LINE);
}
/**
@@ -128,8 +135,8 @@
*/
public void testNonInterceptorClassInBeansXmlNotOk() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, 44);
- assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, 43);
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, NON_INTERCEPTOR_LINE);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, CAT_INTERCEPTOR_LINE);
}
/**
@@ -139,7 +146,7 @@
*/
public void testSameInterceptorClassListedTwiceInBeansXmlNotOk() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, 46, 47);
- assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, 43);
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, FORD_INTERCEPTOR_1_LINE, FORD_INTERCEPTOR_2_LINE);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, CAT_INTERCEPTOR_LINE);
}
}
\ No newline at end of file
15 years, 7 months
JBoss Tools SVN: r24868 - in trunk/hibernatetools: tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-09-10 09:56:27 -0400 (Fri, 10 Sep 2010)
New Revision: 24868
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6974
Support comments in HQL Editor
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2010-09-10 13:38:56 UTC (rev 24867)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2010-09-10 13:56:27 UTC (rev 24868)
@@ -102,7 +102,7 @@
public void setSession(Session s) {
super.setSession(s);
try {
- query = this.getSession().createQuery(queryString);
+ query = this.getSession().createQuery(getHQLQueryString());
} catch (HibernateException e) {
addException(e);
} catch (Exception e) {
@@ -116,6 +116,58 @@
public String getQueryString() {
return queryString; // cannot use query since it might be null because of an error!
}
+
+ /**
+ * The method removes SQL comments from <code>queryString</code>
+ * as HSL doesn't support comments.
+ * @return
+ */
+ public String getHQLQueryString(){
+ StringBuilder clearHQL = new StringBuilder();
+ int state = 0;
+
+ for (int j = 0; j < queryString.length(); j++) {
+ if ((queryString.charAt(j) == '\n')
+ || ((queryString.charAt(j) == '\r')
+ && (j + 1 < queryString.length())
+ && (queryString.charAt(j + 1) == '\r'))) {
+ state = 0;
+ }
+
+ switch (state) {
+ case -1:// skip all till the end of the line
+ break;
+ case 0:// initial state
+ switch (queryString.charAt(j)) {
+ case '-':
+ if (queryString.length() > j + 1 && queryString.charAt(j + 1) == '-') {
+ state = -1;
+ }
+ break;
+ case '\'':
+ state = 1;
+ break;
+ }
+ break;
+ case 1:// quoted string
+ /*
+ * Escape character for the quote is doubled quote:
+ * Example: 'This is escaped quote ('') inside 1 string'.
+ * Our parser switches to state 0 and back to state 1, hence works correct
+ * without additional efforts.
+ */
+ if (queryString.charAt(j) == '\'') {/*there is no way to escape it in HQL string*/
+ state = 0;
+ }
+ break;
+ }
+ if (state != -1) {
+ clearHQL.append(queryString.charAt(j));
+ }
+ }
+ return clearHQL.toString();
+ }
+
public void setQueryString(String queryString) {
this.queryString = queryString;
list = null;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-09-10 13:38:56 UTC (rev 24867)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-09-10 13:56:27 UTC (rev 24868)
@@ -84,7 +84,22 @@
}
+
+ public void testHQLComments() {
+ consoleCfg.build();
+ consoleCfg.buildSessionFactory();
+ try {
+ consoleCfg.buildSessionFactory();
+ fail(ConsoleTestMessages.ConsoleConfigurationTest_factory_already_exists);
+ } catch (HibernateConsoleRuntimeException hcre) {
+
+ }
+
+ QueryPage qp = consoleCfg.executeHQLQuery("from java.lang.Object --this is my comment"); //$NON-NLS-1$
+ assertNotNull(qp);
+ }
+
/*public void testCleanup() throws InterruptedException {
for(int cnt=0;cnt<10000;cnt++) {
15 years, 7 months
JBoss Tools SVN: r24867 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-10 09:38:56 -0400 (Fri, 10 Sep 2010)
New Revision: 24867
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-7043] tests corrected
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 13:21:53 UTC (rev 24866)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 13:38:56 UTC (rev 24867)
@@ -1002,7 +1002,7 @@
@Test
public void testWinWin7UserAgent() throws IOException {
- TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
+ TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WIN7);
String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ "&utmn=911593326"
+ "&utmhn=jboss.org"
@@ -1023,7 +1023,7 @@
@Test
public void testWinVistaUserAgent() throws IOException {
- TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
+ TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINVISTA);
String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ "&utmn=958593326"
+ "&utmhn=jboss.org"
15 years, 7 months
JBoss Tools SVN: r24866 - trunk/jsf/plugins/org.jboss.tools.jsf.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-10 09:21:53 -0400 (Fri, 10 Sep 2010)
New Revision: 24866
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/build.properties
Log:
https://jira.jboss.org/browse/JBIDE-7016
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-09-10 13:15:41 UTC (rev 24865)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-09-10 13:21:53 UTC (rev 24866)
@@ -5,7 +5,8 @@
dtds/,\
images/,\
.,\
- schemas/
+ schemas/,\
+ resources/templates/
jars.compile.order = .
output.. = bin/
source.. = src/,\
15 years, 7 months
JBoss Tools SVN: r24865 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-10 09:15:41 -0400 (Fri, 10 Sep 2010)
New Revision: 24865
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-7041] put jboss tools version into ad content (utm_content), test triggered, waiting for results
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 13:14:15 UTC (rev 24864)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 13:15:41 UTC (rev 24865)
@@ -935,26 +935,27 @@
/**
* FAILED
*/
- @Test
- public void testJBossToolsVersionInRefererrer() throws IOException {
- TestHttpGetMethod method = new TestHttpGetMethod();
- String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
- + "&utmn=818594305"
- + "&utmhn=jboss.org"
- + "&utmcs=UTF-8"
- + "&utmsr=1920x1080"
- + "&utmsc=24-bit"
- + "&utmul=en-US"
- + "&utmdt=testJBossToolsVersionInRefererrer"
- + "&utmfl=1.6.0_20"
- + "&utmr=1.0.0.qualifier"
- + "&utmp=testJBossToolsVersionInRefererrer"
- + "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
- + "&gaq=1";
- method.request(url);
- assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
- }
+ // @Test
+ // public void testJBossToolsVersionInRefererrer() throws IOException {
+ // TestHttpGetMethod method = new TestHttpGetMethod();
+ // String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ // + "&utmn=818594305"
+ // + "&utmhn=jboss.org"
+ // + "&utmcs=UTF-8"
+ // + "&utmsr=1920x1080"
+ // + "&utmsc=24-bit"
+ // + "&utmul=en-US"
+ // + "&utmdt=testJBossToolsVersionInRefererrer"
+ // + "&utmfl=1.6.0_20"
+ // + "&utmr=1.0.0.qualifier"
+ // + "&utmp=testJBossToolsVersionInRefererrer"
+ // + "&utmac=UA-17645367-1"
+ // +
+ // "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ // + "&gaq=1";
+ // method.request(url);
+ // assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ // }
@Test
public void testJBossToolsVersionInAdContent() throws IOException {
@@ -1019,7 +1020,7 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
@Test
public void testWinVistaUserAgent() throws IOException {
TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
@@ -1040,7 +1041,7 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
@Test
public void testWinXPUserAgent() throws IOException {
TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
@@ -1103,7 +1104,7 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
@Test
public void testMacSnowLeopardUserAgent() throws IOException {
TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.MACOS_SNOWLEO);
@@ -1124,7 +1125,7 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
protected class TestHttpGetMethod extends HttpGetRequest {
private HttpURLConnection urlConnection;
15 years, 7 months
JBoss Tools SVN: r24864 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-10 09:14:15 -0400 (Fri, 10 Sep 2010)
New Revision: 24864
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-7041] put jboss tools version into ad content (utm_content), test triggered, waiting for results
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 12:46:43 UTC (rev 24863)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 13:14:15 UTC (rev 24864)
@@ -966,11 +966,11 @@
+ "&utmsr=1920x1080"
+ "&utmsc=24-bit"
+ "&utmul=en-US"
- + "&utmdt=testJBossToolsVersionInRefererrer"
+ + "&utmdt=testJBossToolsVersionInAdContent"
+ "&utmfl=1.6.0_20"
+ "&utmr=0"
+ "&utm_content=1.0.0.qualifier"
- + "&utmp=testJBossToolsVersionInRefererrer"
+ + "&utmp=testJBossToolsVersionInAdContent"
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
15 years, 7 months
JBoss Tools SVN: r24863 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-10 08:46:43 -0400 (Fri, 10 Sep 2010)
New Revision: 24863
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-7041] put jboss tools version into ad content (utm_content), test triggered, waiting for results
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-10 12:34:31 UTC (rev 24862)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-09-10 12:46:43 UTC (rev 24863)
@@ -118,10 +118,11 @@
appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_AD_CONTENT, googleParameters.getAdContent(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
+
+ googleParameters.visit(); // update visit timestamps and count
- googleParameters.visit();
-
return builder.toString();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-09-10 12:34:31 UTC (rev 24862)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-09-10 12:46:43 UTC (rev 24863)
@@ -56,7 +56,8 @@
public static final String PARAM_COOKIES_UTMCCN = "utmccn";
public static final String PARAM_COOKIES_UTMCMD = "utmcmd";
public static final String PARAM_COOKIES_KEYWORD = "utmctr";
-
+ public static final String PARAM_AD_CONTENT = "utm_content";
+
public static final String VALUE_TRACKING_CODE_VERSION = "4.7.2";
public static final String VALUE_NO_REFERRAL = "0";
public static final String VALUE_ENCODING_UTF8 = "UTF-8";
@@ -101,4 +102,6 @@
public void visit();
public String getFlashVersion();
+
+ public String getAdContent();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:34:31 UTC (rev 24862)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/ReportingEclipseEnvironment.java 2010-09-10 12:46:43 UTC (rev 24863)
@@ -54,4 +54,12 @@
}
return builder.toString();
}
+
+ public String getAdContent() {
+ return getBundleVersion();
+ }
+
+ private String getBundleVersion() {
+ return JBossToolsUsageActivator.getDefault().getBundle().getVersion().toString();
+ }
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 12:34:31 UTC (rev 24862)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-09-10 12:46:43 UTC (rev 24863)
@@ -55,7 +55,9 @@
+ ReportingEclipseEnvironmentFake.JAVA_VERSION
+ "&utmac=UA-17645367-1"
+ "&utmcc=__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ + "&utm_content=" + JBossToolsUsageActivator.getDefault().getBundle().getVersion()
+ "&gaq=1";
+
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, url, targetUrl));
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_HOST_NAME, url, targetUrl));
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, url, targetUrl));
@@ -66,6 +68,7 @@
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, url, targetUrl));
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, url, targetUrl));
assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_FLASH_VERSION, url, targetUrl));
+ assertTrue(areEqualParameterValues(IGoogleAnalyticsParameters.PARAM_AD_CONTENT, url, targetUrl));
assertTrue(hasCookieValue("__utma", url));
assertTrue(hasCookieValue("__utmz", url));
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 12:34:31 UTC (rev 24862)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-10 12:46:43 UTC (rev 24863)
@@ -932,6 +932,9 @@
// assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
// }
+ /**
+ * FAILED
+ */
@Test
public void testJBossToolsVersionInRefererrer() throws IOException {
TestHttpGetMethod method = new TestHttpGetMethod();
@@ -953,6 +956,28 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Test
+ public void testJBossToolsVersionInAdContent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod();
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=818594305"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testJBossToolsVersionInRefererrer"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=0"
+ + "&utm_content=1.0.0.qualifier"
+ + "&utmp=testJBossToolsVersionInRefererrer"
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
enum UserAgentString {
DEFAULT("com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)"),
@@ -975,27 +1000,48 @@
}
@Test
- public void testWin7UserAgent() throws IOException {
- TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WIN7);
+ public void testWinWin7UserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
- + "&utmn=958594305"
+ + "&utmn=911593326"
+ "&utmhn=jboss.org"
+ "&utmcs=UTF-8"
+ "&utmsr=1920x1080"
+ "&utmsc=24-bit"
+ "&utmul=en-US"
- + "&utmdt=testWin7UserAgent"
+ + "&utmdt=testWinWin7UserAgent"
+ "&utmfl=1.6.0_20"
+ "&utmr=1.0.0.qualifier"
- + "&utmp=testWin7UserAgent"
+ + "&utmp=testWinWin7UserAgent"
+ "&utmac=UA-17645367-1"
- + "&utmcc=__utma%3D999.43297292388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&utmcc=__utma%3D999.43297885388356354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ "&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
@Test
+ public void testWinVistaUserAgent() throws IOException {
+ TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
+ String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
+ + "&utmn=958593326"
+ + "&utmhn=jboss.org"
+ + "&utmcs=UTF-8"
+ + "&utmsr=1920x1080"
+ + "&utmsc=24-bit"
+ + "&utmul=en-US"
+ + "&utmdt=testWinVistaUserAgent"
+ + "&utmfl=1.6.0_20"
+ + "&utmr=1.0.0.qualifier"
+ + "&utmp=testWinVistaUserAgent"
+ + "&utmac=UA-17645367-1"
+ + "&utmcc=__utma%3D999.43297885388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B"
+ + "&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
public void testWinXPUserAgent() throws IOException {
TestHttpGetMethod method = new TestHttpGetMethod(UserAgentString.WINXP);
String url = "http://www.google-analytics.com/__utm.gif?utmwv=4.7.2"
15 years, 7 months
