make tests pass i/c, slight reorg

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

tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java

@@ -23,7 +23,6 @@
 import org.jboss.webbeans.bean.ForwardingBean;
 import org.jboss.webbeans.literal.CurrentLiteral;
 import org.jboss.webbeans.test.AbstractWebBeansTest;
-import org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle.MockCreationalContext;
 import org.testng.annotations.Test;
 
 
@@ -190,7 +189,7 @@ public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean(
       BeanManager childActivity = getCurrentManager().createActivity();
       Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
       childActivity.addBean(dummyBean);
-      assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), new MockCreationalContext<Cow>()) != null;
+      assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
    }
 
    @Test

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

@@ -11,7 +11,7 @@ class Donkey
 
    public Donkey() throws NamingException
    {
-      beanManager = (BeanManager) new InitialContext().lookup("java:app/Manager");
+      beanManager = (BeanManager) new InitialContext().lookup("java:app/BeanManager");
    }
 
    public BeanManager getManager()

tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java

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

tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java

@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.environments.servlet;
+
+interface DeadlyAnimal
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java

@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.environments.servlet;
+
+interface DeadlySpider extends DeadlyAnimal
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java

@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.environments.servlet;
+
+class DefangedTarantula extends Tarantula
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Hound.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.ejb.Remove;
 import javax.ejb.Stateful;

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/HoundLocal.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.ejb.Local;
 

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Salmon.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.enterprise.inject.Named;
 import javax.enterprise.inject.deployment.Production;

tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java

@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.environments.servlet;
+
+interface ScottishFish extends Animal
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/SeaBass.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.deployment.Production;

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import java.util.Arrays;
 import java.util.HashMap;

tests/src/test/java/org/jboss/webbeans/test/unit/servlet/ServletLifecycleTest.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.servlet;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.servlet.http.HttpSession;
 
@@ -26,7 +26,7 @@
 @Classes(ConversationManager.class)
 public class ServletLifecycleTest extends AbstractWebBeansTest
 {
-   @Test(groups = "contexts")
+   @Test(groups = "incontainer-broken")
    public void testEndSessionWithActiveRequestAndSessionContexts()
    {
       ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
@@ -44,7 +44,7 @@ public void testEndSessionWithActiveRequestAndSessionContexts()
       assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
    }
 
-   @Test(groups = "contexts")
+   @Test(groups = "incontainer-broken")
    public void testEndSessionWithActiveRequestContextOnly()
    {
       ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
@@ -58,7 +58,7 @@ public void testEndSessionWithActiveRequestContextOnly()
       assert Boolean.TRUE.equals(RequestContext.instance().isActive()) : "Request context should still be active";
    }
 
-   @Test(groups = "contexts")
+   @Test(groups = "incontainer-broken")
    public void testEndSessionWithNoActiveRequestOrSessionContexts()
    {
       ServletLifecycle servletLifecycle = new ServletLifecycle(new ContextLifecycle());
@@ -69,7 +69,7 @@ public void testEndSessionWithNoActiveRequestOrSessionContexts()
       assert Boolean.FALSE.equals(RequestContext.instance().isActive()) : "Temporary request context should have been deactivated";
    }
 
-   @BeforeMethod(groups = "contexts")
+   @BeforeMethod(groups = "incontainer-broken")
    public void beforeMethod()
    {
       RequestContext.instance().setBeanStore(null);

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Sole.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.ejb.EJB;
 import javax.enterprise.inject.Named;

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Spider.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 class Spider implements Animal
 {

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tame.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tarantula.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 class Tarantula extends Spider implements DeadlySpider
 {

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/TarantulaProducer.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.enterprise.inject.Produces;
 

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Tuna.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import javax.enterprise.context.RequestScoped;
 

tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/Whitefish.java → tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.environments;
+package org.jboss.webbeans.test.unit.environments.servlet;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;