Start to fix i/c errors

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1983 1c488680-804c-0410-94cd-c6b725194a0e

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java

@@ -8,7 +8,7 @@
 @SessionScoped
 @Stateful
 @Named("John")
-class WrappedEnterpriseBean
+class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
 {
    @Remove
    public void bye() {

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBeanLocal.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.implementation;
+
+import javax.ejb.Local;
+
+@Local
+public interface WrappedEnterpriseBeanLocal
+{
+
+}

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Animal.java

@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+
+interface Animal
+{
+
+}

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Antelope.java

@@ -0,0 +1,7 @@
+package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+
+
+class Antelope implements Animal
+{
+
+}

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/ClassAnnotatedItemTest.java → impl/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation;
+package org.jboss.webbeans.test.unit.implementation.annotatedItem;
 
 import java.lang.annotation.Annotation;
 import java.util.Iterator;

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+
+import javax.inject.Production;
+
+@Production
+class Order
+{
+
+}

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java → impl/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation;
+package org.jboss.webbeans.test.unit.implementation.newsimple;
 
 import java.util.Set;
 
@@ -10,7 +10,6 @@
 import org.jboss.webbeans.introspector.AnnotatedItem;
 import org.jboss.webbeans.literal.NewLiteral;
 import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 @Artifact
@@ -21,7 +20,6 @@ public class NewSimpleBeanTest extends AbstractWebBeansTest
 
    private static final New NEW_LITERAL = new NewLiteral();
 
-   @BeforeMethod
    public void initNewBean() {
 
       assert manager.resolveByType(WrappedSimpleBean.class).size() == 1;
@@ -36,30 +34,35 @@ public void initNewBean() {
    @Test(groups = { "new" })
    public void testNewBeanHasImplementationClassOfInjectionPointType()
    {
+      initNewBean();
       assert newSimpleBean.getType().equals(WrappedSimpleBean.class);
    }
 
    @Test(groups = { "new" })
    public void testNewBeanIsSimpleWebBeanIfParameterTypeIsSimpleWebBean()
    {
+      initNewBean();
       assert newSimpleBean.getType().equals(wrappedSimpleBean.getType());
    }
 
    @Test(groups = { "new" })
    public void testNewBeanHasSameConstructorAsWrappedBean()
    {
+      initNewBean();
       assert wrappedSimpleBean.getConstructor().equals(newSimpleBean.getConstructor());
    }
 
    @Test(groups = { "new" })
    public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
    {
+      initNewBean();
       assert newSimpleBean.getInitializerMethods().equals(wrappedSimpleBean.getInitializerMethods());
    }
 
    @Test(groups = { "new" })
    public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
    {
+      initNewBean();
       Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getInjectionPoints();
       Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newSimpleBean.getInjectionPoints();
       assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedSimpleBean.java → impl/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation;
+package org.jboss.webbeans.test.unit.implementation.newsimple;
 
 import java.io.Serializable;
 

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/EnterpriseBeanProxyTest.java → impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation;
+package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
 
 import javassist.util.proxy.ProxyObject;
 
@@ -25,9 +25,9 @@ public void testNoInterfaceView() throws Exception
          @Override
          protected void execute() throws Exception
          {
-            Object mouse = manager.getInstanceByType(Mouse.class);
+            Object mouse = manager.getInstanceByType(MouseLocal.class);
             assert mouse instanceof ProxyObject;
-            assert mouse instanceof Mouse;
+            assert mouse instanceof MouseLocal;
          }
 
       }.run();

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/Mouse.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class Mouse implements MouseLocal
+{
+
+}

impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/MouseLocal.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface MouseLocal
+{
+
+}