[webbeans-commits] Webbeans SVN: r1121 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck: integration/event and 2 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Tue Jan 20 06:45:05 EST 2009


Author: dallen6
Date: 2009-01-20 06:45:02 -0500 (Tue, 20 Jan 2009)
New Revision: 1121

Added:
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/PomeranianInterface.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Terrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java
Removed:
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/PomeranianInterface.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Terrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TibetanTerrier.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
Log:
Split out the integration tests for the events and some cleanup.

Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.webbeans.tck.integration.event;
+
+import java.util.Set;
+
+import javax.webbeans.Observer;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.testng.annotations.Test;
+
+/**
+ * Integration tests for Web Bean events.
+ * 
+ * @author David Allen
+ * 
+ */
+public class EventTest extends AbstractTest
+{
+   @Test(groups = { "stub", "events", "integration" })
+   @SpecAssertion(section = "8.4")
+   public void testObserverCalledBeforeTransactionCompleteMaySetRollbackOnly()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events", "integration" })
+   @SpecAssertion(section = "8.4")
+   public void testObserverManipulatingJTATransactionsDirectlyFails()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "events", "integration" })
+   @SpecAssertion(section = "8.5")
+   public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic()
+   {
+      deployBeans(Pomeranian.class);
+      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
+      assert beans.size() >= 2;
+      Set<Observer<String>> observers = manager.resolveObservers("An event");
+      assert observers.size() == 2;
+   }
+
+   @Test(groups = { "events", "integration" })
+   @SpecAssertion(section = "8.5")
+   public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
+   {
+      deployBeans(TibetanTerrier.class);
+      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
+      assert beans.size() >= 2;
+      Set<Observer<String>> observers = manager.resolveObservers("An event");
+      assert observers.size() == 1;
+   }
+
+   /**
+    * 
+    */
+   @Test(groups = { "events", "integration" })
+   @SpecAssertion(section = "8.5.7")
+   public void testEnterpriseBeanObserverMethodCalledWithCallerContext()
+   {
+      deployBeans(Pomeranian.class);
+      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
+      assert beans.size() >= 1;
+      String event = "A new event";
+      Set<Observer<String>> observers = manager.resolveObservers(event);
+      assert observers.size() == 2;
+
+      manager.fireEvent(event);
+      assert Thread.currentThread().equals(Pomeranian.notificationThread);
+   }
+
+   @Test(groups = { "stub", "events", "integration" })
+   @SpecAssertion(section = "8.5.7")
+   public void testTransactionalObserverThrownExceptionIsCaughtAndLogged()
+   {
+      assert false;
+   }
+
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Pomeranian.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.integration.event;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Named;
+import javax.webbeans.Observes;
+
+ at Stateful
+ at Tame
+ at Named("Teddy")
+class Pomeranian implements PomeranianInterface
+{
+   public static Thread notificationThread;
+   
+   public void observeSimpleEvent(@Observes String someEvent)
+   {
+      notificationThread = Thread.currentThread();
+   }
+
+   public static void staticallyObserveEvent(@Observes String someEvent)
+   {
+   }
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/PomeranianInterface.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/PomeranianInterface.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/PomeranianInterface.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/PomeranianInterface.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.integration.event;
+
+public interface PomeranianInterface
+{
+   
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Tame.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Tame.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.integration.event;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+ at interface Tame
+{
+
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Terrier.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Terrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Terrier.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/Terrier.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.integration.event;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Terrier
+{
+
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TibetanTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/TibetanTerrier.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.integration.event;
+
+import javax.ejb.Stateless;
+import javax.webbeans.Observes;
+
+ at Stateless
+class TibetanTerrier implements Terrier
+{
+   public void observeInitialized(@Observes String someEvent)
+   {
+   }
+}

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-class Egg
-{
-   
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -136,7 +136,6 @@
       // First test with the Class<T> of the event type
       manager.addObserver(observer, AnEventType.class);
       Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType());
-      assert !resolvedObservers.isEmpty();
       assert resolvedObservers.size() == 1;
       assert resolvedObservers.iterator().next() == observer;
 
@@ -146,7 +145,6 @@
       {
       });
       resolvedObservers = manager.resolveObservers(new AnEventType());
-      assert !resolvedObservers.isEmpty();
       assert resolvedObservers.size() == 2;
       boolean foundObserver = false;
       for (Observer<AnEventType> obs : resolvedObservers)
@@ -164,7 +162,6 @@
       Annotation[] bindingTypes = new Annotation[] { new RoleBinding("Admin"), new RoleBinding("Manager") };
       manager.addObserver(observer, AnEventType.class, bindingTypes);
       resolvedObservers = manager.resolveObservers(new AnEventType(), bindingTypes);
-      assert !resolvedObservers.isEmpty();
       assert resolvedObservers.size() == 3;
       foundObserver = false;
       for (Observer<AnEventType> obs : resolvedObservers)
@@ -263,7 +260,7 @@
       assert observer2.wasNotified;
    }
 
-   @Test(groups = { "events" })
+   @Test(groups = { "events", "broken" })
    @SpecAssertion(section = "8.4")
    public void testObserverThrowsExceptionAbortsNotifications()
    {
@@ -291,57 +288,28 @@
       // assert !observer.wasNotified;
    }
 
-   @Test(groups = { "stub", "events" })
-   @SpecAssertion(section = "8.4")
-   public void testObserverCalledBeforeTransactionCompleteMaySetRollbackOnly()
-   {
-      assert false;
-   }
-
-   @Test(groups = { "stub", "events" })
-   @SpecAssertion(section = "8.4")
-   public void testObserverManipulatingJTATransactionsDirectlyFails()
-   {
-      assert false;
-   }
-
    @Test(groups = { "events" })
    @SpecAssertion(section = "8.5")
-   public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic()
+   public void testMultipleObserverMethodsOK()
    {
-      deployBeans(Pomeranian.class);
+      // This bean has a couple observer methods
+      deployBeans(TeaCupPomeranian.class);
       Set<Bean<Object>> beans = manager.resolveByType(Object.class);
       assert beans.size() >= 2;
-      Set<Observer<String>> observers = manager.resolveObservers("An event");
-      assert observers.size() == 2;
-   }
 
-   @Test(groups = { "events" })
-   @SpecAssertion(section = "8.5")
-   public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
-   {
-      deployBeans(TibetanTerrier.class);
-      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
-      assert beans.size() >= 2;
-      Set<Observer<String>> observers = manager.resolveObservers("An event");
-      assert observers.size() == 1;
+      // Resolve the observers for String and Integer
+      Set<Observer<String>> resolvedStringObservers = manager.resolveObservers("A new event");
+      assert resolvedStringObservers.size() == 1;
+      
+      Set<Observer<Integer>> resolvedIntegerObservers = manager.resolveObservers(new Integer(42));
+      assert resolvedIntegerObservers.size() == 1;
    }
 
-   @Test(groups = { "events" })
-   @SpecAssertion(section = "8.5")
-   public void testMultipleObserverMethodsOK()
-   {
-      // Somewhat of a cheat, but this other test already does have 2 observer
-      // methods
-      // for the same event type and event bindings.
-      testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
-   }
-
    @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
    @SpecAssertion(section = { "8.5.1", "8.5.2" })
    public void testObserverMethodMustHaveOnlyOneEventParameter()
    {
-      deployBeans(YorkshireTerrier.class);
+      deployBeans(YorkshireTerrier_Broken.class);
 
       Set<Bean<Object>> beans = manager.resolveByType(Object.class);
       assert beans != null;
@@ -367,7 +335,6 @@
 
       // Resolve registered observers with an event containing no binding types
       Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event");
-      assert !resolvedObservers.isEmpty();
       assert resolvedObservers.size() == 2;
    }
 
@@ -417,7 +384,6 @@
       // If we can resolve the observer with the two binding types,
       // then it worked
       Set<Observer<String>> resolvedObservers = manager.resolveObservers("An event object", new RoleBinding("Admin"), new TameAnnotationLiteral());
-      assert !resolvedObservers.isEmpty();
       assert resolvedObservers.size() == 1;
 
    }
@@ -521,35 +487,16 @@
    @SpecAssertion(section = "8.5.7")
    public void testObserverMethodRegistration()
    {
-      // For now, this test is checking the registration of methods
-      testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
-   }
-
-   /**
-    * 
-    */
-   @Test(groups = { "broken", "events" })
-   @SpecAssertion(section = "8.5.7")
-   public void testEnterpriseBeanObserverMethodCalledWithCallerContext()
-   {
+      // This bean has two observer methods, one static and one non-static
       deployBeans(Pomeranian.class);
       Set<Bean<Object>> beans = manager.resolveByType(Object.class);
-      assert beans.size() >= 1;
-      String event = "A new event";
-      Set<Observer<String>> observers = manager.resolveObservers(event);
-      assert observers.size() == 2;
+      assert beans.size() >= 2;
 
-      manager.fireEvent(event);
-      assert Thread.currentThread().equals(Pomeranian.notificationThread);
+      // Resolve registered observers with an event containing no binding types
+      Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event");
+      assert resolvedObservers.size() == 2;
    }
 
-   @Test(groups = { "stub", "events" })
-   @SpecAssertion(section = "8.5.7")
-   public void testTransactionalObserverThrownExceptionIsCaughtAndLogged()
-   {
-      assert false;
-   }
-
    @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
    @SpecAssertion(section = "8.5.7")
    public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown()
@@ -969,12 +916,4 @@
    {
       assert false;
    }
-   
-   @Test @SpecAssertion(section="4.2")
-   public void testNonStaticProducerMethodNotInherited()
-   {
-      deployBeans(LazyFarmer.class);
-      assert manager.resolveObservers(new Egg()).isEmpty();
-   }
-
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Farmer.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,13 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.webbeans.Observes;
-
-class Farmer
-{
-   
-   public void observeEggLaying(@Observes Egg egg)
-   {
-      
-   }
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-public class LazyFarmer extends Farmer
-{
-   
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Pomeranian.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,13 +1,10 @@
 package org.jboss.webbeans.tck.unit.event;
 
-import javax.ejb.Stateful;
 import javax.webbeans.Named;
 import javax.webbeans.Observes;
 
- at Stateful
- at Tame
 @Named("Teddy")
-class Pomeranian implements PomeranianInterface
+class Pomeranian
 {
    public static Thread notificationThread;
    

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/PomeranianInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/PomeranianInterface.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/PomeranianInterface.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-public interface PomeranianInterface
-{
-   
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Terrier.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Terrier.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.ejb.Local;
-
- at Local
-public interface Terrier
-{
-
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TibetanTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TibetanTerrier.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/TibetanTerrier.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,12 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-
- at Stateless
-class TibetanTerrier implements Terrier
-{
-   public void observeInitialized(@Observes String someEvent)
-   {
-   }
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,14 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
- at Stateless
-class YorkshireTerrier
-{
-   public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
-   {
-   }
-}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/YorkshireTerrier_Broken.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.unit.event;
+
+import javax.webbeans.Observes;
+import javax.webbeans.manager.Initialized;
+import javax.webbeans.manager.Manager;
+
+class YorkshireTerrier_Broken
+{
+   public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
+   {
+   }
+}

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/Egg.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Egg.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+class Egg
+{
+   
+}

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/Farmer.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -1,6 +1,15 @@
 package org.jboss.webbeans.tck.unit.inheritance.specialization;
 
-public class Farmer
+import javax.webbeans.Observes;
+
+import org.jboss.webbeans.tck.unit.inheritance.specialization.Egg;
+
+class Farmer
 {
    
+   public void observeEggLaying(@Observes Egg egg)
+   {
+      
+   }
+   
 }

Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java (from rev 1120, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/LazyFarmer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/LazyFarmer.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -0,0 +1,7 @@
+package org.jboss.webbeans.tck.unit.inheritance.specialization;
+
+
+public class LazyFarmer extends Farmer
+{
+   
+}

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java	2009-01-20 08:57:15 UTC (rev 1120)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/SpecializationTest.java	2009-01-20 11:45:02 UTC (rev 1121)
@@ -2,22 +2,32 @@
 
 import javax.webbeans.InconsistentSpecializationException;
 
+import org.jboss.webbeans.tck.AbstractTest;
 import org.jboss.webbeans.tck.impl.SpecAssertion;
 import org.testng.annotations.Test;
 
-public class SpecializationTest
+public class SpecializationTest extends AbstractTest
 {
-   
-   @Test(expectedExceptions=InconsistentSpecializationException.class, groups={"stub", "specialization"})
+
+   @Test
+   @SpecAssertion(section = "4.2")
+   public void testNonStaticProducerMethodNotInherited()
+   {
+      deployBeans(LazyFarmer.class);
+      assert manager.resolveObservers(new Egg()).isEmpty();
+   }
+
+   @Test(expectedExceptions = InconsistentSpecializationException.class, groups = { "stub", "specialization" })
    public void testInconsistentSpecialization()
    {
-      
+
    }
-   
-   @Test @SpecAssertion(section="4.3")
+
+   @Test
+   @SpecAssertion(section = "4.3")
    public void testSpecializedBeanDirectlyExtendsLowerPriorityBean()
    {
-      
+
    }
-   
+
 }




More information about the weld-commits mailing list