[webbeans-commits] Webbeans SVN: r3365 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Thu Jul 30 05:57:25 EDT 2009


Author: jharting
Date: 2009-07-30 05:57:25 -0400 (Thu, 30 Jul 2009)
New Revision: 3365

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/RemotePaymentProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java
Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Asynchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Sheep.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Synchronous.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousBinding.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousChequePaymentProcessor.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SimplePaymentProcessor.java
Log:
Rewritten tests for dynamic lookup

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod;
+
+ at PayBy(PaymentMethod.CHEQUE)
+ at ApplicationScoped
+class AdvancedPaymentProcessor implements AsynchronousPaymentProcessor
+{
+   private int value = 0;
+
+   public int getValue()
+   {
+      return value;
+   }
+
+   public void setValue(int value)
+   {
+      this.value = value;
+   }
+}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Asynchronous.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Asynchronous.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at BindingType
- at interface Asynchronous {
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousBinding.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousBinding.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-class AsynchronousBinding extends AnnotationLiteral<Asynchronous> implements Asynchronous {
-}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+interface AsynchronousPaymentProcessor extends PaymentProcessor
+{
+   int getValue();
+   void setValue(int value);
+}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
-
- at PayBy(CHEQUE)
-class ChequePaymentProcessor implements PaymentProcessor
-{
-   public void process()
-   {
-      
-   }
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -17,7 +17,10 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic;
 
 
+import java.util.Iterator;
+
 import javax.enterprise.inject.AmbiguousResolutionException;
+import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 
@@ -25,6 +28,8 @@
 import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.AnyLiteral;
+import org.jboss.jsr299.tck.literals.CurrentLiteral;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.testng.annotations.Test;
 
@@ -44,30 +49,17 @@
    })
    public void testObtainsInjectsInstanceOfInstance()
    {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      assert injectionPoint.getPaymentProcessor() instanceof Instance;
+      ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
+      assert injectionPoint.getPaymentProcessor() != null;
    }
    
-   @Test(groups = {"ri-broken"})
-   @SpecAssertions({
-      @SpecAssertion(section = "5.7", id ="ba"),
-      @SpecAssertion(section = "5.7", id ="ca"),
-      @SpecAssertion(section = "5.7.1", id ="ab")
-   })
-   // WBRI-307
-   public void testDynamicLookup()
-   {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      assert injectionPoint.getPaymentProcessor().select(new SynchronousBinding()).get() instanceof SynchronousChequePaymentProcessor;      
-   }   
-   
    @Test(groups = "ri-broken", expectedExceptions = IllegalArgumentException.class)
    @SpecAssertion(section = "5.7.1", id ="da")
    // WBRI-307
    public void testDuplicateBindingsThrowsException()
    {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      injectionPoint.getPaymentProcessor().select(new SynchronousBinding(), new SynchronousBinding());      
+      ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
+      injectionPoint.getAnyPaymentProcessor().select(new CurrentLiteral(), new CurrentLiteral());      
    }      
    
    @Test(groups = "ri-broken", expectedExceptions = IllegalArgumentException.class)
@@ -75,54 +67,108 @@
    // WBRI-307
    public void testNonBindingThrowsException()
    {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      injectionPoint.getPaymentProcessor().select(new NonBinding());      
+      ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
+      injectionPoint.getAnyPaymentProcessor().select(new AnnotationLiteral<NonBinding>(){});      
    }
    
+   @Test
+   @SpecAssertions({
+      @SpecAssertion(section = "5.7", id="ba"),
+      @SpecAssertion(section = "5.7", id ="ca"),
+      @SpecAssertion(section = "5.7.1", id ="aa"),
+      @SpecAssertion(section = "5.7.1", id ="ab"),
+      @SpecAssertion(section = "5.7.1", id="fa"),
+      @SpecAssertion(section = "5.7.1", id="fc")
+   })
+   public void testGetMethod() {
+      // initial setup of contextual instance
+      getInstanceByType(AdvancedPaymentProcessor.class, new AnyLiteral()).setValue(10);
+      
+      Instance<AsynchronousPaymentProcessor> instance = getInstanceByType(ObtainsInstanceBean.class).getPaymentProcessor();
+      assert instance.get() instanceof AdvancedPaymentProcessor;
+      assert instance.get().getValue() == 10;
+   }
+   
    @Test(groups = "ri-broken", expectedExceptions = UnsatisfiedResolutionException.class)
-   @SpecAssertions({
-      @SpecAssertion(section = "5.7.1", id = "fb"),
-      @SpecAssertion(section = "5.7.1", id = "l")})
+   @SpecAssertion(section = "5.7.1", id = "fba")
    // WBRI-307
    public void testUnsatisfiedDependencyThrowsException()
    {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      assert !injectionPoint.getPaymentProcessor().isUnsatisfied();
-      
-	   Instance<PaymentProcessor> instance = injectionPoint.getPaymentProcessor().select(new AsynchronousBinding());
-	   assert instance.isUnsatisfied();
-	   
-	   instance.get();
+      getInstanceByType(ObtainsInstanceBean.class).getPaymentProcessor().select(AdvancedPaymentProcessor.class).get();
    }
    
    @Test(expectedExceptions = AmbiguousResolutionException.class)
-   @SpecAssertion(section = "5.7.1", id = "fb")
+   @SpecAssertion(section = "5.7.1", id = "fbb")
    public void testAmbiguousDependencyThrowsException()
    {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      injectionPoint.getPaymentProcessor().get();      
+      getInstanceByType(ObtainsInstanceBean.class).getAnyPaymentProcessor().get();      
    }
    
+   @Test(groups = "ri-broken")
+   @SpecAssertions({
+      @SpecAssertion(section="5.7.1", id="aa"),
+      @SpecAssertion(section="5.7.1", id="ba"),
+      @SpecAssertion(section="5.7.1", id="ja"),
+      @SpecAssertion(section="5.7.1", id="ka")
+   })
+   // WBRI-307
+   public void testIteratorMethod() {
+      // initial setup of contextual instances
+      getInstanceByType(AdvancedPaymentProcessor.class, new AnyLiteral()).setValue(1);
+      getInstanceByType(RemotePaymentProcessor.class, new AnyLiteral()).setValue(2);
+      
+      Instance<PaymentProcessor> instance = getInstanceByType(ObtainsInstanceBean.class).getAnyPaymentProcessor();
+      Iterator<AsynchronousPaymentProcessor> iterator1 = instance.select(AsynchronousPaymentProcessor.class).iterator();
+      
+      AdvancedPaymentProcessor advanced = null;
+      RemotePaymentProcessor remote = null;
+      int instances = 0;
+      for (AsynchronousPaymentProcessor processor = iterator1.next(); iterator1.hasNext(); processor = iterator1.next()) {
+         if (processor instanceof AdvancedPaymentProcessor) {
+            advanced = (AdvancedPaymentProcessor) processor;
+         } else if (processor instanceof RemotePaymentProcessor) {
+            remote = (RemotePaymentProcessor) processor;
+         } else {
+            throw new RuntimeException("Unexpected instance returned by iterator.");
+         }
+         instances++;
+      }
+      
+      assert instances == 2;
+      assert (advanced != null) && (advanced.getValue() == 1);
+      assert (remote != null) && (remote.getValue() == 2);
+      
+      Iterator<RemotePaymentProcessor> iterator2 = instance.select(RemotePaymentProcessor.class, new PayByBinding()
+      {
+         public PaymentMethod value()
+         {
+            return PaymentMethod.CHEQUE;
+         }
+      }).iterator();
+      
+      assert iterator2.next().getValue() == 2;
+      assert !iterator2.hasNext();
+   }
+   
    @Test(groups= "ri-broken")
-   @SpecAssertion(section = "5.7.1", id = "m")
+   @SpecAssertion(section = "5.7.1", id = "l")
    // WBRI-307
-   public void testIsAmbiguous()
-   {
-      ObtainsInjectionPointBean injectionPoint = getInstanceByType(ObtainsInjectionPointBean.class);
-      assert injectionPoint.getPaymentProcessor().isAmbiguous();
-      Instance<PaymentProcessor> instance = injectionPoint.getPaymentProcessor().select(new SynchronousBinding());
-      assert !instance.isAmbiguous();
+   public void testIsUnsatisfied() {
+      ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
+      assert !injectionPoint.getAnyPaymentProcessor().isUnsatisfied();
+      assert injectionPoint.getPaymentProcessor().select(AdvancedPaymentProcessor.class).isUnsatisfied();
    }
    
-   @Test
+   @Test(groups= "ri-broken")
    @SpecAssertions({
-      @SpecAssertion(section="5.7", id="ba"),
-      @SpecAssertion(section="5.7", id="da"),
-      @SpecAssertion(section="5.7.1", id="fc")})
-   public void testGetMethodReturnsContextualReference() {
-      Sheep sheep = getInstanceByType(Sheep.class);
-      sheep.setAge(10);
-      Farm farm = getInstanceByType(Farm.class);
-      assert farm.getSheep().get().getAge() == sheep.getAge();
+      @SpecAssertion(section = "5.7", id = "da"),
+      @SpecAssertion(section = "5.7.1", id = "m")
+   })
+   // WBRI-307
+   public void testIsAmbiguous()
+   {
+      ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
+      assert injectionPoint.getAnyPaymentProcessor().isAmbiguous();
+      assert !injectionPoint.getPaymentProcessor().isAmbiguous();
    }
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Farm.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Farm.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-
-class Farm
-{
-   @Any private Instance<Sheep> sheep;
-
-   public Instance<Sheep> getSheep()
-   {
-      return sheep;
-   }
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-class NonBinding extends AnnotationLiteral<NonBindingAnnotation> implements NonBindingAnnotation
-{
-
-}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java (from rev 3345, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at interface NonBinding
+{
+
+}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at interface NonBindingAnnotation
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,15 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
-
-import javax.enterprise.inject.Instance;
-
-class ObtainsInjectionPointBean
-{
-   @PayBy(CHEQUE) Instance<PaymentProcessor> paymentProcessor;   
-   
-   public Instance<PaymentProcessor> getPaymentProcessor()
-   {
-      return paymentProcessor;
-   }
-}

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java (from rev 3345, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+
+class ObtainsInstanceBean
+{
+   @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor;
+   @Any Instance<PaymentProcessor> anyPaymentProcessor;
+   
+   public Instance<AsynchronousPaymentProcessor> getPaymentProcessor()
+   {
+      return paymentProcessor;
+   }
+
+   public Instance<PaymentProcessor> getAnyPaymentProcessor()
+   {
+      return anyPaymentProcessor;
+   }
+}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -2,5 +2,4 @@
 
 interface PaymentProcessor
 {
-   void process();
 }

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/RemotePaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/RemotePaymentProcessor.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/RemotePaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import javax.enterprise.context.ApplicationScoped;
+
+ at ApplicationScoped
+class RemotePaymentProcessor implements AsynchronousPaymentProcessor
+{
+   private int value = 0;
+
+   public int getValue()
+   {
+      return value;
+   }
+
+   public void setValue(int value)
+   {
+      this.value = value;
+   }
+}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Sheep.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Sheep.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Sheep.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import javax.enterprise.context.RequestScoped;
-
- at RequestScoped
-class Sheep
-{
-   private int age = 0;
-
-   public int getAge()
-   {
-      return age;
-   }
-
-   public void setAge(int age)
-   {
-      this.age = age;
-   }
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SimplePaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SimplePaymentProcessor.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SimplePaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,11 +1,11 @@
 package org.jboss.jsr299.tck.tests.lookup.dynamic;
 
-class SimplePaymentProcessor implements PaymentProcessor
-{
+import javax.enterprise.context.ApplicationScoped;
 
-   public void process()
-   {
-      
-   }
+import org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod;
 
+ at PayBy(PaymentMethod.CASH)
+ at ApplicationScoped
+class SimplePaymentProcessor implements SynchronousPaymentProcessor
+{
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Synchronous.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/Synchronous.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.BindingType;
-
- at Target( { TYPE, METHOD, PARAMETER })
- at Retention(RUNTIME)
- at Documented
- at BindingType
- at interface Synchronous {
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousBinding.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousBinding.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-public class SynchronousBinding extends AnnotationLiteral<Synchronous> implements Synchronous{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousChequePaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousChequePaymentProcessor.java	2009-07-30 09:24:30 UTC (rev 3364)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousChequePaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.dynamic;
-
-import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
-
- at PayBy(CHEQUE) @Synchronous
-class SynchronousChequePaymentProcessor implements PaymentProcessor
-{
-   public void process()
-   {
-      
-   }
-}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java	2009-07-30 09:57:25 UTC (rev 3365)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+interface SynchronousPaymentProcessor extends PaymentProcessor
+{
+}




More information about the weld-commits mailing list