Author: akazakov Date: 2010-03-17 10:42:39 -0400 (Wed, 17 Mar 2010) New Revision: 20889 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java Log: https://jira.jboss.org/jira/browse/JBIDE-5808 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-17 14:28:17 UTC (rev 20888) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-17 14:42:39 UTC (rev 20889) @@ -14,6 +14,7 @@ import junit.framework.TestSuite; import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.ValidationTest; @@ -28,6 +29,7 @@ suite.addTestSuite(BeanDefinitionTest.class); suite.addTestSuite(NameDefinitionTest.class); suite.addTestSuite(QualifierDefinitionTest.class); + suite.addTestSuite(EnterpriseQualifierDefinitionTest.class); suite.addTestSuite(ValidationTest.class); return suite; } Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2010-03-17 14:42:39 UTC (rev 20889) @@ -0,0 +1,80 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core.test.tck; + +import java.util.Set; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.core.IQualifierDeclaration; + +/** + * @author Alexey Kazakov + */ +public class EnterpriseQualifierDefinitionTest extends TCKTest { + + /** + * section 4.1 id) + * @throws CoreException + */ + public void testQualifierDeclaredInheritedIsInherited() throws CoreException { + IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy"); + IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.BorderCollieLocal"); + Set<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(); + assertEquals("Wrong number of qualifiers.", 2, qualifiers.size()); + assertContainsQualifier(bean, hairy); + assertContainsQualifierType(bean, "javax.enterprise.inject.Any"); + } + + /** + * section 4.1 ala) + * @throws JavaModelException + */ + public void testQualifierNotDeclaredInheritedIsNotInherited() throws JavaModelException { + IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny"); + IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.TameSkinnyHairlessCatLocal"); + Set<IBean> beans = cdiProject.getBeans(true, type, skinny); + assertTrue("Wrong number of beans.", beans.isEmpty()); + } + + /** + * section 4.1 ap) + * @throws CoreException + */ + public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException { + IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy"); + IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnglishBorderCollieLocal"); + Set<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(); + assertEquals("Wrong number of qualifiers.", 2, qualifiers.size()); + assertContainsQualifier(bean, hairy); + assertContainsQualifierType(bean, "javax.enterprise.inject.Any"); + } + + /** + * section 4.1 apa) + * @throws JavaModelException + */ + public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException { + IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny"); + IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.FamousCatLocal"); + Set<IBean> beans = cdiProject.getBeans(true, type, skinny); + assertTrue("Wrong number of beans.", beans.isEmpty()); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain