[weld-commits] Weld SVN: r6258 - core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-20 13:41:32 -0400 (Thu, 20 May 2010)
New Revision: 6258

Modified:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
Log:
fix test for new proxies

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java	2010-05-20 17:24:50 UTC (rev 6257)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java	2010-05-20 17:41:32 UTC (rev 6258)
@@ -34,8 +34,7 @@
    @Test(description="WELD-234")
    public void testExtensionInjectableAsBean()
    {
-      assert SimpleExtension.getInstance() != null;
-      assert getReference(SimpleExtension.class).equals(SimpleExtension.getInstance());
+      assert getReference(SimpleExtension.class).isObservedBeforeBeanDiscovery();
    }
    
    @Test(description="WELD-243")

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java	2010-05-20 17:24:50 UTC (rev 6257)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java	2010-05-20 17:41:32 UTC (rev 6258)
@@ -24,17 +24,17 @@
 
 public class SimpleExtension implements Extension
 {
+
+   private static boolean observedBeforeBeanDiscovery;
    
-   private static SimpleExtension instance;
-   
    public void observe(@Observes BeforeBeanDiscovery event)
    {
-      SimpleExtension.instance = this;
+      observedBeforeBeanDiscovery = true;
    }
    
-   public static SimpleExtension getInstance()
+   public static boolean isObservedBeforeBeanDiscovery()
    {
-      return instance;
+      return observedBeforeBeanDiscovery;
    }
    
    public void observeBeforeShutdown(@Observes BeforeShutdown beforeShutdown, BeanManager beanManager)