Author: scabanovich Date: 2011-07-13 12:19:33 -0400 (Wed, 13 Jul 2011) New Revision: 32898 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.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/DependentProjectTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-07-13 16:09:45 UTC (rev 32897) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-07-13 16:19:33 UTC (rev 32898) @@ -155,122 +155,146 @@ return producer; } + /* + * Case 1. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is not selected. + * Alternative bean C is defined in CDITest2 project. It is not selected. + * + * ASSERT: Injection resolved to bean A. + */ public void testAlternativesInDependentProjects() throws CoreException { - ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true); ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); - - /* - * Case 1. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is not selected. - * Alternative bean C is defined in CDITest2 project. It is not selected. - * - * ASSERT: Injection resolved to bean A. - */ IInjectionPointField f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case1/X.java", "a"); Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("A", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 2. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is not selected. - * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. - * - * ASSERT: Injection resolved to bean C. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case2/X.java", "a"); - bs = cdi2.getBeans(true, f); + /* + * Case 2. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is not selected. + * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. + * + * ASSERT: Injection resolved to bean C. + */ + public void testAlternativesInDependentProjects2() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case2/X.java", "a"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("C", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 3. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2. - * Alternative bean C is defined in CDITest2 project. It is not selected. - * - * ASSERT: Injection resolved to bean B. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case3/X.java", "a"); - bs = cdi2.getBeans(true, f); + /* + * Case 3. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2. + * Alternative bean C is defined in CDITest2 project. It is not selected. + * + * ASSERT: Injection resolved to bean B. + */ + public void testAlternativesInDependentProjects3() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case3/X.java", "a"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("B", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 4-1. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. - * Alternative bean C is defined in CDITest2 project. It is not selected. - * - * ASSERT: Injection resolved to bean A. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case4/X.java", "a"); - bs = cdi2.getBeans(true, f); + /* + * Case 4-1. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. + * Alternative bean C is defined in CDITest2 project. It is not selected. + * + * ASSERT: Injection resolved to bean A. + */ + public void testAlternativesInDependentProjects4_1() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case4/X.java", "a"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("A", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 4-2. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. - * Alternative bean C is defined in CDITest2 project. It is not selected. - * Bean Y is defined in CDITest1 but it is accessed through project CDITest2 - * ASSERT: Injection resolved to bean B. - */ - f = getInjectionPointField(cdi1, "/src/cdi/test/alternative/case4/Y.java", "b"); - bs = cdi2.getBeans(true, f); + /* + * Case 4-2. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. + * Alternative bean C is defined in CDITest2 project. It is not selected. + * Bean Y is defined in CDITest1 but it is accessed through project CDITest2 + * + * ASSERT: Injection resolved to bean B. + */ + public void testAlternativesInDependentProjects4_2() throws CoreException { + ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true); + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi1, "/src/cdi/test/alternative/case4/Y.java", "b"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("B", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 5. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. - * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. - * - * ASSERT: Injection resolved to bean C. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case5/X.java", "a"); - bs = cdi2.getBeans(true, f); + /* + * Case 5. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. + * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. + * + * ASSERT: Injection resolved to bean C. + */ + public void testAlternativesInDependentProjects5() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case5/X.java", "a"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); assertEquals("C", bs.iterator().next().getBeanClass().getElementName()); + } - /* - * Case 6. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2. - * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. - * - * ASSERT: Multiple beans: injection resolved to beans B and C. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case6/X.java", "a"); - bs = cdi2.getBeans(true, f); + /* + * Case 6. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2. + * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2. + * + * ASSERT: Multiple beans: injection resolved to beans B and C. + */ + public void testAlternativesInDependentProjects6() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case6/X.java", "a"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(2, bs.size()); + } - /* - * Case 7. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is not selected. - * Producer bean P is declared in B.p(). - * - * ASSERT: No eligible bean. - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case7/X.java", "p"); - bs = cdi2.getBeans(true, f); + /* + * Case 7. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is not selected. + * Producer bean P is declared in B.p(). + * + * ASSERT: No eligible bean. + */ + public void testAlternativesInDependentProjects7() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case7/X.java", "p"); + Set<IBean> bs = cdi2.getBeans(true, f); assertTrue(bs.isEmpty()); + } - /* - * Case 8. - * Bean A is defined in CDITest1 project. - * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. - * Producer bean P is declared in B.p(). - * - * ASSERT: Injection resolved to bean B.p(). - */ - f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case8/X.java", "p"); - bs = cdi2.getBeans(true, f); + /* + * Case 8. + * Bean A is defined in CDITest1 project. + * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1. + * Producer bean P is declared in B.p(). + * + * ASSERT: Injection resolved to bean B.p(). + */ + public void testAlternativesInDependentProjects8() throws CoreException { + ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); + IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case8/X.java", "p"); + Set<IBean> bs = cdi2.getBeans(true, f); assertEquals(1, bs.size()); IBean b = bs.iterator().next(); assertTrue(b instanceof IProducerMethod);