[webbeans-commits] Webbeans SVN: r3137 - in tck/trunk/impl/src/main: resources and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-07-22 12:09:39 -0400 (Wed, 22 Jul 2009)
New Revision: 3137

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Table.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Remove redundent test, improve tests, add assertion

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java	2009-07-22 16:02:00 UTC (rev 3136)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java	2009-07-22 16:09:39 UTC (rev 3137)
@@ -29,35 +29,16 @@
 import org.testng.annotations.Test;
 
 /**
- * Spec version: 20090519
+ * Spec version: 20090625
  */
 @IntegrationTest
 @Packaging(PackagingType.EAR)
 @Artifact
 public class DependentContextEjbTest extends AbstractJSR299Test
 {
-   @Test(groups = { "contexts", "injection", "ejb3", "integration" })
-   //@SpecAssertion(section = "8.3", id = "k")
-   @SpecAssertion(section = "unknown", id = "unknown")
-   public void testContextIsActiveDuringEJBDependencyInjection()
-   {
-      Bean<FoxRunLocal> foxRunBean = getBeans(FoxRunLocal.class).iterator().next();
-      CreationalContext<FoxRunLocal> creationalContext = getCurrentManager().createCreationalContext(foxRunBean);
-      FoxRunLocal foxRun = foxRunBean.create(creationalContext);
-      assert foxRun.getFox() != null;
-   }
 
-   @Test(groups = { "contexts", "postconstruct", "ejb3", "integration" })
-   @SpecAssertion(section = "6.4.1", id = "ka")
-   public void testContextIsActiveDuringEJBPostConstruct()
-   {
-      Fox.setDependentContextActiveDuringPostConstruct(false);
-      getInstanceByType(FoxLocal.class).getName();
-      assert Fox.isDependentContextActiveDuringPostConstruct();
-   }
-
    @Test(groups = { "contexts", "ejb3", "integration", "ri-broken"})
-   @SpecAssertion(section = "6.4.3", id = "baa")
+   @SpecAssertion(section = "6.4.2", id = "aaaa")
    public void testDestroyingEjbDestroysDependents() throws Exception
    {
       new RunInDependentContext()
@@ -81,7 +62,7 @@
    }
    
    @Test(groups = { "contexts", "ejb3", "integration","ri-broken", "broken" })
-   @SpecAssertion(section = "6.4.3", id = "baa")
+   @SpecAssertion(section = "6.4.2", id = "aaaa")
    public void testDestroyingEjbDestroysDependentSimples() throws Exception
    {
       new RunInDependentContext()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java	2009-07-22 16:02:00 UTC (rev 3136)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java	2009-07-22 16:09:39 UTC (rev 3137)
@@ -5,7 +5,7 @@
 import javax.enterprise.inject.Current;
 
 @RequestScoped @Stateful
-class House implements HouseLocal
+public class House implements HouseLocal
 {
    
    @Current RoomLocal room;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java	2009-07-22 16:02:00 UTC (rev 3136)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Room.java	2009-07-22 16:09:39 UTC (rev 3137)
@@ -5,7 +5,7 @@
 import javax.enterprise.inject.Current;
 
 @Stateful
-class Room implements RoomLocal
+public class Room implements RoomLocal
 {
    
    @Current TableLocal table;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Table.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Table.java	2009-07-22 16:02:00 UTC (rev 3136)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Table.java	2009-07-22 16:09:39 UTC (rev 3137)
@@ -4,7 +4,7 @@
 import javax.ejb.Stateful;
 
 @Stateful
-class Table implements TableLocal
+public class Table implements TableLocal
 {
    
    public static boolean destroyed;

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-22 16:02:00 UTC (rev 3136)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-22 16:09:39 UTC (rev 3137)
@@ -2419,9 +2419,14 @@
   </section>
 
   <section id="6.4.2" title="Dependent object destruction">
-    <assertion id="aaa">
+  
+    <assertion id="aaaa">
       <text>The container must ensure that all dependent objects of a non-contextual instance of a bean or other Java EE component class are destroyed when the instance is destroyed by the container.</text>
     </assertion>
+  
+    <assertion id="aaab">
+      <text>The container must ensure that all dependent objects of a non-contextual instance of a bean or other Java EE component class are destroyed when the instance is destroyed by the container.</text>
+    </assertion>
     
     <assertion id="bbb">
       <text>The container must ensure that all |@Dependent| scoped contextual instances injected into method parameters of an observer method of any container lifecycle event, as defined in Section 11.5, "Container lifecycle events", is destroyed after all observers of the |BeforeShutdown| event complete.</text>