[webbeans-commits] Webbeans SVN: r537 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Dec 16 17:25:06 EST 2008
Author: dallen6
Date: 2008-12-16 17:25:06 -0500 (Tue, 16 Dec 2008)
New Revision: 537
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.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/beans/BirdCage.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
Log:
A few more tests for the event bus.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-16 20:22:29 UTC (rev 536)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -59,11 +59,25 @@
*/
protected void init()
{
+ validateInjectionPoint();
super.init();
checkAnnotatedItem();
}
/**
+ * Performs early validation on the annotated item to make
+ * certain the field or parameter is of the proper type.
+ */
+ private void validateInjectionPoint()
+ {
+ if (!this.getAnnotatedItem().getType().equals(Event.class))
+ {
+ throw new DefinitionException("Observable field/parameter is not of type Event<T>: " + this.getAnnotatedItem());
+ }
+
+ }
+
+ /**
* Validates the annotated item
*/
private void checkAnnotatedItem()
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-16 20:22:29 UTC (rev 536)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -26,6 +26,10 @@
import org.jboss.webbeans.test.beans.RecluseSpider;
import org.jboss.webbeans.test.beans.StarFinch;
import org.jboss.webbeans.test.beans.TeaCupPomeranian;
+import org.jboss.webbeans.test.beans.broken.BlackRumpedWaxbill;
+import org.jboss.webbeans.test.beans.broken.CommonWaxbill;
+import org.jboss.webbeans.test.beans.broken.GoldbreastWaxbill;
+import org.jboss.webbeans.test.beans.broken.JavaSparrow;
import org.jboss.webbeans.test.beans.broken.OwlFinch;
import org.jboss.webbeans.test.beans.broken.SweeWaxbill;
import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
@@ -728,32 +732,72 @@
assert false;
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnNonEventTypeInjectionPointFails()
{
- assert false;
+ webBeansBootstrap.boot(new MockWebBeanDiscovery(CommonWaxbill.class));
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ CommonWaxbill bean = manager.getInstanceByType(CommonWaxbill.class);
+ assert bean != null;
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void testObservableannotationOnInjectionPointWithoutTypeParameterFails()
+ public void testObservableAnnotationOnInjectionPointWithoutTypeParameterFails()
{
- assert false;
+ webBeansBootstrap.boot(new MockWebBeanDiscovery(BlackRumpedWaxbill.class));
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ BlackRumpedWaxbill bean = manager.getInstanceByType(BlackRumpedWaxbill.class);
+ assert bean != null;
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void testObservableannotationOnInjectionPointWithWildcardedTypeParameterFails()
+ public void testObservableAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
{
- assert false;
+ webBeansBootstrap.boot(new MockWebBeanDiscovery(GoldbreastWaxbill.class));
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ GoldbreastWaxbill bean = manager.getInstanceByType(GoldbreastWaxbill.class);
+ assert bean != null;
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void testObservableannotationOnInjectionPointWithTypeVariabledTypeParameterFails()
+ public void testObservableAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
{
- assert false;
+ webBeansBootstrap.boot(new MockWebBeanDiscovery(JavaSparrow.class));
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ JavaSparrow bean = manager.getInstanceByType(JavaSparrow.class);
+ assert bean != null;
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
}
@Test(groups = { "stub", "events" })
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java 2008-12-16 20:22:29 UTC (rev 536)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -1,11 +1,13 @@
package org.jboss.webbeans.test.beans;
import javax.webbeans.Current;
+import javax.webbeans.Named;
import javax.webbeans.RequestScoped;
import org.jboss.webbeans.test.beans.StarFinch.Mess;
@RequestScoped
+ at Named("BirdCage")
public class BirdCage
{
@Current
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java 2008-12-16 20:22:29 UTC (rev 536)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -1,11 +1,13 @@
package org.jboss.webbeans.test.beans;
+import javax.webbeans.Named;
import javax.webbeans.Observes;
import javax.webbeans.RequestScoped;
import org.jboss.webbeans.test.beans.StarFinch.Mess;
@RequestScoped
+ at Named("FinchKeeper")
public class FinchKeeper
{
public FinchKeeper()
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java 2008-12-16 20:22:29 UTC (rev 536)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -1,11 +1,13 @@
package org.jboss.webbeans.test.beans;
import javax.webbeans.Event;
+import javax.webbeans.Named;
import javax.webbeans.Observable;
import javax.webbeans.Produces;
import javax.webbeans.RequestScoped;
@RequestScoped
+ at Named("StarFinch")
public class StarFinch
{
public static class Mess
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class BlackRumpedWaxbill
+{
+ @Observable
+ private Event simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import java.util.ArrayList;
+
+import javax.webbeans.Observable;
+
+public class CommonWaxbill
+{
+ @Observable
+ private ArrayList<String> simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class GoldbreastWaxbill
+{
+ @Observable
+ private Event<?> simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java 2008-12-16 22:25:06 UTC (rev 537)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import java.util.ArrayList;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class JavaSparrow
+{
+ @Observable
+ private Event<ArrayList<String>> simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list