reorg tests

tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java → tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation;
+package org.jboss.weld.test;
 
 import java.util.Set;
 

tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java → tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation;
+package org.jboss.weld.test;
 
 import javax.ejb.Remove;
 import javax.ejb.Stateful;

tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java → tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation;
+package org.jboss.weld.test;
 
 import javax.ejb.Local;
 

tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java → tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities;
+package org.jboss.weld.test.activities;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;

tests/src/test/java/org/jboss/weld/test/activities/Cow.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities;
+
+class Cow
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java → tests/src/test/java/org/jboss/weld/test/activities/Dummy.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.jboss.weld.test.unit.activities;
+package org.jboss.weld.test.activities;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java → tests/src/test/java/org/jboss/weld/test/activities/Field.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities;
+package org.jboss.weld.test.activities;
 
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;

tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java → tests/src/test/java/org/jboss/weld/test/activities/Fox.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities;
+package org.jboss.weld.test.activities;
 
 import javax.enterprise.event.Observes;
 

tests/src/test/java/org/jboss/weld/test/activities/NightTime.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities;
+
+class NightTime
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java → tests/src/test/java/org/jboss/weld/test/activities/Tame.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities;
+package org.jboss.weld.test.activities;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java → tests/src/test/java/org/jboss/weld/test/activities/child/BeanWithInjection.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
 
 class BeanWithInjection
 {

tests/src/test/java/org/jboss/weld/test/activities/child/MyBean.java

@@ -0,0 +1,7 @@
+package org.jboss.weld.test.activities.child;
+
+@SpecialBindingType
+class MyBean
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/child/SameBeanTypeInChildActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java → tests/src/test/java/org/jboss/weld/test/activities/child/SpecialBindingType.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/activities/current/Cow.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities.current;
+
+class Cow
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java → tests/src/test/java/org/jboss/weld/test/activities/current/Donkey.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java → tests/src/test/java/org/jboss/weld/test/activities/current/Dummy.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java → tests/src/test/java/org/jboss/weld/test/activities/current/Dusk.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/ELCurrentActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/EventCurrentActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java → tests/src/test/java/org/jboss/weld/test/activities/current/Field.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java → tests/src/test/java/org/jboss/weld/test/activities/current/Horse.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/InactiveScopeTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 

tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/InjectedManagerCurrentActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 

tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/InstanceCurrentActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/JndiManagerCurrentActivityTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 

tests/src/test/java/org/jboss/weld/test/activities/current/NightTime.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities.current;
+
+class NightTime
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java → tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScope.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java → tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScopeTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import java.lang.annotation.Annotation;
 

tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java → tests/src/test/java/org/jboss/weld/test/activities/current/Tame.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java → tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated;
+package org.jboss.weld.test.annotatedType;
 
 
 /**

tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.annotatedType;
+
+
+public class Child extends Parent
+   {
+   }

tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java → tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.test.unit.annotated;
+package org.jboss.weld.test.annotatedType;
 
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedMethod;

tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java → tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.annotated;
+package org.jboss.weld.test.annotatedType;
 
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedConstructor;

tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java → tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.annotated;
+package org.jboss.weld.test.annotatedType;
 public class Parent
 {
    int parent;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/AnnotatedTypeDecoratorTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/Foo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 /**
  * @author pmuir

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotated.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedCallable.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedConstructor.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.lang.reflect.Constructor;
 

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedField.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMember.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedMember;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMethod.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.lang.reflect.Method;
 

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedParameter.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedCallable;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedType.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 import java.util.HashSet;
 import java.util.Set;

tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java → tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/NotAnnotated.java

@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
 
 
 /**

tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Animal.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.beanDeployment.managed.multiple;
+
+interface Animal
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/BootstrapTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import java.util.HashMap;
 import java.util.List;

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Salmon.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import javax.inject.Named;
 

tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/ScottishFish.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.beanDeployment.managed.multiple;
+
+interface ScottishFish extends Animal
+{
+
+}

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/SeaBass.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import javax.enterprise.context.RequestScoped;
 

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Sole.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import javax.inject.Named;
 

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Tuna.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import javax.enterprise.context.RequestScoped;
 

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Whitefish.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/BootstrapTest.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleSimple;
+package org.jboss.weld.test.beanDeployment.managed.single;
 
 import java.util.HashMap;
 import java.util.List;

tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java → tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/Tuna.java

@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.single;
 
 import javax.enterprise.context.RequestScoped;
 

tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Animal.java

@@ -0,0 +1,6 @@
+package org.jboss.weld.test.beanDeployment.mixed;
+
+interface Animal
+{
+
+}