[webbeans-commits] Webbeans SVN: r437 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2008-12-07 11:37:02 -0500 (Sun, 07 Dec 2008)
New Revision: 437

Modified:
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
Log:
Fixed observer test which had invalid bindings that are now detected.

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java	2008-12-07 16:07:58 UTC (rev 436)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java	2008-12-07 16:37:02 UTC (rev 437)
@@ -1,8 +1,7 @@
 package org.jboss.webbeans.test;
-import java.lang.annotation.Annotation;
+
 import java.lang.reflect.Method;
 
-import javax.webbeans.AnnotationLiteral;
 import javax.webbeans.Observer;
 import javax.webbeans.Observes;
 
@@ -11,7 +10,8 @@
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
 import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl;
-import org.jboss.webbeans.test.annotations.Asynchronous;
+import org.jboss.webbeans.test.annotations.Role;
+import org.jboss.webbeans.test.bindings.RoleBinding;
 import org.jboss.webbeans.test.mock.MockManagerImpl;
 import org.jboss.webbeans.util.BeanFactory;
 import org.testng.annotations.BeforeMethod;
@@ -27,7 +27,7 @@
 public class ObserverTest
 {
    private MockManagerImpl manager;
-   //private SimpleBean<Tuna> tuna;
+   // private SimpleBean<Tuna> tuna;
    private SimpleBean<SampleObserver> ob;
    private AnnotatedMethod<Object> om;
    Observer<SampleEvent> observer;
@@ -42,16 +42,18 @@
    public static class SampleObserver
    {
 
-      public void observe(@Observes @Asynchronous SampleEvent e)
+      public void observe(@Observes @Role("Admin") SampleEvent e)
       {
          // An observer method
          notified = true;
       }
-      
+
    }
-   
-   public static @interface Foo {}
 
+   public static @interface Foo
+   {
+   }
+
    @BeforeMethod
    public void before() throws Exception
    {
@@ -61,9 +63,8 @@
       manager.addBean(ob);
       Method method = SampleObserver.class.getMethod("observe", SampleEvent.class);
       om = new AnnotatedMethodImpl<Object>(method, new AnnotatedClassImpl<SampleObserver>(SampleObserver.class));
-      observer = BeanFactory.createObserver( om, ob);
-      Annotation annotation = method.getParameterAnnotations()[0][1];
-      manager.addObserver(observer, SampleEvent.class, annotation);
+      observer = BeanFactory.createObserver(om, ob);
+      manager.addObserver(observer, SampleEvent.class, new RoleBinding("Admin"));
       notified = false;
    }
 
@@ -72,29 +73,32 @@
     * {@link org.jboss.webbeans.event.ObserverImpl#notify(javax.webbeans.Container, java.lang.Object)}
     * .
     */
-   @Test(groups = "observerMethod") @SpecAssertion(section={"7.5.7"})
+   @Test(groups = "observerMethod")
+   @SpecAssertion(section = { "7.5.7" })
    public final void testNotify() throws Exception
    {
-	  SampleEvent event = new SampleEvent();
-	  notified = false;
+      SampleEvent event = new SampleEvent();
+      notified = false;
       observer.notify(event);
       assert notified == true;
    }
 
-   @Test(groups = "observerMethod") @SpecAssertion(section={"7.5.7"})
+   @Test(groups = "observerMethod")
+   @SpecAssertion(section = { "7.5.7" })
    public final void testNotifyViaManager() throws Exception
    {
-	  notified = false;
+      notified = false;
       manager.fireEvent(new SampleEvent());
       assert notified == false;
-      manager.fireEvent(new Object(), new AnnotationLiteral<Asynchronous>() {});
+      manager.fireEvent(new Object(), new RoleBinding("Admin"));
       assert notified == false;
-      manager.fireEvent(new SampleEvent(), new AnnotationLiteral<Foo>() {});
-      assert notified == false;
-      manager.fireEvent(new SampleEvent(), new AnnotationLiteral<Asynchronous>() {});
+      manager.fireEvent(new SampleEvent(), new RoleBinding("Admin"));
       assert notified == true;
       notified = false;
-      manager.fireEvent(new SampleEvent(), new AnnotationLiteral<Asynchronous>() {}, new AnnotationLiteral<Foo>() {});
+      manager.fireEvent(new SampleEvent(), new RoleBinding("User"));
+      assert notified == false;
+      notified = false;
+      manager.fireEvent(new SampleEvent(), new RoleBinding("Admin"), new RoleBinding("User"));
       assert notified == true;
    }