Author: pete.muir(a)jboss.org Date: 2009-08-18 13:31:02 -0400 (Tue, 18 Aug 2009) New Revision: 3553 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java Removed: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Child.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/DeclaringTypeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Parent.java Modified: ri/trunk/tests/unit-tests.xml Log: Split tests which just use CDI api into unit.annotated, cause these tests to run Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java (from rev 3548, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Child.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.unit.annotated; + + +public class Child extends Parent + { + } \ No newline at end of file Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java (from rev 3549, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/DeclaringTypeTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.test.unit.annotated; + +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * @author kkahn + * + */ +@Artifact +public class DeclaringTypeTest extends AbstractWebBeansTest +{ + + @Test + public void testInheritance() + { + AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class); + assert type.getConstructors().size() == 1; + assert type.getFields().size() == 1; + for (AnnotatedField<? super Child> field : type.getFields()) + { + if (field.getJavaMember().getName().equals("parent")) + { + Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK + // - + // Returns + // Parent + Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL + // - + // Returns + // Child + } + else + { + Assert.fail("Unknown field " + field.getJavaMember()); + } + } + + assert type.getMethods().size() == 1; + for (AnnotatedMethod<? super Child> method : type.getMethods()) + { + if (method.getJavaMember().getName().equals("parentMethod")) + { + Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK + // - + // /Returns + // Parent + Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL + // - + // Returns + // Child + } + else + { + Assert.fail("Unknown method " + method.getJavaMember()); + } + } + } + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java (from rev 3548, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Parent.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.unit.annotated; +public class Parent +{ + int parent; + + void parentMethod() + { + + } +} + Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Child.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Child.java 2009-08-18 15:57:15 UTC (rev 3552) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Child.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -1,4 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; -public class Child extends Parent - { - } \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-08-18 15:57:15 UTC (rev 3552) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -1,54 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; - -import java.lang.annotation.Annotation; -import java.util.Iterator; -import java.util.Set; - -import javax.enterprise.inject.BindingType; -import javax.enterprise.inject.stereotype.Stereotype; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.introspector.WBClass; -import org.jboss.webbeans.introspector.jlr.WBClassImpl; -import org.jboss.webbeans.metadata.TypeStore; -import org.jboss.webbeans.resources.ClassTransformer; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.testng.annotations.Test; - -@Artifact -public class ClassAnnotatedItemTest extends AbstractWebBeansTest -{ - - private final ClassTransformer transformer = new ClassTransformer(new TypeStore()); - - @Test - public void testDeclaredAnnotations() - { - WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); - assert annotatedElement.getAnnotations().size() == 1; - assert annotatedElement.getAnnotation(Random.class) != null; - assert annotatedElement.getJavaClass().equals(Order.class); - } - - @Test - public void testMetaAnnotations() - { - WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); - Set<Annotation> annotations = annotatedElement.getMetaAnnotations(BindingType.class); - assert annotations.size() == 1; - Iterator<Annotation> it = annotations.iterator(); - Annotation production = it.next(); - assert Random.class.equals(production.annotationType()); - } - - @Test - public void testEmpty() - { - WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); - assert annotatedElement.getAnnotation(Stereotype.class) == null; - assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0; - WBClass<Antelope> classWithNoAnnotations = WBClassImpl.of(Antelope.class, transformer); - assert classWithNoAnnotations.getAnnotations().size() == 0; - } - -} Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -0,0 +1,54 @@ +package org.jboss.webbeans.test.unit.implementation.annotatedItem; + +import java.lang.annotation.Annotation; +import java.util.Iterator; +import java.util.Set; + +import javax.enterprise.inject.BindingType; +import javax.enterprise.inject.stereotype.Stereotype; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.introspector.WBClass; +import org.jboss.webbeans.introspector.jlr.WBClassImpl; +import org.jboss.webbeans.metadata.TypeStore; +import org.jboss.webbeans.resources.ClassTransformer; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class ClassAnnotatedItemTest extends AbstractWebBeansTest +{ + + private final ClassTransformer transformer = new ClassTransformer(new TypeStore()); + + @Test + public void testDeclaredAnnotations() + { + WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); + assert annotatedElement.getAnnotations().size() == 1; + assert annotatedElement.getAnnotation(Random.class) != null; + assert annotatedElement.getJavaClass().equals(Order.class); + } + + @Test + public void testMetaAnnotations() + { + WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); + Set<Annotation> annotations = annotatedElement.getMetaAnnotations(BindingType.class); + assert annotations.size() == 1; + Iterator<Annotation> it = annotations.iterator(); + Annotation production = it.next(); + assert Random.class.equals(production.annotationType()); + } + + @Test + public void testEmpty() + { + WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer); + assert annotatedElement.getAnnotation(Stereotype.class) == null; + assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0; + WBClass<Antelope> classWithNoAnnotations = WBClassImpl.of(Antelope.class, transformer); + assert classWithNoAnnotations.getAnnotations().size() == 0; + } + +} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/DeclaringTypeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/DeclaringTypeTest.java 2009-08-18 15:57:15 UTC (rev 3552) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/DeclaringTypeTest.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; - -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedType; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * @author kkahn - * - */ -@Artifact -public class DeclaringTypeTest extends AbstractWebBeansTest -{ - - @Test - public void testInheritance() - { - AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class); - assert type.getConstructors().size() == 1; - assert type.getFields().size() == 1; - for (AnnotatedField<? super Child> field : type.getFields()) - { - if (field.getJavaMember().getName().equals("parent")) - { - Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK - // - - // Returns - // Parent - Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL - // - - // Returns - // Child - } - else - { - Assert.fail("Unknown field " + field.getJavaMember()); - } - } - - assert type.getMethods().size() == 1; - for (AnnotatedMethod<? super Child> method : type.getMethods()) - { - if (method.getJavaMember().getName().equals("parentMethod")) - { - Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK - // - - // /Returns - // Parent - Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL - // - - // Returns - // Child - } - else - { - Assert.fail("Unknown method " + method.getJavaMember()); - } - } - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Parent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Parent.java 2009-08-18 15:57:15 UTC (rev 3552) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Parent.java 2009-08-18 17:31:02 UTC (rev 3553) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.annotatedItem; -public class Parent -{ - int parent; - - void parentMethod() - { - - } -} - Modified: ri/trunk/tests/unit-tests.xml =================================================================== --- ri/trunk/tests/unit-tests.xml 2009-08-18 15:57:15 UTC (rev 3552) +++ ri/trunk/tests/unit-tests.xml 2009-08-18 17:31:02 UTC (rev 3553) @@ -23,6 +23,7 @@ <package name="org.jboss.webbeans.test.unit.activities" /> <package name="org.jboss.webbeans.test.unit.activities.current" /> <package name="org.jboss.webbeans.test.unit.activities.child" /> + <package name="org.jboss.webbeans.test.unit.annotated" /> <package name="org.jboss.webbeans.test.unit.bootstrap" /> <package name="org.jboss.webbeans.test.unit.bootstrap.environments" /> <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterprise" />