[weld-commits] Weld SVN: r4886 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy.

[weld-commits at lists.jboss.org]

Author: jharting
Date: 2009-11-09 13:47:35 -0500 (Mon, 09 Nov 2009)
New Revision: 4886

Removed:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java
Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
Log:
Removed broken test

Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java	2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java	2009-11-09 18:47:35 UTC (rev 4886)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Car implements Serializable
-{
-   private static final long serialVersionUID = -8183045197385584658L;
-   private String make = "unknown";
-
-   public String getMake()
-   {
-      return make;
-   }
-
-   public void setMake(String name)
-   {
-      this.make = name;
-   }
-}

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java	2009-11-09 18:47:35 UTC (rev 4886)
@@ -19,6 +19,7 @@
 import java.io.IOException;
 
 import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -56,12 +57,11 @@
    @SpecAssertion(section = "5.4.2", id = "aa")
    public void testClientProxyInvocation()
    {
-      Bean<TunedTuna> tunaBean = getBeans(TunedTuna.class).iterator().next();
-      TunedTuna tuna = (TunedTuna) getCurrentManager().getReference(tunaBean, TunedTuna.class, getCurrentManager().createCreationalContext(tunaBean));
+      TunedTuna tuna = getInstanceByType(TunedTuna.class);
       assert getCurrentConfiguration().getBeans().isProxy(tuna);
       assert tuna.getState().equals("tuned");
-      // TODO expand this test
    }
+   
    @Test(expectedExceptions = { ContextNotActiveException.class, IllegalStateException.class })
    @SpecAssertions({
       @SpecAssertion(section="5.4.2", id="ab"),
@@ -82,24 +82,4 @@
          setContextActive(getCurrentConfiguration().getContexts().getRequestContext());
       }
    }
-   
-   @Test(groups = "broken")
-   @SpecAssertion(section = "5.4", id = "d")
-   //WELD-229
-   public void testInvocationIsProcessedOnCurrentInstance() {
-      // create new car
-      getInstanceByType(Car.class).setMake("Honda");
-      // check that the car is injected
-      Garage garage = getInstanceByType(Garage.class);
-      assert garage.getMakeOfTheParkedCar().equals("Honda");
-      // destroy the request context
-      setContextInactive(getCurrentConfiguration().getContexts().getRequestContext());
-      setContextActive(getCurrentConfiguration().getContexts().getRequestContext());
-      // check that the old instance is not in the context anymore
-      // a new one should be created
-      assert getInstanceByType(Car.class).getMake().equals("unknown");
-      getInstanceByType(Car.class).setMake("Toyota");
-      // check that the invocation is processed by the current instance of injected bean
-      assert garage.getMakeOfTheParkedCar().equals("Toyota");
-   }
 }

Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java	2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java	2009-11-09 18:47:35 UTC (rev 4886)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-
-
- at ApplicationScoped
-class Garage
-{
-   @Inject
-   private Car car;
-
-   public String getMakeOfTheParkedCar()
-   {
-      return car.getMake();
-   }
-}