Author: scabanovich Date: 2010-03-17 10:28:17 -0400 (Wed, 17 Mar 2010) New Revision: 20888 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/TCKTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6073 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 2010-03-17 14:27:32 UTC (rev 20887) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 14:28:17 UTC (rev 20888) @@ -17,6 +17,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -99,7 +100,7 @@ public void testMultipleQualifiers() throws JavaModelException { IQualifierDeclaration chunky = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky"); IQualifierDeclaration whitefish = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish"); - IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod"); + IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod"); Set<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish); assertEquals("Wrong number of beans.", 1, beans.size()); IBean bean = beans.iterator().next(); @@ -146,7 +147,7 @@ */ public void testQualifierDeclaredInheritedIsInherited() throws CoreException { IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy"); - IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie"); + IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie"); Set<IBean> beans = cdiProject.getBeans(true, type, hairy); assertEquals("Wrong number of beans.", 1, beans.size()); IBean bean = beans.iterator().next(); @@ -178,7 +179,7 @@ */ public void testQualifierDeclaredInheritedIsBlockedByIntermediateClass() throws CoreException { IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/ClippedBorderCollie.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy"); - IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie"); + IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie"); Set<IBean> beans = cdiProject.getBeans(true, type, hairy); assertEquals("Wrong number of beans.", 1, beans.size()); IBean bean = beans.iterator().next(); @@ -194,7 +195,7 @@ */ public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException { IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy"); - IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie"); + IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie"); Set<IBean> beans = cdiProject.getBeans(true, type, hairy); assertEquals("Wrong number of beans.", 1, beans.size()); IBean bean = beans.iterator().next(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 14:27:32 UTC (rev 20887) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 14:28:17 UTC (rev 20888) @@ -73,8 +73,9 @@ return tckProject; } - protected IType getType(String name) throws JavaModelException { - return EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name); + protected IParametedType getType(String name) throws JavaModelException { + IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name); + return type == null ? null : cdiProject.getNature().getTypeFactory().newParametedType(type); } public static IProject findTestProject() { @@ -107,7 +108,7 @@ } protected Set<IBean> getBeans(String typeName) throws JavaModelException { - IType type = getType(typeName); + IParametedType type = getType(typeName); assertNotNull("Can't find " + typeName + " type.", type); Set<IBean> beans = cdiProject.getBeans(true, type, new IType[0]); assertNotNull("There is no eny beans with " + typeName + " type", beans); @@ -119,10 +120,10 @@ Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); IBean bean = beans.iterator().next(); Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(); - IType type = getType(annotationTypeName); + IParametedType type = getType(annotationTypeName); for (IQualifierDeclaration declaration : declarations) { IAnnotation annotation = declaration.getDeclaration(); - if(type.getElementName().equals(annotation.getElementName())) { + if(type.getType().getElementName().equals(annotation.getElementName())) { return declaration; } } @@ -135,8 +136,8 @@ Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); IBean bean = beans.iterator().next(); final IType beanClass = bean.getBeanClass(); - final IType type = getType(annotationTypeName); - final IAnnotation annotation = beanClass.getAnnotation(type.getElementName()); + final IParametedType type = getType(annotationTypeName); + final IAnnotation annotation = beanClass.getAnnotation(type.getType().getElementName()); IAnnotationDeclaration annotationDeclaration = new IAnnotationDeclaration() { public IAnnotation getDeclaration() { return annotation; @@ -147,7 +148,7 @@ } public IType getType() { - return type; + return type.getType(); } public int getLength() {