[webbeans-commits] Webbeans SVN: r526 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans and 4 other directories.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2008-12-14 17:45:47 -0500 (Sun, 14 Dec 2008)
New Revision: 526

Modified:
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java
Log:
A couple more tests now work for Observables.

Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -28,10 +28,10 @@
 
 /**
  * Annotates a variable to be injected with an Event object that can be fired and 
- * observed by observer methods.
+ * observed by observer methods
  * 
  * @author David Allen
- * @author Gvin King
+ * @author Gavin King
  */
 
 @BindingType

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -95,7 +95,6 @@
     * @param enabledDeploymentTypes any enabled deployment types, an empty set
     * if none are specified
     */
-   @SuppressWarnings("unchecked")
    public ManagerImpl()
    {
       this.beans = new CopyOnWriteArrayList<Bean<?>>();

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -35,7 +35,7 @@
  * 
  * @author David Allen
  * 
- * @param <T>
+ * @param <T> The type of event being wrapped
  * @see javax.webbeans.Event
  */
 public class EventImpl<T> extends FacadeImpl<T> implements Event<T>

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -568,23 +568,21 @@
       manager.fireEvent(new Integer(1));
    }
 
-   @Test(groups = { "broken", "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
+   @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
    @SpecAssertion(section = "8.6")
    public void testDuplicateBindingsToFireFails()
    {
-      Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(SweeWaxbill.class);
-      assert beans.size() == 1;
-      SweeWaxbill bean = (SweeWaxbill)beans.iterator().next().create();
+      webBeansBootstrap.registerBeans(SweeWaxbill.class);
+      SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
       bean.methodThatFiresEvent();
    }
 
-   @Test(groups = { "broken", "events" })
+   @Test(groups = { "events" }, expectedExceptions={ DuplicateBindingTypeException.class })
    @SpecAssertion(section = "8.6")
    public void testDuplicateBindingsToObservesFails()
    {
-      Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(SweeWaxbill.class);
-      assert beans.size() == 1;
-      SweeWaxbill bean = (SweeWaxbill)beans.iterator().next().create();
+      webBeansBootstrap.registerBeans(SweeWaxbill.class);
+      SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
       bean.methodThatRegistersObserver();
    }
 

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/Role.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -1,8 +1,13 @@
 package org.jboss.webbeans.test.annotations;
 
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+
 import javax.webbeans.BindingType;
 
 @BindingType
+ at Retention(RUNTIME)
 public @interface Role
 {
    String value();

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java	2008-12-14 22:24:20 UTC (rev 525)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java	2008-12-14 22:45:47 UTC (rev 526)
@@ -9,8 +9,7 @@
 
 public class SweeWaxbill
 {
-   @Observable
-   @Role("Admin")
+   @Observable @Role("Admin")
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()