Author: pete.muir(a)jboss.org Date: 2009-07-23 09:14:00 -0400 (Thu, 23 Jul 2009) New Revision: 3152 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java Log: Match in review tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -59,17 +59,10 @@ } - private BeanManager currentManager; - protected void setCurrentManager(BeanManager currentManager) - { - this.currentManager = currentManager; - } - - protected BeanManager getCurrentManager() { - return currentManager; + return getCurrentConfiguration().getManagers().getManager(); } protected byte[] serialize(Object instance) throws IOException @@ -107,20 +100,6 @@ return JSR299ConfigurationImpl.get(); } - @Override - public void beforeMethod() - { - super.beforeMethod(); - setCurrentManager(getCurrentConfiguration().getManagers().getManager()); - } - - @Override - public void afterMethod() - { - super.afterMethod(); - setCurrentManager(null); - } - /** * Checks if all annotations are in a given set of annotations * Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -48,8 +48,7 @@ } @Test - //(a)SpecAssertion(section=&quot;11.5.1&quot;, id="ba") - @SpecAssertion(section="review", id="review") + @SpecAssertion(section="11.5.1", id="ab") public void testAddingBindingType() { assert BeforeBeanDiscoveryObserver.isObserved(); @@ -58,8 +57,7 @@ } @Test - //(a)SpecAssertion(section=&quot;11.5.1&quot;, id="bb") - @SpecAssertion(section="review", id="review") + @SpecAssertion(section="11.5.1", id="ac") public void testAddingScopeType() { assert BeforeBeanDiscoveryObserver.isObserved(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -42,8 +42,7 @@ { @Test(groups="incontainer-ri-broken") - //(a)SpecAssertion(section=&quot;11.5.1&quot;, id="c") - @SpecAssertion(section="review", id="review") + @SpecAssertion(section="11.5.1", id="ag") public void testThrowsException() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -42,8 +42,7 @@ { @Test - //(a)SpecAssertion(section=&quot;11.5.1&quot;, id="bb") - @SpecAssertion(section="review", id="review") + @SpecAssertion(section="11.5.1", id="ac") public void testAddingScopeType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -18,7 +18,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -35,15 +35,13 @@ @Resources({ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) -@IntegrationTest -// TODO This *should be* DeploymentError -(a)ExpectedDeploymentException(DefinitionError.class) +@IntegrationTest +(a)ExpectedDeploymentException(DeploymentError.class) public class AddingPassivatingScopeTest extends AbstractJSR299Test { - @Test - //(a)SpecAssertion(section=&quot;11.5.1&quot;, id="bb") - @SpecAssertion(section="review", id="review") + @Test(groups="ri-broken") + @SpecAssertion(section="11.5.1", id="ac") public void testAddingScopeType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -7,7 +7,6 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.New; -import javax.enterprise.inject.deployment.Standard; import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; @@ -44,16 +43,6 @@ assert Dependent.class.equals(newEnterpriseBean.getScopeType()); } - @Test(groups = { "new", "deployment" }) - @SpecAssertion(section = "3.10", id = "review") - public void testNewBeanIsOfStandardDeploymentType() - { - Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); - assert beans.size() == 1; - newEnterpriseBean = beans.iterator().next(); - assert Standard.class.equals(newEnterpriseBean.getDeploymentType()); - } - @Test(groups = { "new" }) @SpecAssertion(section = "3.10", id = "r") public void testNewBeanIsHasOnlyNewBinding() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -8,7 +8,6 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.New; -import javax.enterprise.inject.deployment.Standard; import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; @@ -45,16 +44,6 @@ assert Dependent.class.equals(newSimpleBean.getScopeType()); } - @Test(groups = { "new", "deployment" }) - @SpecAssertion(section = "3.10", id = "review") - public void testNewBeanIsOfStandardDeploymentType() - { - Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); - assert beans.size() == 1; - Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next(); - assert Standard.class.equals(newSimpleBean.getDeploymentType()); - } - @Test(groups = { "new" }) @SpecAssertion(section = "3.10", id = "r") public void testNewBeanHasOnlyNewBinding() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -3,6 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; @@ -19,13 +20,15 @@ @ExpectedDeploymentException(DeploymentError.class) public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { + /** + * This method tests session beans + * + * @see org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() + * @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean() + * + */ @Test - //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") - @SpecAssertion(section = "review", id = "review") // removed from spec? was: - // If, in a particular deployment, more than one enabled bean directly specializes - // the same bean, the container automatically detects inconsistent specialization - // and treats it as a deployment problem, as defined in Section 12.4, "Problems - // detected automatically by the container" + @SpecAssertion(section = "4.3.3", id = "c") public void testTwoBeansSpecializeTheSameBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -3,6 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two.TwoSpecializingBeansForOneSpecializedTest; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -14,17 +15,18 @@ @ExpectedDeploymentException(DeploymentError.class) public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test { - + + /** + * This method tests producers + * + * @see org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() + * @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean() + */ @Test - //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") - @SpecAssertion(section = "review", id = "review") // removed from spec? was: - // If, in a particular deployment, more than one enabled bean directly specializes - // the same bean, the container automatically detects inconsistent specialization - // and treats it as a deployment problem, as defined in Section 12.4, "Problems - // detected automatically by the container" + @SpecAssertion(section = "4.3.3", id = "c") public void testTwoBeansSpecializeTheSameBean() { assert false; } - + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-23 13:07:33 UTC (rev 3151) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-07-23 13:14:00 UTC (rev 3152) @@ -3,6 +3,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -14,13 +15,15 @@ @ExpectedDeploymentException(DeploymentError.class) public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test { + /** + * This is for managed beans + * + * @see TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() + * @see org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean() + * + */ @Test - //(a)SpecAssertion(section=&quot;4.3.3&quot;, id = "ba") - @SpecAssertion(section = "review", id = "review") // removed from spec? was: - // If, in a particular deployment, more than one enabled bean directly specializes - // the same bean, the container automatically detects inconsistent specialization - // and treats it as a deployment problem, as defined in Section 12.4, "Problems - // detected automatically by the container" + @SpecAssertion(section="4.3.3", id = "c") public void testTwoBeansSpecializeTheSameBean() { assert false;