[weld-commits] Weld SVN: r5419 - in core/trunk/tests/src/test/java/org/jboss/weld/tests: activities/child and 4 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-11 15:00:54 -0500 (Mon, 11 Jan 2010)
New Revision: 5419

Modified:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java
Log:
Oops

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/ActivitiesTest.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -35,13 +35,8 @@
 public class ActivitiesTest extends AbstractWeldTest
 {
 
-   private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
 
-   static
-   {
-      DEFAULT_BINDINGS.add(new DefaultLiteral());
-   }
-
    private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType)
    {
       final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
@@ -118,7 +113,7 @@
 
          public Set<Annotation> getQualifiers()
          {
-            return DEFAULT_BINDINGS;
+            return DEFAULT_QUALIFIERS;
          }
 
          public Member getMember()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/child/SameBeanTypeInChildActivityTest.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -28,13 +28,8 @@
 @Artifact
 public class SameBeanTypeInChildActivityTest extends AbstractWeldTest
 {
-   private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
 
-   static
-   {
-      DEFAULT_BINDINGS.add(new DefaultLiteral());
-   }
-
    private Bean<?> createDummyBean(BeanManager beanManager)
    {
       final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/annotatedType/decoration/MockAnnotated.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -27,10 +27,9 @@
 import java.util.Set;
 
 import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
-import org.jboss.weld.literal.InjectLiteral;
-
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -38,7 +37,14 @@
  */
 public class MockAnnotated implements Annotated
 {
-   private final static Inject INJECT = new InjectLiteral();
+
+   private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject 
+   {
+      
+      public static final Inject INSTANCE = new InjectLiteral();
+      
+   }
+   
    private Annotated delegate;
    
    public MockAnnotated(Annotated delegate)
@@ -65,14 +71,14 @@
    {
       if (annotationType == Inject.class)
       {
-         return (T)INJECT;
+         return (T) InjectLiteral.INSTANCE;
       }
       return null;
    }
 
    public Set<Annotation> getAnnotations()
    {
-      return Collections.singleton((Annotation)INJECT);
+      return Collections.singleton((Annotation) InjectLiteral.INSTANCE);
    }
 
    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -23,13 +23,8 @@
 public class ManagerTest extends AbstractWeldTest
 {
    
-   private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+   private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
    
-   static
-   {
-      DEFAULT_BINDINGS.add(new DefaultLiteral());
-   }
-   
    private static interface Dummy {}
    
    private static class DummyBean implements Bean<Dummy>
@@ -45,7 +40,7 @@
 
       public Set<Annotation> getQualifiers()
       {
-         return DEFAULT_BINDINGS;
+         return DEFAULT_QUALIFIERS;
       }
 
       public Set<InjectionPoint> getInjectionPoints()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecorator.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -145,7 +145,7 @@
 
       public Set<Annotation> getQualifiers()
       {
-         return Collections.<Annotation>singleton(new DefaultLiteral());
+         return Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
       }
 
       public Bean<?> getBean()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	2010-01-11 19:46:57 UTC (rev 5418)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/resolution/LookupInstanceTest.java	2010-01-11 20:00:54 UTC (rev 5419)
@@ -18,7 +18,7 @@
    @Test
    public void testLookupInstance() throws Exception
    {
-      assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null; 
+      assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), DefaultLiteral.INSTANCE) == null; 
    }
    
 }