Author: scabanovich Date: 2011-07-12 12:58:10 -0400 (Tue, 12 Jul 2011) New Revision: 32861 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 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/validation/DefenitionErrorsValidationTest.java Log: JBIDE-9313 https://issues.jboss.org/browse/JBIDE-9313 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 16:54:14 UTC (rev 32860) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 16:58:10 UTC (rev 32861) @@ -58,7 +58,7 @@ //Y inherits X indirectly through Q. //X declares inheritable BindingA and BindingC and non-inheritable BindingB //Q overrides declaring BindingC with another value. - Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y"); + Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y"); assertEquals("Wrong number of the beans", 1, beans.size()); IClassBean bean = (IClassBean)beans.iterator().next(); @@ -72,7 +72,7 @@ assertContainsBindingDeclarationWithValue(ds, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingC", "c2"); //Y1 inherits X directly. - beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y1"); + beans = getBeans(false, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y1"); assertEquals("Wrong number of the beans", 1, beans.size()); bean = (IClassBean)beans.iterator().next(); @@ -93,7 +93,7 @@ IInterceptorBinding b = cdiProject.getInterceptorBinding("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.StereotypeAndBinding"); assertNotNull(b); - Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding"); + Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding"); assertEquals("Wrong number of the beans", 1, beans.size()); IBean bean = beans.iterator().next(); assertTrue("The bean should be an interceptor", bean instanceof IClassBean); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 2011-07-12 16:54:14 UTC (rev 32860) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 2011-07-12 16:58:10 UTC (rev 32861) @@ -27,7 +27,7 @@ * @throws JavaModelException */ public void testInheritence() throws JavaModelException { - Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.Horse"); + Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.Horse"); assertEquals("Wrong number of beans.", 1, beans.size()); IBean bean = beans.iterator().next(); assertEquals("Wrong scope type", 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 2011-07-12 16:54:14 UTC (rev 32860) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-07-12 16:58:10 UTC (rev 32861) @@ -120,6 +120,10 @@ } protected Set<IBean> getBeans(String typeName, String... qualifierNames) throws JavaModelException { + return getBeans(true, typeName, qualifierNames); + } + + protected Set<IBean> getBeans(boolean resolve, String typeName, String... qualifierNames) throws JavaModelException { IParametedType type = getType(typeName); assertNotNull("Can't find " + typeName + " type.", type); Set<IType> qualifiers = new HashSet<IType>(); @@ -128,7 +132,7 @@ assertNotNull("Can't find " + name + " type.", qualifier); qualifiers.add(qualifier); } - Set<IBean> beans = cdiProject.getBeans(true, type, qualifiers.toArray(new IType[0])); + Set<IBean> beans = cdiProject.getBeans(resolve, type, qualifiers.toArray(new IType[0])); assertNotNull("There is no beans with " + typeName + " type", beans); return beans; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 16:54:14 UTC (rev 32860) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 16:58:10 UTC (rev 32861) @@ -982,8 +982,11 @@ * @throws Exception */ public void testDecoratorNotResolved() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_DECORATOR, 23); + /* Now we exclude decorators from resolved beans. + * Another test is required - that getBeans(false) - returns decorator, and getBeans(true) does not. + */ +// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java"); +// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_DECORATOR, 23); } /** @@ -993,8 +996,11 @@ * @throws Exception */ public void testInterceptorNotResolved() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_INTERCEPTOR, 7); +/* Now we exclude interceptors from resolved beans. + * Another test is required - that getBeans(false) - returns interceptor, and getBeans(true) does not. + */ +// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java"); +// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_INTERCEPTOR, 7); } /**