reorg tests

weld · Nov 3, 2009 · 901ef49 · 901ef49
1 parent e103b2a
commit 901ef49
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 56 deletions.
diff --git a/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java b/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java
diff --git a/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java b/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java
diff --git a/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java b/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java
diff --git a/...g/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java b/...g/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java
diff --git a/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java b/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+interface Animal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java b/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java
@@ -0,0 +1,7 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+class Antelope implements Animal
+{
+
+}
diff --git a/...annotatedItem/ClassAnnotatedItemTest.java → ...lection/clazz/ClassAnnotatedItemTest.java b/...annotatedItem/ClassAnnotatedItemTest.java → ...lection/clazz/ClassAnnotatedItemTest.java
@@ -1,26 +1,33 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem;
+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.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 
 @Artifact
-public class ClassAnnotatedItemTest extends AbstractWeldTest
+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()
    {

diff --git a/...ion/annotatedItem/anonymous/Kangaroo.java → .../test/unit/reflection/clazz/Kangaroo.java b/...ion/annotatedItem/anonymous/Kangaroo.java → .../test/unit/reflection/clazz/Kangaroo.java
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
+package org.jboss.weld.test.unit.reflection.clazz;
 
 
 class Kangaroo 

diff --git a/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java b/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java
@@ -0,0 +1,8 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+@Random
+class Order
+{
+
+}
diff --git a/.../implementation/annotatedItem/Random.java → ...ld/test/unit/reflection/clazz/Random.java b/.../implementation/annotatedItem/Random.java → ...ld/test/unit/reflection/clazz/Random.java
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.reflection.clazz;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

diff --git a/...dItem/genericMethodReturnType/Choice.java → ...d/test/unit/reflection/method/Choice.java b/...dItem/genericMethodReturnType/Choice.java → ...d/test/unit/reflection/method/Choice.java
@@ -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>
 {

diff --git a/...nericMethodReturnType/WeldMethodTest.java → ...nit/reflection/method/WeldMethodTest.java b/...nericMethodReturnType/WeldMethodTest.java → ...nit/reflection/method/WeldMethodTest.java
@@ -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 @@ public class WeldMethodTest
    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);

diff --git a/tests/unit-tests.xml b/tests/unit-tests.xml
@@ -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>