[jbosstools-commits] JBoss Tools SVN: r43010 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Aug 13 18:11:05 EDT 2012
Author: scabanovich
Date: 2012-08-13 18:11:04 -0400 (Mon, 13 Aug 2012)
New Revision: 43010
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/TwoWebContentFoldersTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefaultNamedTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseResolutionByTypeTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseScopeDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseStereotypeDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java
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/NameDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResourceExclusionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ScopeDefinitionTest.java
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/StereotypeDefinitionTest.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/lookup/AmbiguousDependencyTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/CircularDependencyTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/UnsatisfiedDependencyTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
JBIDE-12417
https://issues.jboss.org/browse/JBIDE-12417
Replaced Set by Collection in local variables in tests wherever it is possible.
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 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,8 +11,8 @@
package org.jboss.tools.cdi.core.test;
import java.io.IOException;
+import java.util.Collection;
import java.util.Iterator;
-import java.util.Set;
import junit.framework.TestCase;
@@ -67,8 +67,8 @@
IKbProject kb2 = KbProjectFactory.getKbProject(project2, true);
((KbProject)kb2).store();
CDICoreNature cdi2 = CDICorePlugin.getCDI(project2, true);
- Set<CDICoreNature> dependsOn = cdi2.getCDIProjects();
- Set<CDICoreNature> usedBy = cdi2.getDependentProjects();
+ Collection<CDICoreNature> dependsOn = cdi2.getCDIProjects();
+ Collection<CDICoreNature> usedBy = cdi2.getDependentProjects();
assertEquals(1, dependsOn.size());
assertEquals(1, usedBy.size());
cdi2.reloadProjectDependencies();
@@ -127,7 +127,7 @@
private IProducer getProducer(String file) {
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
- Set<IBean> beans = cdi2.getBeans(new Path("/CDITest2/src/test/Test1.java"));
+ Collection<IBean> beans = cdi2.getBeans(new Path("/CDITest2/src/test/Test1.java"));
IProducer producer = null;
for (IBean b: beans) {
if(b instanceof IProducer) {
@@ -150,7 +150,7 @@
public void testAlternativesInDependentProjects() throws CoreException {
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
IInjectionPointField f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case1/X.java", "a");
- Set<IBean> bs = cdi2.getBeans(true, f);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("A", bs.iterator().next().getBeanClass().getElementName());
}
@@ -166,7 +166,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("C", bs.iterator().next().getBeanClass().getElementName());
}
@@ -182,7 +182,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("B", bs.iterator().next().getBeanClass().getElementName());
}
@@ -198,7 +198,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("A", bs.iterator().next().getBeanClass().getElementName());
}
@@ -216,7 +216,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("B", bs.iterator().next().getBeanClass().getElementName());
}
@@ -232,7 +232,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("C", bs.iterator().next().getBeanClass().getElementName());
}
@@ -248,7 +248,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(2, bs.size());
}
@@ -263,7 +263,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertTrue(bs.isEmpty());
}
@@ -278,7 +278,7 @@
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);
+ Collection<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
IBean b = bs.iterator().next();
assertTrue(b instanceof IProducerMethod);
@@ -286,7 +286,7 @@
public void testIndirectDependency() throws CoreException, IOException {
ICDIProject cdi3 = CDICorePlugin.getCDIProject(project3, true);
- Set<IBean> beans = cdi3.getBeans(new Path("/CDITest1/src/cdi/test/MyBean.java"));
+ Collection<IBean> beans = cdi3.getBeans(new Path("/CDITest1/src/cdi/test/MyBean.java"));
assertFalse(beans.isEmpty());
IQualifier q = cdi3.getQualifier("cdi.test.MyQualifier");
assertNotNull(q);
@@ -294,13 +294,13 @@
public void testInjectionOfTypeRepeatedInJarCopies() throws CoreException {
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
- Set<IBean> bs = cdi2.getBeans(new Path("/CDITest2/src/test/MyExampleInjection.java"));
+ Collection<IBean> bs = cdi2.getBeans(new Path("/CDITest2/src/test/MyExampleInjection.java"));
assertEquals(1, bs.size());
IBean b = bs.iterator().next();
- Set<IInjectionPoint> ps = b.getInjectionPoints();
+ Collection<IInjectionPoint> ps = b.getInjectionPoints();
assertEquals(1, ps.size());
IInjectionPoint p = ps.iterator().next();
- Set<IBean> injected = cdi2.getBeans(false, p);
+ Collection<IBean> injected = cdi2.getBeans(false, p);
assertEquals(1, injected.size());
IBean i = injected.iterator().next();
assertTrue(i instanceof IProducerMethod);
@@ -350,12 +350,12 @@
IInjectionPoint point2 = getInjectionPointField(cdi2, "/src/test/BeanI.java", "i");
assertNotNull(point2);
- Set<IBean> bs2 = cdi2.getBeans(false, point2);
+ Collection<IBean> bs2 = cdi2.getBeans(false, point2);
assertEquals(1, bs2.size());
IInjectionPoint point3 = getInjectionPointField(cdi3, project2, "/src/test/BeanI.java", "i");
assertNotNull(point3);
- Set<IBean> bs3 = cdi3.getBeans(false, point3);
+ Collection<IBean> bs3 = cdi3.getBeans(false, point3);
assertEquals(1, bs3.size());
RemoveJarFromClasspathTest.replaceFile(project2, "/src/test/BeanI.changed", "/src/test/BeanI.java");
@@ -385,15 +385,15 @@
public void testFindObservedEvents() throws CoreException {
ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true);
- Set<IBean> bs = cdi1.getBeans(new Path("/CDITest1/src/cdi/test/observers/CDIBeanTest.java"));
+ Collection<IBean> bs = cdi1.getBeans(new Path("/CDITest1/src/cdi/test/observers/CDIBeanTest.java"));
assertFalse(bs.isEmpty());
IBean b = bs.iterator().next();
assertTrue(b instanceof IClassBean);
IClassBean cb = (IClassBean)b;
- Set<IObserverMethod> ms = cb.getObserverMethods();
+ Collection<IObserverMethod> ms = cb.getObserverMethods();
assertEquals(1, ms.size());
IObserverMethod m = ms.iterator().next();
- Set<IInjectionPoint> ps = cdi1.findObservedEvents(m.getObservedParameters().iterator().next());
+ Collection<IInjectionPoint> ps = cdi1.findObservedEvents(m.getObservedParameters().iterator().next());
assertEquals(1, ps.size());
IInjectionPoint p = ps.iterator().next();
assertTrue(p.getDeclaringProject() == CDICorePlugin.getCDIProject(project2, true));
@@ -405,7 +405,7 @@
public void testNonrelevantInjectionPointAtResolvingObserverMethods() {
ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true);
IInjectionPointField tamingEvent = getInjectionPointField(cdi1, "/src/cdi/test/observers/CDIBeanTest.java", "point");
- Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ Collection<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
assertTrue(observers.isEmpty());
}
@@ -430,14 +430,14 @@
public static IInjectionPointField getInjectionPointField(ICDIProject cdi, IProject project, String beanClassFilePath, String fieldName) {
IFile file = project.getFile(beanClassFilePath);
- Set<IBean> beans = cdi.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdi.getBeans(file.getFullPath());
Iterator<IBean> it = beans.iterator();
while(it.hasNext()) {
IBean b = it.next();
if(b instanceof IProducer) it.remove();
}
assertEquals("Wrong number of the beans", 1, beans.size());
- Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
+ Collection<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
if(injectionPoint instanceof IInjectionPointField) {
IInjectionPointField field = (IInjectionPointField)injectionPoint;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,7 +11,7 @@
package org.jboss.tools.cdi.core.test;
import java.io.IOException;
-import java.util.Set;
+import java.util.Collection;
import junit.framework.TestCase;
@@ -42,7 +42,7 @@
public void testBeansXMLInDifferentWebContentFolders() throws CoreException, IOException {
ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
- Set<IBean> bs = cdi.getBeans("bean1", false);
+ Collection<IBean> bs = cdi.getBeans("bean1", false);
assertEquals(1, bs.size());
assertTrue(bs.iterator().next().isSelectedAlternative());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test;
+import java.util.Collection;
import java.util.ConcurrentModificationException;
-import java.util.Set;
import junit.framework.TestCase;
@@ -73,7 +73,7 @@
@Override
public void run() {
- Set<IParametedType> types = t.getAllTypes();
+ Collection<IParametedType> types = t.getAllTypes();
size = types.size();
try {
for (IParametedType t1: types) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
@@ -33,7 +33,7 @@
* @throws CoreException
*/
public void testAssignabilityToRawType() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Dao");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Dao");
assertEquals("Wrong number of the beans", 4, beans.size());
}
@@ -46,7 +46,7 @@
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes() throws CoreException {
IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.MapProducer");
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QMap<QInteger;QInteger;>;");
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
assertEquals("Wrong number of the beans", 2, beans.size());
type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap");
@@ -64,7 +64,7 @@
*/
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java", "map");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap");
}
@@ -81,7 +81,7 @@
*/
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
}
@@ -94,7 +94,7 @@
*/
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards2() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
}
@@ -107,7 +107,7 @@
*/
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection3");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
}
@@ -120,7 +120,7 @@
*/
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeTypeVariable() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection4");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
}
@@ -131,7 +131,7 @@
//@Inject Set<String> s1;
//@Produces <X> HashSet<X> getSet()
IInjectionPointField injection = getInjectionPointField(cls, "s1");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
//@Inject Set<? extends Set<String>> s2;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IType;
@@ -35,13 +35,13 @@
*/
public void testBeanTypesNonEmpty() throws JavaModelException {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/bean/RedSnapper.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
assertEquals("There should be the only bean in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper", 1, beans.size());
beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.bean.RedSnapper");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.RedSnapper type", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue("No legal types were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", bean.getLegalTypes().size() > 0);
- Set<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
+ Collection<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
assertEquals("There should be two type declarations in org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", declarations.size(), 2);
assertLocationEquals(declarations, 936, 10);
assertLocationEquals(declarations, 958, 6);
@@ -55,9 +55,9 @@
* @throws JavaModelException
*/
public void testQualifiersNonEmpty() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.RedSnapper type", 1, beans.size());
- Set<IQualifier> qs = beans.iterator().next().getQualifiers();
+ Collection<IQualifier> qs = beans.iterator().next().getQualifiers();
assertTrue("No qualifiers were found for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", qs.size() > 0);
// Use for next, more sophisticated test
@@ -93,7 +93,7 @@
*
*/
public void testHasScopeType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.RedSnapper");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.RedSnapper type", 1, beans.size());
IBean bean = beans.iterator().next();
IScope scope = bean.getScope();
@@ -109,7 +109,7 @@
* @throws JavaModelException
*/
public void testPrivitiveTypes() throws JavaModelException {
- Set<IBean> beans = getBeans("java.lang.Integer");
+ Collection<IBean> beans = getBeans("java.lang.Integer");
assertFalse("Cannot find bean java.lang.Integer", beans.isEmpty());
beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Animal");
assertFalse("Cannot find bean org.jboss.jsr299.tck.tests.definition.bean.Animal", beans.isEmpty());
@@ -125,7 +125,7 @@
* section 11.1 ba)
*/
public void testBeanTypes() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Tarantula");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Tarantula");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.Tarantula type", 1, beans.size());
IBean bean = beans.iterator().next();
assertContainsBeanTypes(bean, "org.jboss.jsr299.tck.tests.definition.bean.Tarantula",
@@ -135,7 +135,7 @@
"org.jboss.jsr299.tck.tests.definition.bean.DeadlySpider",
"org.jboss.jsr299.tck.tests.definition.bean.DeadlyAnimal");
- Set<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
+ Collection<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
assertEquals("There should be three type declarations in org.jboss.jsr299.tck.tests.definition.bean.Tarantula bean.", declarations.size(), 3);
assertLocationEquals(declarations, 859, 9);
assertLocationEquals(declarations, 877, 6);
@@ -148,7 +148,7 @@
* @throws JavaModelException
*/
public void testAbstractApiType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.FriendlyAntelope");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.FriendlyAntelope");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.FriendlyAntelope type", 1, beans.size());
IBean bean = beans.iterator().next();
assertContainsBeanTypes(bean, "org.jboss.jsr299.tck.tests.definition.bean.FriendlyAntelope",
@@ -156,7 +156,7 @@
"org.jboss.jsr299.tck.tests.definition.bean.Animal",
"java.lang.Object");
- Set<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
+ Collection<ITypeDeclaration> declarations = bean.getAllTypeDeclarations();
assertEquals("There should be three type declarations in org.jboss.jsr299.tck.tests.definition.bean.FriendlyAntelope bean.", declarations.size(), 2);
assertLocationEquals(declarations, 842, 16);
assertLocationEquals(declarations, 867, 16);
@@ -168,7 +168,7 @@
* @throws JavaModelException
*/
public void testFinalApiType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.DependentFinalTuna");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.DependentFinalTuna");
assertFalse("No beans found for org.jboss.jsr299.tck.tests.definition.bean.DependentFinalTuna type", beans.isEmpty());
}
@@ -179,7 +179,7 @@
* @throws JavaModelException
*/
public void testMultipleStereotypes() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.ComplicatedTuna");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.ComplicatedTuna");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.ComplicatedTuna type", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type of org.jboss.jsr299.tck.tests.definition.bean.ComplicatedTuna bean", "javax.enterprise.context.RequestScoped", bean.getScope().getSourceType().getFullyQualifiedName());
@@ -192,7 +192,7 @@
* @throws JavaModelException
*/
public void testBeanExtendsAnotherBean() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Spider");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Spider");
assertFalse("No beans found for org.jboss.jsr299.tck.tests.definition.bean.Spider type", beans.isEmpty());
beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Tarantula");
assertFalse("No beans found for org.jboss.jsr299.tck.tests.definition.bean.Tarantula type", beans.isEmpty());
@@ -204,14 +204,14 @@
* @throws JavaModelException
*/
public void testBeanClassOnSimpleBean() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Horse");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.Horse");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.bean.Horse type", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong Bean Class type of org.jboss.jsr299.tck.tests.definition.bean.Horse bean", "org.jboss.jsr299.tck.tests.definition.bean.Horse", bean.getBeanClass().getFullyQualifiedName());
}
public void testCyclicParametedType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.AbstractJavaSource");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.bean.AbstractJavaSource");
assertFalse(beans.isEmpty());
IBean bean = beans.iterator().next();
IParametedType t = ((ClassBean)bean).getDefinition().getParametedType();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,7 +27,7 @@
* @throws JavaModelException
*/
public void testSimpleSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertContainsBeanTypes(false, bean, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Farmer");
@@ -45,7 +45,7 @@
* @throws JavaModelException
*/
public void testEnterpriseSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertContainsBeanTypes(false, bean, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.FarmerLocal");
@@ -63,7 +63,7 @@
* @throws JavaModelException
*/
public void testSimpleSpecializingBeanHasNameOfSpecializedBean() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Incorrect bean name", "farmer", bean.getName());
@@ -76,14 +76,14 @@
* @throws JavaModelException
*/
public void testEnterpriseSpecializingBeanHasNameOfSpecializedBean() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Incorrect bean name", "farmer", bean.getName());
}
public void testSimpleSpecializingBeanDefinesNameWhenSpecializedBeanIsNotNamed() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.TameLion", "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Tame");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.TameLion", "org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Tame");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Incorrect bean name", "tameLion", bean.getName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,9 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -35,7 +34,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java", "userTransaction");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -51,7 +50,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java", "defaultValidatorFactory");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -67,7 +66,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java", "defaultValidator");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -83,7 +82,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java", "principal");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -99,7 +98,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "manager");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -115,7 +114,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "conversation");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
@@ -138,7 +137,7 @@
String c_active = "JavaSource/org/jboss/jsr299/tck/tests/jbt/builtin/ConversationImpl.changed";
String c_original = "JavaSource/org/jboss/jsr299/tck/tests/jbt/builtin/ConversationImpl.original";
- Set<IBean> beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
+ Collection<IBean> beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
assertEquals(1, beans.size());
IBean b = beans.iterator().next();
assertTrue(b instanceof IClassBean);
@@ -169,7 +168,7 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java", "injectedMetadata");
assertNotNull(field);
- Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ Collection<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,13 +10,12 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
@@ -36,7 +35,7 @@
*/
public void testMethodParameter() throws Exception {
IClassBean bean = getClassBean("org.jboss.jsr299.tck.tests.jbt.core.TestInjection", "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java");
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(9, injections.size());
for (IInjectionPoint injectionPoint : injections) {
IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.core.TestQualifier");
@@ -58,8 +57,8 @@
public void testFindInjectionPoint() throws Exception {
String path = "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection2.java";
IClassBean bean = getClassBean("org.jboss.jsr299.tck.tests.jbt.core.TestInjection2", path);
- Set<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path));
- Set<IInjectionPointParameter> ps = CDIUtil.getInjectionPointParameters(bean);
+ Collection<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path));
+ Collection<IInjectionPointParameter> ps = CDIUtil.getInjectionPointParameters(bean);
assertEquals("Unexpected number of injection points.", 10, ps.size());
int testcount = 0;
for (IInjectionPointParameter p: ps) {
@@ -88,8 +87,8 @@
public void testFindInjectionPoint2() throws Exception {
String path = "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection2.java";
- Set<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path));
- Set<IInjectionPoint> ps = new HashSet<IInjectionPoint>();
+ Collection<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path));
+ Collection<IInjectionPoint> ps = new HashSet<IInjectionPoint>();
for (IBean b: bs) {
ps.addAll(b.getInjectionPoints());
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IBeanField;
@@ -32,12 +32,12 @@
assertTrue(beans.length>0);
for (IBean bean : beans) {
assertElementName(bean);
- Set<IParametedType> types = bean.getAllTypes();
+ Collection<IParametedType> types = bean.getAllTypes();
for (IParametedType type : types) {
String name = type.getSimpleName();
assertNotNull(name);
}
- Set<IInjectionPoint> points = bean.getInjectionPoints();
+ Collection<IInjectionPoint> points = bean.getInjectionPoints();
for (IInjectionPoint point : points) {
assertElementName(point);
if(point.getType()!=null) {
@@ -45,7 +45,7 @@
}
}
if(bean instanceof IClassBean) {
- Set<IBeanMethod> methods = ((IClassBean)bean).getAllMethods();
+ Collection<IBeanMethod> methods = ((IClassBean)bean).getAllMethods();
for (IBeanMethod method : methods) {
assertElementName(method);
}
@@ -60,7 +60,7 @@
public void testFieldName() throws Exception {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/NamedElement.java");
- Set<IProducer> producers = bean.getProducers();
+ Collection<IProducer> producers = bean.getProducers();
assertEquals(2, producers.size());
boolean found = false;
for (IProducer producer : producers) {
@@ -75,7 +75,7 @@
public void testMethodName() throws Exception {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/NamedElement.java");
- Set<IProducer> producers = bean.getProducers();
+ Collection<IProducer> producers = bean.getProducers();
boolean found = false;
for (IProducer producer : producers) {
if(producer instanceof IBeanMethod) {
@@ -89,7 +89,7 @@
public void testParamName() throws Exception {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/NamedElement.java");
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(1, injections.size());
assertEquals("arg1", injections.iterator().next().getElementName());
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,7 +11,7 @@
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -41,7 +41,7 @@
*/
public void testDecoratedTypes() throws JavaModelException, CoreException {
IDecorator decorator = getDecorator("JavaSource/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java");
- Set<IParametedType> types = decorator.getDecoratedTypes();
+ Collection<IParametedType> types = decorator.getDecoratedTypes();
assertContainsTypes(types,
"org.jboss.jsr299.tck.tests.decorators.definition.Foo",
"org.jboss.jsr299.tck.tests.decorators.definition.Bar",
@@ -93,7 +93,7 @@
/*
* Invocation getBeans(false, f) returns all beans that match type and qualifiers.
*/
- Set<IBean> bs = cdiProject.getBeans(false, f);
+ Collection<IBean> bs = cdiProject.getBeans(false, f);
assertEquals(1, bs.size());
assertTrue(bs.iterator().next() instanceof IDecorator);
/*
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefaultNamedTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefaultNamedTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefaultNamedTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,7 +27,7 @@
* @throws JavaModelException
*/
public void testStereotypeWithEmptyNamed() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed.FallowDeer");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed.FallowDeer");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name.", "fallowDeer", bean.getName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.JavaModelException;
@@ -31,10 +31,10 @@
public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.BorderCollieLocal");
- Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, hairy);
// assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -47,7 +47,7 @@
public void testQualifierNotDeclaredInheritedIsNotInherited() throws JavaModelException {
IQualifierDeclaration skinny = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.TameSkinnyHairlessCatLocal");
- Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, skinny);
assertTrue("Wrong number of beans.", beans.isEmpty());
}
@@ -58,10 +58,10 @@
public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnglishBorderCollieLocal");
- Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -74,7 +74,7 @@
public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException {
IQualifierDeclaration skinny = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.FamousCatLocal");
- Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, skinny);
assertTrue("Wrong number of beans.", beans.isEmpty());
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseResolutionByTypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseResolutionByTypeTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseResolutionByTypeTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,7 +27,7 @@
* @throws CoreException
*/
public void testBeanTypesOnSessionBean() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.CapercaillieLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.CapercaillieLocal");
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.CapercaillieLocal", "java.lang.Object");
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ScottishBirdLocal");
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseScopeDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseScopeDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseScopeDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,7 +27,7 @@
*/
public void testScopeTypeDeclaredInheritedIsInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.BorderCollieLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.BorderCollieLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -41,7 +41,7 @@
*/
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.SiameseLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.SiameseLocal");
IBean bean = beans.iterator().next();
assertFalse("Wrong scope type",
"org.jboss.jsr299.tck.tests.definition.scope.enterprise.FooScoped"
@@ -56,7 +56,7 @@
*/
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnglishBorderCollieLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnglishBorderCollieLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -70,7 +70,7 @@
*/
public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.BengalTigerLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.enterprise.BengalTigerLocal");
IBean bean = beans.iterator().next();
assertFalse("Wrong scope type",
"org.jboss.jsr299.tck.tests.definition.scope.enterprise.FooScoped"
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseStereotypeDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseStereotypeDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -28,7 +28,7 @@
*/
public void testStereotypeDeclaredInheritedIsInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.BorderCollieLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.BorderCollieLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -42,7 +42,7 @@
*/
public void testStereotypeNotDeclaredInheritedIsNotInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.BarracudaLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.BarracudaLocal");
IBean bean = beans.iterator().next();
assertFalse("Wrong scope type",
"javax.enterprise.context.RequestScoped".equals(bean.getScope()
@@ -56,7 +56,7 @@
*/
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnglishBorderCollieLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnglishBorderCollieLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -70,7 +70,7 @@
*/
public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.TameBarracudaLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.TameBarracudaLocal");
IBean bean = beans.iterator().next();
assertFalse("Wrong scope type",
"javax.enterprise.context.RequestScoped".equals(bean.getScope()
@@ -84,7 +84,7 @@
*/
public void testStereotypeScopeIsOverriddenByInheritedScope()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.ChihuahuaLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.ChihuahuaLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.SessionScoped", bean.getScope()
@@ -98,7 +98,7 @@
*/
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.MexicanChihuahuaLocal");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.MexicanChihuahuaLocal");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.SessionScoped", bean.getScope()
@@ -106,10 +106,10 @@
}
public void testAdditionalStereotype() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed.Sambar");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.defaultNamed.Sambar");
IBean bean = beans.iterator().next();
assertEquals("sambar", bean.getName());
- Set<IStereotypeDeclaration> s = bean.getStereotypeDeclarations();
+ Collection<IStereotypeDeclaration> s = bean.getStereotypeDeclarations();
assertEquals(2, s.size());
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,16 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.List;
-import java.util.Set;
+import java.util.Collection;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IQualifierDeclaration;
-import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
/**
@@ -33,7 +30,7 @@
*/
public void testQualifierTypeAnnotatedConstructor() {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Duck.java");
- Set<IInjectionPointParameter> points = CDIUtil.getInjectionPointParameters(bean);
+ Collection<IInjectionPointParameter> points = CDIUtil.getInjectionPointParameters(bean);
assertEquals("There should be two injection point parameters in the bean.", 2, points.size());
}
@@ -43,7 +40,7 @@
*/
public void testBindingTypeOnInitializerParameter() {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java");
- Set<IInjectionPointParameter> points = CDIUtil.getInjectionPointParameters(bean);
+ Collection<IInjectionPointParameter> points = CDIUtil.getInjectionPointParameters(bean);
assertEquals("There should be two injection point parameters in the bean.", 1, points.size());
}
@@ -51,7 +48,7 @@
public void testMethodParameter() {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/FarmBroken.java");
assertNotNull("Can't find the bean.", bean);
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
if(injectionPoint instanceof IInjectionPointParameter) {
IInjectionPointParameter param = (IInjectionPointParameter)injectionPoint;
@@ -65,19 +62,19 @@
public void testObserverMethodParameters() {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/AnimalObserver.java");
assertNotNull("Can't find the bean.", bean);
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(1, injections.size());
}
public void testDisposerMethodParameters() {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/disposers/DisposerOk.java");
assertNotNull("Can't find the bean.", bean);
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(2, injections.size());
}
public void testGetInjections() {
- Set<IInjectionPoint> ps = cdiProject.getInjections("org.jboss.jsr299.tck.tests.lookup.injection.Fox");
+ Collection<IInjectionPoint> ps = cdiProject.getInjections("org.jboss.jsr299.tck.tests.lookup.injection.Fox");
assertTrue(!ps.isEmpty());
ps = cdiProject.getInjections("org.jboss.jsr299.tck.tests.context.dependent.Tarantula");
@@ -87,7 +84,7 @@
public void testParameterInjectionsWithQualifierWithMemberValues() {
IInjectionPointParameter injectionPoint = getInjectionPointParameter("JavaSource/org/jboss/jsr299/tck/tests/lookup/injection/NamedParameters.java", "setA");
assertNotNull(injectionPoint);
- Set<IBean> resolved = cdiProject.getBeans(false, injectionPoint);
+ Collection<IBean> resolved = cdiProject.getBeans(false, injectionPoint);
assertTrue(resolved.isEmpty());
injectionPoint = getInjectionPointParameter("JavaSource/org/jboss/jsr299/tck/tests/lookup/injection/NamedParameters.java", "setABC");
@@ -99,7 +96,7 @@
public void testDefaultValuesInQualifierProperties() {
IInjectionPoint injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/lookup/qualifier/MyBean.java", "i");
assertNotNull(injectionPoint);
- Set<IBean> resolved = cdiProject.getBeans(false, injectionPoint);
+ Collection<IBean> resolved = cdiProject.getBeans(false, injectionPoint);
assertFalse(resolved.isEmpty());
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointWithNewQualifierTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -27,14 +27,14 @@
public void testNewHashSetParameter() throws CoreException {
IInjectionPointParameter injection = getInjectionPointParameter("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java", "initialize");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "java.util.HashSet");
}
public void testNewArrayListField() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java", "list");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "java.util.ArrayList");
IBean b = beans.iterator().next();
@@ -43,7 +43,7 @@
public void testNewCustomBeanField() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java", "lion");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.Lion");
IBean b = beans.iterator().next();
@@ -52,7 +52,7 @@
//Check that new bean has exactly one qualifier - @New.
IQualifierDeclaration d = b.getQualifierDeclarations().iterator().next();
assertEquals(CDIConstants.NEW_QUALIFIER_TYPE_NAME, d.getType().getFullyQualifiedName());
- Set<IQualifier> qs = b.getQualifiers();
+ Collection<IQualifier> qs = b.getQualifiers();
assertEquals(1, qs.size());
IQualifier q = qs.iterator().next();
assertEquals(CDIConstants.NEW_QUALIFIER_TYPE_NAME, q.getSourceType().getFullyQualifiedName());
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 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -35,7 +36,7 @@
* @throws JavaModelException
*/
public void testStereotypeInterceptorBindings() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.SecureTransaction");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.SecureTransaction");
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue("The bean should be an interceptor", bean instanceof IClassBean);
@@ -56,16 +57,16 @@
//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(false, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y");
+ Collection<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();
- Set<IInterceptorBinding> bs = bean.getInterceptorBindings();
+ Collection<IInterceptorBinding> bs = bean.getInterceptorBindings();
assertEquals("Wrong number of interceptor bindings", 2, bs.size());
assertContainsBindings(bs, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingA", "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingC");
assertNotContainsBindings(bs, "tck.tests.interceptors.definition.inheritance.BindingB");
- Set<IInterceptorBindingDeclaration> ds = bean.getInterceptorBindingDeclarations(true);
+ Collection<IInterceptorBindingDeclaration> ds = bean.getInterceptorBindingDeclarations(true);
assertEquals("Wrong number of interceptor binding declarations", 2, ds.size());
assertContainsBindingDeclarationWithValue(ds, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingC", "c2");
@@ -90,7 +91,7 @@
IInterceptorBinding b = cdiProject.getInterceptorBinding("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.StereotypeAndBinding");
assertNotNull(b);
- Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding");
+ Collection<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);
@@ -103,7 +104,7 @@
/*
* Invocation getBeans(false, f) returns all beans that match type and qualifiers.
*/
- Set<IBean> bs = cdiProject.getBeans(false, f);
+ Collection<IBean> bs = cdiProject.getBeans(false, f);
assertEquals(1, bs.size());
assertTrue(bs.iterator().next() instanceof IInterceptor);
/*
@@ -113,7 +114,7 @@
assertTrue(bs.isEmpty());
}
- void assertContainsBindings(Set<IInterceptorBinding> bs, String... classNames) {
+ void assertContainsBindings(Collection<IInterceptorBinding> bs, String... classNames) {
Set<String> bsn = new HashSet<String>();
for (IInterceptorBinding b: bs) {
bsn.add(b.getSourceType().getFullyQualifiedName());
@@ -123,8 +124,8 @@
}
}
- void assertNotContainsBindings(Set<IInterceptorBinding> bs, String... classNames) {
- Set<String> bsn = new HashSet<String>();
+ void assertNotContainsBindings(Collection<IInterceptorBinding> bs, String... classNames) {
+ Collection<String> bsn = new HashSet<String>();
for (IInterceptorBinding b: bs) {
bsn.add(b.getSourceType().getFullyQualifiedName());
}
@@ -133,7 +134,7 @@
}
}
- void assertContainsBindingDeclarationWithValue(Set<IInterceptorBindingDeclaration> bs, String className, String value) throws JavaModelException {
+ void assertContainsBindingDeclarationWithValue(Collection<IInterceptorBindingDeclaration> bs, String className, String value) throws JavaModelException {
for (IInterceptorBindingDeclaration b: bs) {
if(className.equals(b.getInterceptorBinding().getSourceType().getFullyQualifiedName())) {
IMemberValuePair[] ps = b.getMemberValuePairs();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -28,8 +28,8 @@
*/
public void testNonDefaultNamed() throws JavaModelException {
// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
-// Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Moose");
+// Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Moose");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Moose type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
@@ -44,7 +44,7 @@
* @throws JavaModelException
*/
public void testDefaultNamed() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Haddock");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Haddock");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Haddock type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNotNull("org.jboss.jsr299.tck.tests.definition.name.Haddock bean should have an EL name.", bean.getName());
@@ -58,7 +58,7 @@
* @throws JavaModelException
*/
public void testStereotypeDefaultsName() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.RedSnapper");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.RedSnapper");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.RedSnapper type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.RedSnapper bean.", "redSnapper", bean.getName());
@@ -71,7 +71,7 @@
* @throws JavaModelException
*/
public void testNotNamedInJava() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.SeaBass");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.SeaBass");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.SeaBass type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNull("org.jboss.jsr299.tck.tests.definition.name.SeaBass bean should not have any EL name.", bean.getName());
@@ -83,7 +83,7 @@
* @throws JavaModelException
*/
public void testNotNamedInStereotype() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Minnow");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Minnow");
assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Minnow type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNull("org.jboss.jsr299.tck.tests.definition.name.Minnow bean should not have any EL name.", bean.getName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,7 +11,7 @@
package org.jboss.tools.cdi.core.test.tck;
import java.util.ArrayList;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -119,7 +119,7 @@
assertNotNull("Can't get CDI project.", cdiProject);
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
for (IBean bean : beans) {
if (bean.getName() != null && name.equals(bean.getName())) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IMethod;
@@ -31,7 +31,7 @@
public void testNonrelevantInjectionPoint() {
IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingCommand");
- Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ Collection<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
assertTrue(observers.isEmpty());
}
@@ -42,7 +42,7 @@
IInjectionPointField generalEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "generalEvent");
assertNotNull(generalEvent);
- Set<IObserverMethod> observers = generalEvent.getCDIProject().resolveObserverMethods(generalEvent);
+ Collection<IObserverMethod> observers = generalEvent.getCDIProject().resolveObserverMethods(generalEvent);
IObserverMethod tamedObserver = null;
IObserverMethod recognizedFriendObserver = null;
for (IObserverMethod m: observers) {
@@ -61,7 +61,7 @@
IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingEvent");
assertNotNull(tamingEvent);
- Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ Collection<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
assertFalse(observers.isEmpty());
IObserverMethod tamedObserver = null;
@@ -77,13 +77,13 @@
assertNotNull(tamedObserver);
assertNull(recognizedFriendObserver);
- Set<IParameter> p = tamedObserver.getObservedParameters();
+ Collection<IParameter> p = tamedObserver.getObservedParameters();
assertTrue(p.size() == 1);
IParameter observerParameter = p.iterator().next();
assertFalse(observerParameter instanceof IInjectionPointParameter);
- Set<IInjectionPoint> points = tamedObserver.getClassBean().getCDIProject().findObservedEvents(observerParameter);
+ Collection<IInjectionPoint> points = tamedObserver.getClassBean().getCDIProject().findObservedEvents(observerParameter);
assertTrue(points.size() == 1);
assertTrue(points.contains(tamingEvent));
}
@@ -92,7 +92,7 @@
IInjectionPointField solicitingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "solicitingEvent");
assertNotNull(solicitingEvent);
- Set<IObserverMethod> observers = solicitingEvent.getCDIProject().resolveObserverMethods(solicitingEvent);
+ Collection<IObserverMethod> observers = solicitingEvent.getCDIProject().resolveObserverMethods(solicitingEvent);
IObserverMethod tamedObserver = null;
IObserverMethod recognizedFriendObserver = null;
@@ -116,7 +116,7 @@
IInjectionPointField friendlyEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "friendlyEvent");
assertNotNull(friendlyEvent);
- Set<IObserverMethod> observers = friendlyEvent.getCDIProject().resolveObserverMethods(friendlyEvent);
+ Collection<IObserverMethod> observers = friendlyEvent.getCDIProject().resolveObserverMethods(friendlyEvent);
assertFalse(observers.isEmpty());
IObserverMethod tamedObserver = null;
@@ -132,20 +132,20 @@
assertNull(tamedObserver);
assertNotNull(recognizedFriendObserver);
- Set<IParameter> p = recognizedFriendObserver.getObservedParameters();
+ Collection<IParameter> p = recognizedFriendObserver.getObservedParameters();
assertTrue(p.size() == 1);
IParameter observerParameter = p.iterator().next();
assertFalse(observerParameter instanceof IInjectionPointParameter);
- Set<IInjectionPoint> points = recognizedFriendObserver.getClassBean().getCDIProject().findObservedEvents(observerParameter);
+ Collection<IInjectionPoint> points = recognizedFriendObserver.getClassBean().getCDIProject().findObservedEvents(observerParameter);
assertTrue(points.size() == 1);
assertTrue(points.contains(friendlyEvent));
}
public void testResolveObserverMethod() {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java");
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
IClassBean cb = null;
for (IBean b: beans) {
if(b instanceof IClassBean) {
@@ -153,7 +153,7 @@
}
}
assertNotNull(cb);
- Set<IInitializerMethod> ps = cb.getInitializers();
+ Collection<IInitializerMethod> ps = cb.getInitializers();
IInitializerMethod mp = ps.isEmpty() ? null : ps.iterator().next();
assertNotNull(mp);
assertEquals("foo", mp.getMethod().getElementName());
@@ -166,11 +166,11 @@
IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingEvent");
assertNotNull(tamingEvent);
- Set<IBean> beans = tamingEvent.getCDIProject().getBeans(false, tamingEvent);
+ Collection<IBean> beans = tamingEvent.getCDIProject().getBeans(false, tamingEvent);
assertFalse(beans.isEmpty());
IBean b = beans.iterator().next();
- Set<IQualifier> qs = b.getQualifiers();
+ Collection<IQualifier> qs = b.getQualifiers();
assertEquals(3, qs.size());
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.JavaModelException;
@@ -32,9 +32,9 @@
* @throws JavaModelException
*/
public void testBindingTypesAppliedToProducerMethodParameters() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.implementation.producer.method.definition.Tarantula", "org.jboss.jsr299.tck.tests.implementation.producer.method.definition.Deadliest");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.implementation.producer.method.definition.Tarantula", "org.jboss.jsr299.tck.tests.implementation.producer.method.definition.Deadliest");
IBean bean = beans.iterator().next();
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals("Wrong number of injection points in the producer.", 2, injections.size());
// TODO use real location for injection points.
assertLocationEquals(injections, 1287, 29);
@@ -45,7 +45,7 @@
public void testParameterDefinition() {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer.java");
- Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> bs = cdiProject.getBeans(file.getFullPath());
IProducerMethod producer = null;
for (IBean bean: bs) {
if(bean instanceof IProducerMethod) {
@@ -64,7 +64,7 @@
public void testParameterDefinitionOnBrokenMethod() {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer_Broken.java");
- Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> bs = cdiProject.getBeans(file.getFullPath());
IProducerMethod producer = null;
for (IBean bean: bs) {
if(bean instanceof IProducerMethod) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
@@ -34,10 +34,10 @@
* @throws JavaModelException
*/
public void testDefaultQualifierDeclaredInJava() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 2, qualifiers.size());
assertContainsQualifierType(bean, "javax.enterprise.inject.Default");
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -49,12 +49,12 @@
* @throws JavaModelException
*/
public void testDefaultQualifierForInjectionPoint() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IInjectionPoint> points = bean.getInjectionPoints();
+ Collection<IInjectionPoint> points = bean.getInjectionPoints();
IInjectionPoint point = points.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
// TODO do we need to care about default qualifiers for InjectionPoint in CDI Tools?
// assertContainsQualifierType(point, "javax.enterprise.inject.Default");
}
@@ -70,7 +70,7 @@
* section 2.3.2 ba)
*/
public void testQualifierDeclaresBindingAnnotation() {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Tarantula", "org.jboss.jsr299.tck.tests.definition.qualifier.Tame");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Tarantula", "org.jboss.jsr299.tck.tests.definition.qualifier.Tame");
assertFalse("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Tarantula type and org.jboss.jsr299.tck.tests.definition.qualifier.Tame qualifier.", beans.isEmpty());
}
@@ -81,13 +81,13 @@
*/
public void testQualifiersDeclaredInJava() throws CoreException {
IQualifierDeclaration synchronous = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous");
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Cat", "org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Cat", "org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous");
assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Cat type and org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous qualifier.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
assertContainsQualifier(bean, synchronous);
- Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+ Collection<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
// TODO use correct start position instead of 0.
assertLocationEquals(declarations, 856, 12);
@@ -101,12 +101,12 @@
IQualifierDeclaration chunky = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky");
IQualifierDeclaration whitefish = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod");
- Set<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 4, qualifiers.size());
- Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+ Collection<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
assertEquals("Wrong number of qualifier declarations.", 3, declarations.size());
assertLocationEquals(declarations, 882, 10);
assertLocationEquals(declarations, 894, 24);
@@ -117,16 +117,16 @@
* @throws JavaModelException
*/
public void testFieldInjectedFromProducerMethod() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Barn");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Barn");
assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Barn type.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IInjectionPoint> points = bean.getInjectionPoints();
+ Collection<IInjectionPoint> points = bean.getInjectionPoints();
IInjectionPoint point = points.iterator().next();
- Set<IQualifierDeclaration> declarations = point.getQualifierDeclarations();
+ Collection<IQualifierDeclaration> declarations = point.getQualifierDeclarations();
assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
assertLocationEquals(declarations, 914, 5);
- Set<IBean> injectedBeans = cdiProject.getBeans(true, point);
+ Collection<IBean> injectedBeans = cdiProject.getBeans(true, point);
assertEquals("Wrong number of beans.", 1, injectedBeans.size());
IBean injectedBean = injectedBeans.iterator().next();
IType beanClass = injectedBean.getBeanClass();
@@ -146,10 +146,10 @@
public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie");
- Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertFalse("Wrong number of beans.", beans.isEmpty());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie type.", 2, qualifiers.size());
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -160,10 +160,10 @@
* @throws JavaModelException
*/
public void testQualifierNotDeclaredInheritedIsNotInherited() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.ShetlandPony");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.ShetlandPony");
assertFalse("Wrong number of beans.", beans.isEmpty());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals(
"Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie type.",
2, qualifiers.size());
@@ -178,10 +178,10 @@
public void testQualifierDeclaredInheritedIsBlockedByIntermediateClass() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/ClippedBorderCollie.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie");
- Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie type.", 2, qualifiers.size());
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -194,10 +194,10 @@
public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie");
- Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ Collection<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie type.", 2, qualifiers.size());
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
@@ -208,10 +208,10 @@
* @throws JavaModelException
*/
public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.MiniatureShetlandPony");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.MiniatureShetlandPony");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals(
"Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie type.",
2, qualifiers.size());
@@ -220,11 +220,11 @@
}
public void testQualifierDeclaredWithInnerType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier",
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier",
"org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier.InnerQualifier");
assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier type.", 1, beans.size());
IBean bean = beans.iterator().next();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier type.", 2, qualifiers.size());
assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier$InnerQualifier");
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -23,82 +23,82 @@
public void testQualifierWithStaticImportInInjectingBeanAndNonStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "chequePaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.AdvancedPaymentProcessor");
}
public void testQualifierWithNonStaticImportInInjectingBeanAndNonStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "chequePaymentProcessor2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.AdvancedPaymentProcessor");
}
public void testQualifierWithoutImportInInjectingBeanAndNonStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "chequePaymentProcessor3");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.AdvancedPaymentProcessor");
}
public void testQualifierWithStaticImportInInjectingBeanAndStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "cashPaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.CashPaymentProcessor");
}
public void testQualifierWithNonStaticImportInInjectingBeanAndStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "cashPaymentProcessor2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.CashPaymentProcessor");
}
public void testQualifierWithoutImportInInjectingBeanAndStaticInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "cashPaymentProcessor3");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.CashPaymentProcessor");
}
public void testQualifierWithStaticImportInInjectingBeanAndWithoutImportInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "otherPaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.OtherPaymentProcessor");
}
public void testQualifierWithNonStaticImportInInjectingBeanAndWithoutImportInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "otherPaymentProcessor2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.OtherPaymentProcessor");
}
public void testQualifierWithoutImportInInjectingBeanAndWithoutImportInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "otherPaymentProcessor3");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.OtherPaymentProcessor");
}
public void testQualifierWithNonStaticImportInInjectingBeanUnresolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "unresolvedCreditCardPaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 0, beans.size());
}
public void testQualifierWithStaticImportInInjectingBeanUnresolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "unresolvedCreditCardPaymentProcessor2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 0, beans.size());
}
public void testQualifierWithoutImportInInjectingBeanUnresolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/ObtainsInstanceBean.java", "unresolvedCreditCardPaymentProcessor3");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 0, beans.size());
}
@@ -118,7 +118,7 @@
*/
public void testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java", "cashPaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.coincidence.FirstPaymentProcessor");
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,14 +11,13 @@
package org.jboss.tools.cdi.core.test.tck;
import java.io.IOException;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
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.jdt.core.IField;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -64,7 +63,7 @@
IInjectionPointField injectionPoint = getInjectionPointField(PATH_A, "a");
assertNotNull(injectionPoint);
- Set<IBean> bs = cdiProject.getBeans(true, injectionPoint);
+ Collection<IBean> bs = cdiProject.getBeans(true, injectionPoint);
assertEquals(1, bs.size());
IBean b = bs.iterator().next();
assertEquals("org.jboss.jsr299.tck.tests.jbt.resolution.cache.C$D", b.getBeanClass().getFullyQualifiedName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResourceExclusionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResourceExclusionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResourceExclusionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -21,7 +21,7 @@
public class ResourceExclusionTest extends TCKTest {
public void testExclusion() throws JavaModelException {
- Set<IBean> beans = cdiProject.getBeans("myExcludedBean", false);
+ Collection<IBean> beans = cdiProject.getBeans("myExcludedBean", false);
assertEquals("Wrong number of beans.", 0, beans.size());
beans = cdiProject.getBeans("myExcludedBean2", false);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ScopeDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ScopeDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ScopeDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,13 +27,13 @@
* @throws JavaModelException
*/
public void testScopeTypesAreExtensible() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Mullet");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Mullet");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"org.jboss.jsr299.tck.tests.definition.scope.AnotherScopeType",
bean.getScope().getSourceType().getFullyQualifiedName());
- Set<IScopeDeclaration> declarations = bean.getScopeDeclarations();
+ Collection<IScopeDeclaration> declarations = bean.getScopeDeclarations();
assertEquals("Wrong number of scope declarations", 1, declarations
.size());
assertLocationEquals(declarations, 848, 17);
@@ -45,13 +45,13 @@
* @throws JavaModelException
*/
public void testScopeDeclaredInJava() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.SeaBass");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.SeaBass");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
.getSourceType().getFullyQualifiedName());
- Set<IScopeDeclaration> declarations = bean.getScopeDeclarations();
+ Collection<IScopeDeclaration> declarations = bean.getScopeDeclarations();
assertEquals("Wrong number of scope declarations", 1, declarations
.size());
assertLocationEquals(declarations, 898, 14);
@@ -63,7 +63,7 @@
* @throws JavaModelException
*/
public void testDefaultScope() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Order");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Order");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -76,13 +76,13 @@
* @throws JavaModelException
*/
public void testScopeSpecifiedAndStereotyped() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Minnow");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Minnow");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
.getSourceType().getFullyQualifiedName());
- Set<IScopeDeclaration> declarations = bean.getScopeDeclarations();
+ Collection<IScopeDeclaration> declarations = bean.getScopeDeclarations();
assertEquals("Wrong number of scope declarations", 1, declarations
.size());
assertLocationEquals(declarations, 920, 14);
@@ -95,12 +95,12 @@
*/
public void testMultipleIncompatibleScopeStereotypesWithScopeSpecified()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Pollock");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Pollock");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
bean.getScope().getSourceType().getFullyQualifiedName());
- Set<IScopeDeclaration> declarations = bean.getScopeDeclarations();
+ Collection<IScopeDeclaration> declarations = bean.getScopeDeclarations();
assertEquals("Wrong number of scope declarations", 1, declarations
.size());
assertLocationEquals(declarations, 930, 10);
@@ -113,7 +113,7 @@
*/
public void testMultipleCompatibleScopeStereotypes()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Grayling");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.Grayling");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
@@ -128,13 +128,13 @@
*/
public void testWebBeanScopeTypeOverridesStereotype()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.RedSnapper");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.RedSnapper");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
.getSourceType().getFullyQualifiedName());
- Set<IScopeDeclaration> declarations = bean.getScopeDeclarations();
+ Collection<IScopeDeclaration> declarations = bean.getScopeDeclarations();
assertEquals("Wrong number of scope declarations", 1, declarations
.size());
assertLocationEquals(declarations, 915, 14);
@@ -147,7 +147,7 @@
*/
public void testScopeTypeDeclaredInheritedIsInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.BorderCollie");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.BorderCollie");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -161,7 +161,7 @@
*/
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.ShetlandPony");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.ShetlandPony");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -175,7 +175,7 @@
*/
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.GoldenRetriever");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.GoldenRetriever");
assertEquals("Wrong number of beans.", 1, beans.size());
}
@@ -186,7 +186,7 @@
*/
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.GoldenLabrador");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.GoldenLabrador");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -200,7 +200,7 @@
*/
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.EnglishBorderCollie");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.EnglishBorderCollie");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -214,7 +214,7 @@
*/
public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.MiniatureClydesdale");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.scope.MiniatureClydesdale");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
Modified: 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 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/SelectedAlternativeTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.cdi.core.IBean;
@@ -48,7 +48,7 @@
* • 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"));
+ Collection<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) {
@@ -65,8 +65,8 @@
*/
public void testProducerInAlternativeClassBean() {
IInjectionPoint p = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/injection/alternative/D.java", "b");
- Set<IBean> unresolved = cdiProject.getBeans(false, p);
- Set<IBean> resolved = cdiProject.getBeans(true, p);
+ Collection<IBean> unresolved = cdiProject.getBeans(false, p);
+ Collection<IBean> resolved = cdiProject.getBeans(true, p);
assertEquals(1, resolved.size());
assertEquals(2, unresolved.size());
System.out.println("");
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeDefinitionTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeDefinitionTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -29,13 +29,13 @@
* @throws JavaModelException
*/
public void testStereotypeWithScopeType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Moose");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Moose");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
.getSourceType().getFullyQualifiedName());
- Set<IStereotypeDeclaration> declarations = bean
+ Collection<IStereotypeDeclaration> declarations = bean
.getStereotypeDeclarations();
assertEquals("Wrong number of stereotype declarations", 1, declarations
.size());
@@ -48,7 +48,7 @@
* @throws JavaModelException
*/
public void testStereotypeWithoutScopeType() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Reindeer");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Reindeer");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -61,7 +61,7 @@
* @throws JavaModelException
*/
public void testOneStereotypeAllowed() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.LongHairedDog");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.LongHairedDog");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -73,7 +73,7 @@
* section 2.7 d)
*/
public void testMultipleStereotypesAllowed() {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.stereotype.HighlandCow", "org.jboss.jsr299.tck.tests.definition.stereotype.Tame");
+ Collection<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.stereotype.HighlandCow", "org.jboss.jsr299.tck.tests.definition.stereotype.Tame");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNull("The bean should not have any EL name.", bean.getName());
@@ -81,7 +81,7 @@
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
.getSourceType().getFullyQualifiedName());
- Set<? extends ITextSourceReference> declarations = bean.getQualifierDeclarations(false);
+ Collection<? extends ITextSourceReference> declarations = bean.getQualifierDeclarations(false);
assertEquals("Wrong number of qualifier declarations", 1, declarations.size());
assertLocationEquals(declarations, 877, 5);
@@ -98,7 +98,7 @@
*/
public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Springbok");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Springbok");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
@@ -113,7 +113,7 @@
*/
public void testStereotypeDeclaredInheritedIsInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.BorderCollie");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.BorderCollie");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -127,7 +127,7 @@
*/
public void testStereotypeNotDeclaredInheritedIsNotInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.ShetlandPony");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.ShetlandPony");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -141,7 +141,7 @@
*/
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.EnglishBorderCollie");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.EnglishBorderCollie");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.RequestScoped", bean.getScope()
@@ -155,7 +155,7 @@
*/
public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.MiniatureClydesdale");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.MiniatureClydesdale");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type", "javax.enterprise.context.Dependent",
@@ -169,7 +169,7 @@
*/
public void testStereotypeScopeIsOverriddenByInheritedScope()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Chihuahua");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.Chihuahua");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.SessionScoped", bean.getScope()
@@ -183,7 +183,7 @@
*/
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.MexicanChihuahua");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.MexicanChihuahua");
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
"javax.enterprise.context.SessionScoped", bean.getScope()
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 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
@@ -27,7 +27,7 @@
* @throws JavaModelException
*/
public void testInheritence() throws JavaModelException {
- Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.Horse");
+ Collection<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 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -13,10 +13,10 @@
import java.io.File;
import java.io.FileFilter;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import junit.framework.TestCase;
@@ -164,20 +164,20 @@
return tckP;
}
- protected Set<IBean> getBeans(String typeName, String... qualifierNames) throws JavaModelException {
+ protected Collection<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 {
+ protected Collection<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>();
+ Collection<IType> qualifiers = new HashSet<IType>();
for (String name : qualifierNames) {
IType qualifier = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name);
assertNotNull("Can't find " + name + " type.", qualifier);
qualifiers.add(qualifier);
}
- Set<IBean> beans = cdiProject.getBeans(resolve, type, qualifiers.toArray(new IType[0]));
+ Collection<IBean> beans = cdiProject.getBeans(resolve, type, qualifiers.toArray(new IType[0]));
assertNotNull("There is no beans with " + typeName + " type", beans);
return beans;
}
@@ -189,7 +189,7 @@
protected IClassBean getClassBean(String fullyQualifiedTypeName, String path) {
IFile file = tckProject.getFile(path);
assertTrue(file.exists());
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
for (IBean bean : beans) {
if(bean instanceof IClassBean && (fullyQualifiedTypeName==null || fullyQualifiedTypeName.equals(bean.getBeanClass().getFullyQualifiedName()))) {
return (IClassBean)bean;
@@ -210,10 +210,10 @@
protected IQualifierDeclaration getQualifierDeclarationFromClass(String beanFilePath, String annotationTypeName) throws JavaModelException {
IFile file = tckProject.getFile(beanFilePath);
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
assertFalse("Can't find any bean in " + beanFilePath, beans.isEmpty());
for (IBean bean : beans) {
- Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+ Collection<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
IParametedType type = getType(annotationTypeName);
for (IQualifierDeclaration declaration : declarations) {
if(declaration.getType() != null && type.getType().getElementName().equals(declaration.getType().getElementName())) {
@@ -227,7 +227,7 @@
protected IAnnotationDeclaration createAnnotationDeclarationForAnnotation(String beanClassFilePath, String annotationTypeName) throws JavaModelException {
IFile file = tckProject.getFile(beanClassFilePath);
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
IBean bean = beans.iterator().next();
IType beanClass = bean.getBeanClass();
final IParametedType type = getType(annotationTypeName);
@@ -248,7 +248,7 @@
}
protected void assertTheOnlyBean(String typeName) throws JavaModelException {
- Set<IBean> beans = getBeans(typeName);
+ Collection<IBean> beans = getBeans(typeName);
assertEquals("There should be the only bean with " + typeName + " type", 1, beans.size());
}
@@ -280,7 +280,7 @@
}
}
- public static void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) {
+ public static void assertLocationEquals(Collection<? extends ITextSourceReference> references, int startPosition, int length) {
for (ITextSourceReference reference : references) {
if(reference.getStartPosition()==startPosition) {
assertLocationEquals(reference, startPosition, length);
@@ -303,7 +303,7 @@
assertEquals("Wrong number of types.", typeNames.length, bean.getLegalTypes().size());
}
for (String typeName : typeNames) {
- Set<IParametedType> types = bean.getLegalTypes();
+ Collection<IParametedType> types = bean.getLegalTypes();
StringBuffer allTypes = new StringBuffer("[");
boolean found = false;
for (IParametedType type : types) {
@@ -327,7 +327,7 @@
assertEquals("Wrong number of types.", typeSignatures.length, bean.getLegalTypes().size());
}
for (String typeSignature : typeSignatures) {
- Set<IParametedType> types = bean.getLegalTypes();
+ Collection<IParametedType> types = bean.getLegalTypes();
StringBuffer allTypes = new StringBuffer("[");
boolean found = false;
for (IParametedType type : types) {
@@ -342,7 +342,7 @@
}
}
- public static void assertDoesNotContainBeanClasses(Set<IBean> beans, String... beanClassNames) throws CoreException {
+ public static void assertDoesNotContainBeanClasses(Collection<IBean> beans, String... beanClassNames) throws CoreException {
StringBuffer sb = new StringBuffer("[");
for (String beanClassName : beanClassNames) {
sb.append(beanClassName).append("; ");
@@ -355,14 +355,14 @@
protected IInjectionPointField getInjectionPointField(String beanClassFilePath, String fieldName) {
IFile file = tckProject.getFile(beanClassFilePath);
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
Iterator<IBean> it = beans.iterator();
while(it.hasNext()) {
IBean b = it.next();
if(b instanceof IProducer) it.remove();
}
assertEquals("Wrong number of the beans", 1, beans.size());
- Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
+ Collection<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
if(injectionPoint instanceof IInjectionPointField) {
IInjectionPointField field = (IInjectionPointField)injectionPoint;
@@ -377,14 +377,14 @@
protected IInjectionPointParameter getInjectionPointParameter(String beanClassFilePath, String methodName) {
IFile file = tckProject.getFile(beanClassFilePath);
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Collection<IBean> beans = cdiProject.getBeans(file.getFullPath());
Iterator<IBean> it = beans.iterator();
while(it.hasNext()) {
IBean b = it.next();
if(b instanceof IProducer) it.remove();
}
assertEquals("Wrong number of the beans", 1, beans.size());
- Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
+ Collection<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
if(injectionPoint instanceof IInjectionPointParameter) {
IInjectionPointParameter param = (IInjectionPointParameter)injectionPoint;
@@ -397,11 +397,11 @@
return null;
}
- public static void assertContainsBeanClasses(Set<IBean> beans, String... beanClassNames) throws CoreException {
+ public static void assertContainsBeanClasses(Collection<IBean> beans, String... beanClassNames) throws CoreException {
assertContainsBeanClasses(true, beans, beanClassNames);
}
- public static void assertContainsBeanClasses(boolean checkTheNumberOfBeans, Set<IBean> beans, String... beanClassNames) throws CoreException {
+ public static void assertContainsBeanClasses(boolean checkTheNumberOfBeans, Collection<IBean> beans, String... beanClassNames) throws CoreException {
if(checkTheNumberOfBeans) {
assertEquals("Wrong number of beans.", beanClassNames.length, beans.size());
}
@@ -415,11 +415,11 @@
}
}
- public static void assertContainsBeanClass(Set<IBean> beans, String beanClassName) throws CoreException {
+ public static void assertContainsBeanClass(Collection<IBean> beans, String beanClassName) throws CoreException {
assertTrue("Didn't find " + beanClassName, containsBeanClass(beans, beanClassName));
}
- private static boolean doesNotContainBeanClass(Set<IBean> beans, String beanClassName) throws CoreException {
+ private static boolean doesNotContainBeanClass(Collection<IBean> beans, String beanClassName) throws CoreException {
for (IBean bean : beans) {
if(beanClassName.equals(bean.getBeanClass().getFullyQualifiedName())) {
return false;
@@ -428,7 +428,7 @@
return true;
}
- private static boolean containsBeanClass(Set<IBean> beans, String beanClassName) throws CoreException {
+ private static boolean containsBeanClass(Collection<IBean> beans, String beanClassName) throws CoreException {
for (IBean bean : beans) {
if(beanClassName.equals(bean.getBeanClass().getFullyQualifiedName())) {
return true;
@@ -437,11 +437,11 @@
return false;
}
- public static void assertContainsTypes(Set<IParametedType> types, String... typeNames) throws CoreException {
+ public static void assertContainsTypes(Collection<IParametedType> types, String... typeNames) throws CoreException {
assertContainsTypes(true, types, typeNames);
}
- public static void assertContainsTypes(boolean checkTheNumberOfTypes, Set<IParametedType> types, String... typeNames) throws CoreException {
+ public static void assertContainsTypes(boolean checkTheNumberOfTypes, Collection<IParametedType> types, String... typeNames) throws CoreException {
if(checkTheNumberOfTypes) {
assertEquals("The number of types should be the same", typeNames.length, types.size());
}
@@ -450,7 +450,7 @@
}
}
- public static void assertContainsType(Set<IParametedType> types, String typeName) throws CoreException {
+ public static void assertContainsType(Collection<IParametedType> types, String typeName) throws CoreException {
StringBuffer allTheTypes = new StringBuffer("[ ");
for (IParametedType type : types) {
allTheTypes.append(type.getType().getFullyQualifiedName()).append(" ,");
@@ -462,7 +462,7 @@
}
}
- private static boolean containsType(Set<IParametedType> types, String typeName) throws CoreException {
+ private static boolean containsType(Collection<IParametedType> types, String typeName) throws CoreException {
for (IParametedType type : types) {
if(typeName.equals(type.getType().getFullyQualifiedName())) {
return true;
@@ -473,7 +473,7 @@
public static void assertContainsQualifier(IBean bean, IQualifierDeclaration declaration) throws CoreException {
String typeName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
StringBuffer allTypes = new StringBuffer("[");
boolean found = false;
for (IQualifier qualifier : qualifiers) {
@@ -485,7 +485,7 @@
}
allTypes.append("]");
assertTrue(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier with " + typeName + " type.", found);
- Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(true);
+ Collection<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(true);
for (IQualifierDeclaration d : declarations) {
if(CDIProject.getAnnotationDeclarationKey(d).equals(CDIProject.getAnnotationDeclarationKey(declaration)) ) {
return;
@@ -499,7 +499,7 @@
}
public static void assertContainsQualifierType(boolean theNumbersOfQualifierShouldBeTheSame, IBean bean, String... typeNames) {
- Set<IQualifier> qualifiers = bean.getQualifiers();
+ Collection<IQualifier> qualifiers = bean.getQualifiers();
if(theNumbersOfQualifierShouldBeTheSame) {
assertEquals("Defferent numbers of qualifiers", typeNames.length, qualifiers.size());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/AmbiguousDependencyTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/AmbiguousDependencyTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/AmbiguousDependencyTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck.lookup;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -28,7 +28,7 @@
*/
public void testAmbiguousDependency() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java", "animal");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertTrue(beans.size()>1);
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/CircularDependencyTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/CircularDependencyTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/CircularDependencyTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck.lookup;
+import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -101,7 +101,7 @@
}
public IClassBean getOnlyClassBean(String type) throws CoreException {
- Set<IBean> beans = getBeans(type);
+ Collection<IBean> beans = getBeans(type);
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue(bean instanceof IClassBean);
@@ -111,10 +111,10 @@
public void assertOnlyInjectionOfClassBeanReslovedToAnotherClassBean(String classBeanType, String injectionClassBeanType) throws CoreException {
IBean bean = getOnlyClassBean(classBeanType);
- Set<IInjectionPoint> points = bean.getInjectionPoints();
+ Collection<IInjectionPoint> points = bean.getInjectionPoints();
assertEquals("Wrong number of the injections", 1, points.size());
IInjectionPoint point = points.iterator().next();
- Set<IBean> beans = cdiProject.getBeans(true, point);
+ Collection<IBean> beans = cdiProject.getBeans(true, point);
assertEquals("Wrong number of the beans", 1, beans.size());
bean = beans.iterator().next();
assertTrue(bean instanceof IClassBean);
@@ -123,10 +123,10 @@
public void assertOnlyInjectionOfClassBeanReslovedToProducerMethodOfSameClass(String classBeanType) throws CoreException {
IBean bean = getOnlyClassBean(classBeanType);
- Set<IInjectionPoint> points = bean.getInjectionPoints();
+ Collection<IInjectionPoint> points = bean.getInjectionPoints();
assertEquals("Wrong number of the injections", 1, points.size());
IInjectionPoint point = points.iterator().next();
- Set<IBean> beans = cdiProject.getBeans(true, point);
+ Collection<IBean> beans = cdiProject.getBeans(true, point);
assertEquals("Wrong number of the beans", 1, beans.size());
bean = beans.iterator().next();
assertTrue(bean instanceof IProducerMethod);
@@ -135,8 +135,8 @@
public void assertOnlyInjectionConstructorOfClassBeanReslovedToAnotherClassBean(String classBeanType, String injectionClassBeanType) throws CoreException {
IBean bean = getOnlyClassBean(classBeanType);
- Set<IInjectionPoint> allPoints = bean.getInjectionPoints();
- Set<IInjectionPointParameter> points = new HashSet<IInjectionPointParameter>();
+ Collection<IInjectionPoint> allPoints = bean.getInjectionPoints();
+ Collection<IInjectionPointParameter> points = new HashSet<IInjectionPointParameter>();
for (IInjectionPoint injectionPoint : allPoints) {
if(injectionPoint instanceof IInjectionPointParameter) {
points.add((IInjectionPointParameter)injectionPoint);
@@ -144,7 +144,7 @@
}
assertEquals("Wrong number of the injections", 1, points.size());
IInjectionPoint point = points.iterator().next();
- Set<IBean> beans = cdiProject.getBeans(true, point);
+ Collection<IBean> beans = cdiProject.getBeans(true, point);
assertEquals("Wrong number of the beans", 1, beans.size());
bean = beans.iterator().next();
assertTrue(bean instanceof IClassBean);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck.lookup;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -28,14 +28,14 @@
*/
public void testObtainsInjectsInstance() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals(1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor");
}
public void testObtainsInjectsProvider() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor2");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals(1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor");
}
@@ -46,7 +46,7 @@
*/
public void testObtainsAmbiguousInjectsInstance() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "anyPaymentProcessor");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals(3, beans.size());
assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.SimplePaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.RemotePaymentProcessor");
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -11,7 +11,7 @@
package org.jboss.tools.cdi.core.test.tck.lookup;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -41,7 +41,7 @@
*/
public void testAmbiguousELNamesResolved() throws CoreException {
// Cod, Plaice and AlaskaPlaice are named "whitefishJBT" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice
- Set<IBean> beans = cdiProject.getBeans("whitefishJBT", true);
+ Collection<IBean> beans = cdiProject.getBeans("whitefishJBT", true);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.byname.AlaskaPlaice");
@@ -80,7 +80,7 @@
*/
public void testAbstractClassAnnotatedNamed() throws CoreException {
String abstractClass = "abstractClass";
- Set<IBean> beans = cdiProject.getBeans(abstractClass, false);
+ Collection<IBean> beans = cdiProject.getBeans(abstractClass, false);
assertTrue(beans.isEmpty());
beans = cdiProject.getBeans("producerInAbstractClass", false);
@@ -93,12 +93,12 @@
IAnnotationDeclaration named = cb.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
assertEquals(abstractClass, named.getMemberValue(null));
- Set<IInjectionPoint> injections = cdiProject.getInjections("org.jboss.jsr299.tck.tests.jbt.lookup.NotBean");
+ Collection<IInjectionPoint> injections = cdiProject.getInjections("org.jboss.jsr299.tck.tests.jbt.lookup.NotBean");
assertEquals(2, injections.size());
for (IInjectionPoint p: injections) {
assertTrue(p instanceof IInjectionPointField);
IField f = ((IInjectionPointField)p).getField();
- Set<IBean> bs = cdiProject.getBeans(false, p);
+ Collection<IBean> bs = cdiProject.getBeans(false, p);
if("f1".endsWith(f.getElementName())) {
assertEquals("Injection field f1 cannot be resolved to abstract class bean.", 0, bs.size());
} else if("f2".endsWith(f.getElementName())) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck.lookup;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -39,7 +40,7 @@
* @throws CoreException
*/
public void testDefaultBindingTypeAssumed() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tuna");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tuna");
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(false, beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tuna");
}
@@ -51,7 +52,7 @@
* @throws CoreException
*/
public void testResolveByType() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tuna", "javax.enterprise.inject.Default");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tuna", "javax.enterprise.inject.Default");
assertEquals("Wrong number of the beans", 1, beans.size());
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Animal", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.FishILike");
assertEquals("Wrong number of the beans", 3, beans.size());
@@ -65,7 +66,7 @@
* @throws CoreException
*/
public void testAllQualifiersSpecifiedForResolutionMustAppearOnBean() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Animal", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Chunky", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Whitefish");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Animal", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Chunky", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Whitefish");
assertEquals("Wrong number of the beans", 1, beans.size());
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ScottishFish", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Whitefish");
assertEquals("Wrong number of the beans", 2, beans.size());
@@ -81,7 +82,7 @@
public void testResolveByTypeWithTypeParameter() throws CoreException {
IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ScottishFishFarmer");
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QFarmer<QScottishFish;>;");
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ScottishFishFarmer");
}
@@ -95,7 +96,7 @@
public void testResolveByTypeWithArray() throws CoreException {
IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.SpiderProducer");
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "[QSpider;");
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
assertEquals("Wrong number of the beans", 1, beans.size());
assertTrue("The bean should be a producer method.", beans.iterator().next() instanceof IProducerMethod);
}
@@ -107,12 +108,12 @@
* @throws CoreException
*/
public void testResolveByTypeWithPrimitives() throws CoreException {
- Set<IBean> beans = getBeans("java.lang.Double", "javax.enterprise.inject.Any");
+ Collection<IBean> beans = getBeans("java.lang.Double", "javax.enterprise.inject.Any");
// There is checks for 2 beans (not for 3) in TCK but actually there is one more bean in another package which matches. So let's check for 3 beans.
assertEquals("Wrong number of the beans", 3, beans.size());
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/NumberProducer.java");
assertNotNull("Bean can't be a null", bean);
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals("Wrong number of the injection points", 2, injections.size());
for (IInjectionPoint injectionPoint : injections) {
beans = cdiProject.getBeans(true, injectionPoint);
@@ -122,11 +123,11 @@
public void testAbstractClassIsNotEligibleForInjection() throws CoreException {
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/chain/CurrentProject.java");
- Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ Collection<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals("Wrong number of the injection points", 1, injections.size());
IInjectionPoint injectionPoint = injections.iterator().next();
assertNotNull(injectionPoint);
- Set<IBean> bs = cdiProject.getBeans(true, injectionPoint);
+ Collection<IBean> bs = cdiProject.getBeans(true, injectionPoint);
assertEquals(2, bs.size());
Set<String> names = new HashSet<String>();
System.out.println(bs.size());
@@ -147,7 +148,7 @@
IQualifierDeclaration expensiveQualifier = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Expensive");
IQualifierDeclaration whitefishQualifier = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Whitefish");
IParametedType type = getType("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Animal");
- Set<IBean> beans = cdiProject.getBeans(true, type, new IQualifierDeclaration[]{expensiveQualifier, whitefishQualifier});
+ Collection<IBean> beans = cdiProject.getBeans(true, type, new IQualifierDeclaration[]{expensiveQualifier, whitefishQualifier});
assertContainsBeanClasses(beans, new String[]{"org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.RoundWhitefish", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Halibut"});
}
@@ -158,7 +159,7 @@
* @throws CoreException
*/
public void testPolicyNotAvailableInNonDeploymentArchive() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Spider");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Spider");
assertFalse("Wrong number of the beans", beans.isEmpty());
assertDoesNotContainBeanClasses(beans, new String[]{"org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.CrabSpider", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.DaddyLongLegs"});
beans = cdiProject.getBeans("crabSpider", true);
@@ -172,7 +173,7 @@
* @throws CoreException
*/
public void testBeanTypesOnManagedBean() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Canary");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Canary");
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Bird");
@@ -189,7 +190,7 @@
public void testGenericBeanTypesOnManagedBean() throws CoreException {
IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Emu");
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QFlightlessBird<QAustralian;>;");
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]);
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -213,7 +214,7 @@
* @throws CoreException
*/
public void testBeanTypesOnProducerMethod() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Parrot");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Parrot");
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Parrot", "java.lang.Object");
@@ -232,7 +233,7 @@
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QCat<QEuropean;>;");
IQualifierDeclaration qualifier = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Tame");
assertNotNull("Can't find the qualifier.", qualifier);
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[]{qualifier});
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[]{qualifier});
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -255,7 +256,7 @@
IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QCat<QAfrican;>;");
IQualifierDeclaration qualifier = getQualifierDeclarationFromClass("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java", "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Wild");
assertNotNull("Can't find the qualifier.", qualifier);
- Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[]{qualifier});
+ Collection<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[]{qualifier});
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -274,7 +275,7 @@
* @throws CoreException
*/
public void testBeanTypesOnProducerField() throws CoreException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Dove");
+ Collection<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Dove");
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.Dove", "java.lang.Object");
@@ -284,7 +285,7 @@
public void testInjectionResolutionOfRestrictedProducerField() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/Zoo.java", "cats");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue(bean instanceof IProducerField);
@@ -292,7 +293,7 @@
public void testInjectionResolutionOfRestrictedProducerMethod() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/Zoo.java", "lions");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue(bean instanceof IProducerMethod);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/UnsatisfiedDependencyTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/UnsatisfiedDependencyTest.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/UnsatisfiedDependencyTest.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck.lookup;
-import java.util.Set;
+import java.util.Collection;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.IBean;
@@ -28,7 +28,7 @@
*/
public void testUnsatisfiedDependency() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java", "vanilla");
- Set<IBean> beans = cdiProject.getBeans(true, injection);
+ Collection<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals(0, beans.size());
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2012-08-13 22:09:57 UTC (rev 43009)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2012-08-13 22:11:04 UTC (rev 43010)
@@ -12,16 +12,14 @@
package org.jboss.tools.cdi.core.test.tck.validation;
import java.text.MessageFormat;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IProducerField;
-import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -63,7 +61,7 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 9, 25, 26);
IInjectionPointField p = getInjectionPointField(path, "s5");
- Set<IBean> bs = cdiProject.getBeans(false, p);
+ Collection<IBean> bs = cdiProject.getBeans(false, p);
assertEquals(3, bs.size());
Set<String> keys = new HashSet<String>();
@@ -76,7 +74,7 @@
assertTrue(keys.contains("TestNamed.foo6()"));
IInjectionPointParameter pp = getInjectionPointParameter(path, "doSmth");
- Set<IBean> bs2 = cdiProject.getBeans(false, pp);
+ Collection<IBean> bs2 = cdiProject.getBeans(false, pp);
assertEquals(3, bs2.size());
bs2.removeAll(bs);
assertTrue(bs2.isEmpty());
More information about the jbosstools-commits
mailing list