Author: akazakov Date: 2010-02-26 15:53:23 -0500 (Fri, 26 Feb 2010) New Revision: 20521 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5808 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-02-26 19:51:29 UTC (rev 20520) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-02-26 20:53:23 UTC (rev 20521) @@ -28,7 +28,7 @@ // protected static String WEB_CONTENT = PROJECT_PATH + WEB_CONTENT_SUFFIX; // protected static String WEB_INF = WEB_CONTENT + WEB_INF_SUFFIX; - static String PACKAGE = "/org/jboss/jsr299/tck/tests"; + static String PACKAGE = "/org/jboss/jsr299/tck"; protected static String TCK_RESOURCES_PREFIX = "/resources/tck"; Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-02-26 19:51:29 UTC (rev 20520) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-02-26 20:53:23 UTC (rev 20521) @@ -21,9 +21,9 @@ public class ValidationTest extends TCKTest { public void testLegalTypesInTyped() throws Exception { - IProject p = importPreparedProject("/lookup/typesafe/resolution"); + IProject p = importPreparedProject("/tests/lookup/typesafe/resolution"); IFile petShopFile = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean", 9); + AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean", 25); int markerNumbers = getMarkersNumber(petShopFile); assertEquals("PetShop.java should has the only error marker.", markerNumbers, 1); cleanProject("/lookup/typesafe/resolution"); @@ -33,9 +33,9 @@ * 2.7.1.3. Stereotype declares a non-empty @Named annotation (Non-Portable behavior) */ public void testNonEmptyNamedForStereotype() throws Exception { - IProject p = importPreparedProject("/definition/stereotype"); + IProject p = importPreparedProject("/tests/definition/stereotype"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares a non-empty @Named annotation", 15); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares a non-empty @Named annotation", 31); int markerNumbers = getMarkersNumber(file); assertEquals("StereotypeWithNonEmptyNamed_Broken.java should has the only error marker.", markerNumbers, 1); cleanProject("/definition/stereotype"); @@ -45,9 +45,9 @@ * 2.7.1.3. Stereotype declares any other qualifier annotation */ public void testAnnotatedStereotype() throws Exception { - IProject p = importPreparedProject("/definition/stereotype"); + IProject p = importPreparedProject("/tests/definition/stereotype"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares any qualifier annotation other than @Named", 14); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares any qualifier annotation other than @Named", 30); int markerNumbers = getMarkersNumber(file); assertEquals("StereotypeWithBindingTypes_Broken.java should has the only error marker.", markerNumbers, 1); cleanProject("/definition/stereotype"); @@ -57,7 +57,7 @@ * 2.7.1.3. Stereotype is annotated @Typed */ public void testTypedStereotype() throws Exception { - IProject p = importPreparedProject("/definition/stereotype"); + IProject p = importPreparedProject("/tests/definition/stereotype"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithTyped_Broken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype is annotated @Typed", 15); int markerNumbers = getMarkersNumber(file); @@ -70,9 +70,9 @@ * - stereotype declares more than one scope */ public void testStereotypeScope() throws Exception { - IProject p = importPreparedProject("/definition/stereotype"); + IProject p = importPreparedProject("/tests/definition/stereotype"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares more than one scope", 16, 17); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares more than one scope", 32, 33); int markerNumbers = getMarkersNumber(file); assertEquals("StereotypeWithTooManyScopeTypes_Broken.java should has two error markers.", markerNumbers, 2); cleanProject("/definition/stereotype"); @@ -83,9 +83,9 @@ * - bean class or producer method or field specifies multiple scope type annotations */ public void testMultipleBeanScope() throws Exception { - IProject p = importPreparedProject("/definition/scope"); + IProject p = importPreparedProject("/tests/definition/scope"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies multiple scope type annotations", 6, 7); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies multiple scope type annotations", 22, 23); int markerNumbers = getMarkersNumber(file); assertEquals("StereotypeWithTyped_Broken.java should has two error markers.", markerNumbers, 2); cleanProject("/definition/scope"); @@ -97,9 +97,9 @@ * (there are two different stereotypes declared by the bean that declare different default scopes) */ public void testBeanWithMultipleScopedStereotypes() throws Exception { - IProject p = importPreparedProject("/definition/stereotype"); + IProject p = importPreparedProject("/tests/definition/stereotype"); IFile file = p.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean does not explicitly declare a scope when there is no default scope", 8, 9); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean does not explicitly declare a scope when there is no default scope", 24, 25); int markerNumbers = getMarkersNumber(file); assertEquals("Scallop_Broken.java should has two error markers.", markerNumbers, 2); cleanProject("/definition/stereotype"); Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-02-26 19:51:29 UTC (rev 20520) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-02-26 20:53:23 UTC (rev 20521) @@ -33,7 +33,7 @@ import org.jboss.tools.common.text.ext.util.AxisUtil; public class InjectedPointHyperlinkDetectorTest extends TCKTest { - private static final String PROJECT_NAME = "/lookup/injectionpoint"; + private static final String PROJECT_NAME = "/tests/lookup/injectionpoint"; private static final String FILE_NAME = "JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java"; public static Test suite() { Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-02-26 19:51:29 UTC (rev 20520) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-02-26 20:53:23 UTC (rev 20521) @@ -39,7 +39,7 @@ public CATest() { super(); try { - project = importPreparedProject("/lookup"); + project = importPreparedProject("/tests/lookup"); Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID); String projectPath = project.getLocation().toString(); String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();