[webbeans-commits] Webbeans SVN: r1704 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Feb 25 08:55:06 EST 2009
Author: dallen6
Date: 2009-02-25 08:55:06 -0500 (Wed, 25 Feb 2009)
New Revision: 1704
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java
Log:
Finished refactoring the Event tests for new artifact framework.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java 2009-02-25 13:00:20 UTC (rev 1703)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BullTerrier.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -1,12 +1,10 @@
package org.jboss.jsr299.tck.unit.event;
-import javax.ejb.Stateless;
import javax.event.Observes;
- at Stateless
class BullTerrier
{
- public void observesBadEvent(@Observes @Role("Admin") @Tame String someEvent)
+ public void observesBadEvent(@Observes @Role("Admin") @Tame MultiBindingType someEvent)
{
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 13:00:20 UTC (rev 1703)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -114,7 +114,7 @@
/**
* The Manager interface provides a method for firing events:
*/
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.2", id = "unknown")
public void testManagerFireEvent()
{
@@ -126,19 +126,15 @@
getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin"));
}
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5", id = "e")
public void testMultipleObserverMethodsOK()
{
- // This bean has a couple observer methods
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans.size() >= 2;
-
- // Resolve the observers for String and Integer
- Set<Observer<String>> resolvedStringObservers = getCurrentManager().resolveObservers("A new event");
+ // Resolve the observers for types 1 and 2
+ Set<Observer<ObservedType1>> resolvedStringObservers = getCurrentManager().resolveObservers(new ObservedType1());
assert resolvedStringObservers.size() == 1;
- Set<Observer<Integer>> resolvedIntegerObservers = getCurrentManager().resolveObservers(new Integer(42));
+ Set<Observer<ObservedType2>> resolvedIntegerObservers = getCurrentManager().resolveObservers(new ObservedType2());
assert resolvedIntegerObservers.size() == 1;
}
@@ -159,7 +155,7 @@
assert resolvedObservers.size() == 2;
}
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.2", id = "g")
public void testObserverMethodMayHaveMultipleBindingTypes()
{
@@ -167,7 +163,7 @@
assert beans != null;
// If we can resolve the observer with the two binding types,
// then it worked
- Set<Observer<String>> resolvedObservers = getCurrentManager().resolveObservers("An event object", new RoleBinding("Admin"), new TameAnnotationLiteral());
+ Set<Observer<MultiBindingType>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingType(), new RoleBinding("Admin"), new TameAnnotationLiteral());
assert resolvedObservers.size() == 1;
}
@@ -253,16 +249,12 @@
assert false;
}
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.8", id = "a")
public void testObserverMethodRegistration()
{
- // This bean has two observer methods, one static and one non-static
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans.size() >= 2;
-
// Resolve registered observers with an event containing no binding types
- Set<Observer<String>> resolvedObservers = getCurrentManager().resolveObservers("A new event");
+ Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType());
assert resolvedObservers.size() == 2;
}
@@ -352,7 +344,7 @@
@Override
protected void execute() throws Exception
{
- SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
+ SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class);
bean.methodThatFiresEvent();
}
@@ -369,7 +361,7 @@
@Override
protected void execute() throws Exception
{
- SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
+ SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class);
bean.methodThatRegistersObserver();
}
@@ -429,7 +421,7 @@
}.run();
}
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "n")
public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception
{
@@ -441,7 +433,7 @@
{
// Retrieve the implicit event bean from the manager
// by its binding types (uses OrangeCheekedWaxbill)
- Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral());
+ Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin"));
assert !eventBeans.isEmpty();
}
@@ -597,12 +589,28 @@
* By default, Java implementation reuse is assumed. In this case, the
* producer, disposal and observer methods of the first bean are not
* inherited by the second bean.
+ * @throws Exception
*/
- @Test(groups = { "events", "inheritance", "broken" })
+ @Test(groups = { "events", "inheritance" })
@SpecAssertion(section = "4", id = "a")
- public void testNonStaticObserverMethodNotInherited()
+ public void testNonStaticObserverMethodNotInherited() throws Exception
{
- assert getCurrentManager().resolveObservers(new Egg()).isEmpty();
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg());
+ assert observers.size() == 1;
+
+ // Notify the observer so we can confirm that it
+ // is a method only on Farmer, and not LazyFarmer
+ observers.iterator().next().notify(new Egg());
+ assert Farmer.getObserverClazz().equals(Farmer.class);
+ }
+
+ }.run();
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java 2009-02-25 13:00:20 UTC (rev 1703)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Farmer.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -4,10 +4,16 @@
class Farmer
{
+ private static Class<?> observerClazz;
public void observeEggLaying(@Observes Egg egg)
{
-
+ observerClazz = this.getClass();
}
+
+ public static Class<?> getObserverClazz()
+ {
+ return observerClazz;
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.event;
+
+class MultiBindingType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/MultiBindingType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.event;
+
+class ObservedType1
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.event;
+
+class ObservedType2
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/ObservedType2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.event;
+
+import javax.event.Event;
+import javax.event.Fires;
+
+
+class OrangeCheekedWaxbill
+{
+ @Fires @Role("Admin") @Tame
+ protected Event<String> simpleEvent;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java (from rev 1700, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.unit.event;
+
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
+
+
+class SweeWaxbill
+{
+ @Fires @Role("Admin")
+ private Event<String> simpleEvent;
+
+ public void methodThatFiresEvent()
+ {
+ simpleEvent.fire("An event", new RoleBinding("Admin"));
+ }
+
+ public void methodThatRegistersObserver()
+ {
+ simpleEvent.observe(new Observer<String>()
+ {
+
+ public void notify(String event)
+ {
+ }
+ }, new RoleBinding("Admin"));
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill_Broken.java 2009-02-25 13:00:20 UTC (rev 1703)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/SweeWaxbill_Broken.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -1,28 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-import javax.event.Observer;
-
-
-class SweeWaxbill_Broken
-{
- @Fires @Role("Admin")
- private Event<String> simpleEvent;
-
- public void methodThatFiresEvent()
- {
- simpleEvent.fire("An event", new RoleBinding("Admin"));
- }
-
- public void methodThatRegistersObserver()
- {
- simpleEvent.observe(new Observer<String>()
- {
-
- public void notify(String event)
- {
- }
- }, new RoleBinding("Admin"));
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java 2009-02-25 13:00:20 UTC (rev 1703)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java 2009-02-25 13:55:06 UTC (rev 1704)
@@ -18,12 +18,12 @@
private static final long serialVersionUID = 1L;
}
- public void observeSimpleEvent(@Observes String someEvent)
+ public void observeSimpleEvent(@Observes ObservedType1 someEvent)
{
throw new OversizedException();
}
- public void observeAnotherSimpleEvent(@Observes Integer someEvent) throws TooSmallException
+ public void observeAnotherSimpleEvent(@Observes ObservedType2 someEvent) throws TooSmallException
{
throw new TooSmallException();
}
More information about the weld-commits
mailing list