Author: akazakov Date: 2010-09-01 04:41:50 -0400 (Wed, 01 Sep 2010) New Revision: 24590 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.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/TCKTest.java Log: https://jira.jboss.org/browse/JBIDE-6957 Added JUnit tests Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-01 08:25:52 UTC (rev 24589) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-01 08:41:50 UTC (rev 24590) @@ -17,6 +17,7 @@ import org.jboss.tools.cdi.core.test.tck.AssignabilityOfRawAndParameterizedTypesTest; import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest; import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest; +import org.jboss.tools.cdi.core.test.tck.DecoratorDefinitionTest; import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest; import org.jboss.tools.cdi.core.test.tck.DynamicLookupTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; @@ -65,6 +66,7 @@ suite.addTestSuite(QualifierWithMembersTest.class); suite.addTestSuite(DynamicLookupTest.class); suite.addTestSuite(InterceptorDefinitionTest.class); + suite.addTestSuite(DecoratorDefinitionTest.class); suite.addTestSuite(ValidationTest.class); suite.addTestSuite(ObserverMethodResolutionTest.class); return new CDICoreTestSetup(suite); Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2010-09-01 08:41:50 UTC (rev 24590) @@ -0,0 +1,50 @@ +/******************************************************************************* + * 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.JavaModelException; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IDecorator; +import org.jboss.tools.cdi.core.IParametedType; + +/** + * @author Alexey Kazakov + */ +public class DecoratorDefinitionTest extends TCKTest { + + /** + * section 8.1 b) + * section 8.1 c) + * section 11.1.1 b) + * section 11.3.11 a) + * section 11.3.11 b) + * + * @throws JavaModelException + */ + public void testDecoratedTypes() throws JavaModelException, CoreException { + IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java"); + assertNotNull("Can't find the bean.", bean); + if(!(bean instanceof IDecorator)) { + fail("The bean is not a decorator."); + } + IDecorator decorator = (IDecorator)bean; + Set<IParametedType> types = decorator.getDecoratedTypes(); + assertContainsTypes(types, + "org.jboss.jsr299.tck.tests.decorators.definition.Foo", + "org.jboss.jsr299.tck.tests.decorators.definition.Bar", + "org.jboss.jsr299.tck.tests.decorators.definition.Baz"); + } +} \ 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/DecoratorDefinitionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 2010-09-01 08:25:52 UTC (rev 24589) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefaultNamedTest.java 2010-09-01 08:41:50 UTC (rev 24590) @@ -32,4 +32,4 @@ IBean bean = beans.iterator().next(); assertEquals("Wrong EL name.", "fallowDeer", bean.getName()); } -} +} \ No newline at end of file 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-09-01 08:25:52 UTC (rev 24589) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-09-01 08:41:50 UTC (rev 24590) @@ -347,6 +347,40 @@ return false; } + public static void assertContainsTypes(Set<IParametedType> types, String... typeNames) throws CoreException { + assertContainsTypes(true, types, typeNames); + } + + public static void assertContainsTypes(boolean checkTheNumberOfTypes, Set<IParametedType> types, String... typeNames) throws CoreException { + if(checkTheNumberOfTypes) { + assertEquals("The number of types should be the same", typeNames.length, types.size()); + } + for (String typeName : typeNames) { + assertContainsType(types, typeName); + } + } + + public static void assertContainsType(Set<IParametedType> types, String typeName) throws CoreException { + StringBuffer allTheTypes = new StringBuffer("[ "); + for (IParametedType type : types) { + allTheTypes.append(type.getType().getFullyQualifiedName()).append(" ,"); + } + allTheTypes.append(" ]"); + + for (IParametedType type : types) { + assertTrue("The set of types " + allTheTypes.toString() + " doesn't contain " + type.getType().getFullyQualifiedName() + " type.", containsType(types, typeName)); + } + } + + private static boolean containsType(Set<IParametedType> types, String typeName) throws CoreException { + for (IParametedType type : types) { + if(typeName.equals(type.getType().getFullyQualifiedName())) { + return true; + } + } + return false; + } + public static void assertContainsQualifier(IBean bean, IQualifierDeclaration declaration) throws CoreException { String typeName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); Set<IQualifier> qualifiers = bean.getQualifiers();