[webbeans-commits] Webbeans SVN: r2378 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-09 19:17:00 -0400 (Thu, 09 Apr 2009)
New Revision: 2378

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml
Log:
enable test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-04-09 23:12:44 UTC (rev 2377)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-04-09 23:17:00 UTC (rev 2378)
@@ -5,6 +5,7 @@
 
 import javax.context.Context;
 import javax.context.ContextNotActiveException;
+import javax.context.CreationalContext;
 import javax.context.Dependent;
 import javax.inject.AnnotationLiteral;
 import javax.inject.manager.Bean;
@@ -192,21 +193,28 @@
       assert Tarantula.isDependentContextActive();
    }
 
-   @Test(groups = { "broken", "contexts", "disposalMethod" })
+   @Test(groups = { "contexts", "disposalMethod" })
    @SpecAssertions({
       @SpecAssertion(section = "8.3", id = "g"),
       @SpecAssertion(section = "8.3", id = "j")
    })
    public void testContextIsActiveWhenInvokingDisposalMethod()
    {
-//      deployBeans(SpiderProducer.class);
-//      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
-//      Tarantula tarantula = tarantulaBean.create(new MyCreationalContext<Tarantula>());
-//      assert tarantula != null;
-//      SpiderProducer.setDependentContextActive(false);
-//      tarantulaBean.destroy(tarantula);
-//      assert SpiderProducer.isDependentContextActive();
-      assert false;
+      Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
+      Tarantula tarantula = tarantulaBean.create(new CreationalContext<Tarantula>()
+      {
+
+         public void push(Tarantula incompleteInstance)
+         {
+            // TODO Auto-generated method stub
+            
+         }
+         
+      });
+      assert tarantula != null;
+      SpiderProducer.setDependentContextActive(false);
+      tarantulaBean.destroy(tarantula);
+      assert SpiderProducer.isDependentContextActive();
    }
 
    @Test(groups = { "contexts", "observerMethod" })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java	2009-04-09 23:12:44 UTC (rev 2377)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java	2009-04-09 23:17:00 UTC (rev 2378)
@@ -26,7 +26,7 @@
 import org.jboss.testharness.impl.packaging.IntegrationTest;
 import org.jboss.testharness.impl.packaging.Packaging;
 import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
 import org.testng.annotations.Test;
 
 /**
@@ -37,12 +37,11 @@
 @Artifact
 @Packaging(PackagingType.EAR)
 @IntegrationTest
- at Resource(source="ejb-jar.xml", destination="META-INF/ejb-jar.xml")
+ at EjbJarXml("ejb-jar.xml")
 public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test
 {
-   
-   //TODO Once EJBs can be deployed in a WAR (3.1), this test should work
-   @Test(groups = { "enterpriseBeans", "broken" })
+
+   @Test(groups = { "enterpriseBeans" })
    @SpecAssertions( { @SpecAssertion(section = "3.2.1", id = "n") })
    public void testEjbDeclaredInXmlNotSimpleBean()
    {

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml	2009-04-09 23:12:44 UTC (rev 2377)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml	2009-04-09 23:17:00 UTC (rev 2378)
@@ -8,9 +8,10 @@
    <description>JSR-299 Enterprise Bean Definition Test</description>
    <display-name>JSR-299 Enterprise Bean Definition Test</display-name>
    <enterprise-beans>
+      
       <session>
          <ejb-name>Elephant</ejb-name>
-         <local>org.jboss.jsr299.tck.tests.implementation.enterprise.definition.ElephantLocal</local>
+         <business-local>org.jboss.jsr299.tck.tests.implementation.enterprise.definition.ElephantLocal</business-local>
          <ejb-class>org.jboss.jsr299.tck.tests.implementation.enterprise.definition.Elephant</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>