Author: pete.muir(a)jboss.org Date: 2009-04-09 19:53:02 -0400 (Thu, 09 Apr 2009) New Revision: 2381 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java Log: Fix broken test Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java 2009-04-09 23:39:19 UTC (rev 2380) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating; - -import javax.ejb.Local; - -@Local -public interface MaarianHaminaLocal_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java 2009-04-09 23:39:19 UTC (rev 2380) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating; - -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.inject.Current; - -@Stateful -@SessionScoped -class Maarianhamina_Broken implements MaarianHaminaLocal_Broken -{ - @SuppressWarnings("unused") - @Current - private Violation reference; - - @Remove - public void bye() { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java 2009-04-09 23:39:19 UTC (rev 2380) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -1,54 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating; - -import java.io.IOException; - -import javax.inject.IllegalProductException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Packaging; -import org.jboss.testharness.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -@Artifact -@IntegrationTest -(a)Packaging(PackagingType.EAR) -public class PassivatingContextIntegrationTest extends AbstractJSR299Test -{ - - @Test(groups = { "stub", "contexts", "passivation", "jms" }) - @SpecAssertion(section = "8.4", id = "u") - public void testJMSEndpointProxyIsSerializable() - { - assert false; - } - - @Test(groups = { "contexts", "passivation", "integration", "ri-broken" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "p") - public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException - { - getCurrentManager().getInstanceByType(MaarianHaminaLocal_Broken.class); - } - - /** - * the Web Bean is an EJB stateful session bean, and it is passivated by the - * EJB container. - */ - // TODO requires an EJB instance - @Test(groups = { "contexts", "passivation", "stub", "integration" }) - @SpecAssertion(section = "8.4", id = "g") - public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws IOException, ClassNotFoundException - { - assert false; - } - - @Test(groups = { "contexts", "passivation", "stub", "integration" }, expectedExceptions = IllegalProductException.class) - @SpecAssertion(section = "8.4", id = "p") - public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws Exception - { - assert false; - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + + +@BindingType +@Target({TYPE, METHOD, FIELD}) +@Retention(RUNTIME) +@interface British +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/British.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Cow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Cow.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +import javax.inject.Produces; + +public class CowProducer +{ + + @Produces @British + public Cow produce() + { + return new Cow(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/CowProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/MaarianHaminaLocal_Broken.java (from rev 2378, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/MaarianHaminaLocal_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/MaarianHaminaLocal_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/MaarianHaminaLocal_Broken.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +import javax.ejb.Local; + +@Local +public interface MaarianHaminaLocal_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/MaarianHaminaLocal_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Maarianhamina_Broken.java (from rev 2378, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/Maarianhamina_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Maarianhamina_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/Maarianhamina_Broken.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken +{ + @SuppressWarnings("unused") + @British Cow cow; + + @Remove + public void bye() { + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java (from rev 2378, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java 2009-04-09 23:53:02 UTC (rev 2381) @@ -0,0 +1,69 @@ +package org.jboss.jsr299.tck.tests.context.passivating.integration; + +import java.io.IOException; + +import javax.inject.IllegalProductException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +public class PassivatingContextIntegrationTest extends AbstractJSR299Test +{ + + @Test(groups = { "stub", "contexts", "passivation", "jms" }) + @SpecAssertion(section = "8.4", id = "u") + public void testJMSEndpointProxyIsSerializable() + { + assert false; + } + + @Test(groups = { "contexts", "passivation", "integration"}) + @SpecAssertion(section = "8.4", id = "p") + public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException + { + try + { + getCurrentManager().getInstanceByType(MaarianHaminaLocal_Broken.class); + } + catch (Throwable e) + { + while (!e.getClass().equals(Throwable.class)) + { + if (e.getClass().equals(IllegalProductException.class)) + { + return; + } + e = e.getCause(); + } + assert false; + } + } + + /** + * the Web Bean is an EJB stateful session bean, and it is passivated by the + * EJB container. + */ + // TODO requires an EJB instance + @Test(groups = { "contexts", "passivation", "stub", "integration" }) + @SpecAssertion(section = "8.4", id = "g") + public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws IOException, ClassNotFoundException + { + assert false; + } + + @Test(groups = { "contexts", "passivation", "stub", "integration" }, expectedExceptions = IllegalProductException.class) + @SpecAssertion(section = "8.4", id = "p") + public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain