[weld-commits] Weld SVN: r4613 - in core/trunk/tests: src/test/java/org/jboss/weld/test/unit and 4 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Tue Nov 3 09:04:06 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-03 09:04:04 -0500 (Tue, 03 Nov 2009)
New Revision: 4613
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
core/trunk/tests/unit-tests.xml
Log:
reorg tests
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous)
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+interface Animal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,7 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+class Antelope implements Animal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
-
-abstract class ChoiceParent<T>
-{
-}
-
-
-class Choice<T, E> extends ChoiceParent<T>
-{
- public Choice<T, E> aMethod()
- {
- return null;
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,25 +0,0 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
-
-import javax.enterprise.inject.spi.AnnotatedType;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ClassAnnotatedItemTest extends AbstractWeldTest
-{
-
- private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-
- @Test(groups = "broken")
- public void testNonStaticInnerClassWithGenericTypes()
- {
- AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
- WeldClassImpl.of(at, transformer);
- }
-
-}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java (from rev 4612, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,61 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.inject.Qualifier;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ClassAnnotatedItemTest
+{
+
+ private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+
+ @Test(groups = "broken", description="WELD-216")
+ public void testNonStaticInnerClassWithGenericTypes()
+ {
+ AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
+ WeldClassImpl.of(at, transformer);
+ }
+
+ @Test
+ public void testDeclaredAnnotations()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.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()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
+ assert annotations.size() == 1;
+ Iterator<Annotation> it = annotations.iterator();
+ Annotation production = it.next();
+ assert Random.class.equals(production.annotationType());
+ }
+
+ @Test
+ public void testEmpty()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ assert annotatedElement.getAnnotation(Stereotype.class) == null;
+ assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
+ WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
+ assert classWithNoAnnotations.getAnnotations().size() == 0;
+ }
+
+}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Kangaroo.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
+package org.jboss.weld.test.unit.reflection.clazz;
class Kangaroo
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,8 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+ at Random
+class Order
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+public @interface Random
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method (from rev 4612, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+package org.jboss.weld.test.unit.reflection.method;
abstract class ChoiceParent<T>
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+package org.jboss.weld.test.unit.reflection.method;
import javax.enterprise.util.TypeLiteral;
@@ -16,7 +16,7 @@
private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
- @Test(groups = "broken")
+ @Test(groups = "broken", description = "WELD-221")
public void testNonStaticInnerClassWithGenericTypes() throws Exception
{
WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/unit-tests.xml 2009-11-03 14:04:04 UTC (rev 4613)
@@ -42,9 +42,6 @@
<package name="org.jboss.weld.test.unit.environments.servlet" />
<package name="org.jboss.weld.test.unit.extensions" />
<package name="org.jboss.weld.test.unit.implementation" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem.anonymous" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType" />
<package name="org.jboss.weld.test.unit.implementation.enterpise" />
<package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" />
<package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" />
@@ -69,6 +66,8 @@
<package name="org.jboss.weld.test.unit.noncontextual" />
<package name="org.jboss.weld.test.unit.preinstantiatebeanmanager" />
<package name="org.jboss.weld.test.unit.security" />
+ <package name="org.jboss.weld.test.unit.reflection.clazz" />
+ <package name="org.jboss.weld.test.unit.reflection.method" />
</packages>
</test>
More information about the weld-commits
mailing list