Author: dallen6 Date: 2009-05-17 14:02:40 -0400 (Sun, 17 May 2009) New Revision: 2689 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Mammal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBean.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java Log: Added a few more bean implementation tests Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.inject.Current; + +@Stateful +public class DependentSessionBean implements DependentSessionInterface +{ + @Current + private StateKeeper stateKeeper; + + @Remove + public void remove() + { + stateKeeper.setRemoveCalled(true); + } + + @Remove + public void anotherRemoveWithParameters(String reason) + { + stateKeeper.setRemoveCalled(true); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; + +import javax.ejb.Local; + +@Local +public interface DependentSessionInterface +{ + public void remove(); + + public void anotherRemoveWithParameters(String reason); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-05-17 14:36:17 UTC (rev 2688) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -1,7 +1,12 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; +import static org.jboss.testharness.impl.packaging.PackagingType.EAR; + 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.testng.annotations.Test; /** @@ -10,28 +15,55 @@ * * Spec version: PRD2 */ +@Artifact +@Packaging(EAR) +@IntegrationTest public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test { - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" }) @SpecAssertion(section = "3.3.1", id = "a") - public void applicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans() + public void applicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans() throws Exception { - assert false; + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + DependentSessionInterface sessionBean = getCurrentManager().getInstanceByType(DependentSessionInterface.class); + sessionBean.remove(); + StateKeeper stateKeeper = getCurrentManager().getInstanceByType(StateKeeper.class); + assert stateKeeper.isRemoveCalled(); + } + }.run(); } - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" }) @SpecAssertion(section = "3.3.1", id = "da") - public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() + public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() throws Exception { - assert false; + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + DependentSessionInterface sessionBean = getCurrentManager().getInstanceByType(DependentSessionInterface.class); + sessionBean.anotherRemoveWithParameters("required"); + StateKeeper stateKeeper = getCurrentManager().getInstanceByType(StateKeeper.class); + assert stateKeeper.isRemoveCalled(); + } + }.run(); } - @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class) + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "ri-broken" }, expectedExceptions = UnsupportedOperationException.class) @SpecAssertion(section = "3.3.1", id = "c") public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean() { - assert false; + SessionScopedSessionInterface sessionBean = getCurrentManager().getInstanceByType(SessionScopedSessionInterface.class); + sessionBean.remove(); + assert false : "Should never reach this assertion"; } @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; + +import javax.context.SessionScoped; +import javax.ejb.Stateful; + +@Stateful +@SessionScoped +public class SessionScopedSessionBean implements SessionScopedSessionInterface +{ + + public void remove() + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; + +import javax.ejb.Local; + +@Local +public interface SessionScopedSessionInterface +{ + public void remove(); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class StateKeeper +{ + private boolean removeCalled = false; + + public boolean isRemoveCalled() + { + return removeCalled; + } + + public void setRemoveCalled(boolean removeCalled) + { + this.removeCalled = removeCalled; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-05-17 14:36:17 UTC (rev 2688) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -3,17 +3,19 @@ import javax.inject.DefinitionException; 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.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingAndSpecializedBeanHasNameTest +public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test { @Test @SpecAssertion(section = "4.3.1", id = "e") public void testSpecializingAndSpecializedBeanHasName() { + assert false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-05-17 14:36:17 UTC (rev 2688) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -3,18 +3,20 @@ import javax.inject.DefinitionException; 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.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingBeanImplementsInterfaceOnly +public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test { @Test(groups = { "specialization" }) @SpecAssertion(section = "3.2.7", id = "a") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { + assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-05-17 14:36:17 UTC (rev 2688) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -3,18 +3,20 @@ import javax.inject.DefinitionException; 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.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingBeanExtendsNothingTest +public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test { @Test(groups = { "specialization" }) @SpecAssertion(section = "3.2.7", id = "a") public void testSpecializingClassDirectlyExtendsNothing() { + assert false; } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java (from rev 2687, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/AnotherDeploymentType.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; + +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.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java (from rev 2687, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class Cow_Broken extends Mammal +{ + public Cow_Broken() + { + super("Herbivore"); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Mammal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Mammal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Mammal.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; + +class Mammal +{ + public Mammal(String type) + { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/Mammal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBean.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3; + +import javax.inject.DefinitionException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class SpecializingClassExtendsNonSimpleBean extends AbstractJSR299Test +{ + @Test(groups = { "specialization", "ri-broken" }) + @SpecAssertion(section = "3.2.7", id = "d") + public void testSpecializingClassExtendsNonSimpleBean() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-05-17 14:36:17 UTC (rev 2688) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-05-17 18:02:40 UTC (rev 2689) @@ -3,18 +3,20 @@ import javax.inject.InconsistentSpecializationException; 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.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class SpecializingBeanWithLowerPrecedenceTest +public class SpecializingBeanWithLowerPrecedenceTest extends AbstractJSR299Test { @Test @SpecAssertion(section="4.3.3", id="a") public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() { + assert false; } } Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml (from rev 2687, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/beans.xml 2009-05-17 18:02:40 UTC (rev 2689) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans>