[webbeans-commits] Webbeans SVN: r3294 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition and 6 other directories.

Author: pete.muir(a)jboss.org Date: 2009-07-27 19:00:58 -0400 (Mon, 27 Jul 2009) New Revision: 3294 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.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/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.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/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Match more chapter 3 tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -114,7 +114,8 @@ @SpecAssertions( { @SpecAssertion(section = "10.4.3", id = "a"), @SpecAssertion(section = "5.6.8", id = "c"), - @SpecAssertion(section = "2.3.5", id = "ca") + @SpecAssertion(section = "2.3.5", id = "ca"), + @SpecAssertion(section = "3.9", id = "a") }) public void testObserverMethodReceivesInjectionsOnNonObservesParameters() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -83,7 +83,10 @@ * @throws Exception */ @Test(groups = { "disposalMethod" }) - @SpecAssertion(section = "3.3.8", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "3.3.8", id = "a"), + @SpecAssertion(section = "3.9", id = "a") + }) public void testDisposalMethodParametersGetInjected() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -18,7 +18,7 @@ @Produces @Deadliest - public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula, @Current Tarantula tarantula) + public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula, Tarantula tarantula) { return tameTarantula.getDeathsCaused() >= tarantula.getDeathsCaused() ? tameTarantula : tarantula; } 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-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -9,13 +9,13 @@ import javax.enterprise.inject.New; import javax.enterprise.inject.spi.Bean; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; -import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.jsr299.tck.literals.NewLiteral; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; @@ -40,8 +40,9 @@ assert Dependent.class.equals(newEnterpriseBean.getScopeType()); } - @Test(groups = { "new" }) + @Test(groups = { "new", "broken" }) @SpecAssertion(section = "3.10", id = "r") + // @New has a member value now! public void testNewBeanIsHasOnlyNewBinding() { Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.initializer; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -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; @@ -18,9 +18,9 @@ { @Test(groups = { "initializerMethod", "ejb3" }) @SpecAssertions({ - @SpecAssertion(section = "3.8", id = "e"), - @SpecAssertion(section = "3.8", id = "ca") + @SpecAssertion(section = "3.8", id = "e") }) + // This DOES NOT TEST initializer methods on Java EE component classes PLM public void testInitializerMethodNotABusinessMethod() { AndalusianChicken.nonBusinessMethodCalled = false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -33,7 +33,8 @@ @SpecAssertion(section = "3.8", id = "g"), @SpecAssertion(section = "3.8.1", id = "a"), @SpecAssertion(section = "3.8.2", id = "aa"), - @SpecAssertion(section = "5.6.4", id = "b") + @SpecAssertion(section = "5.6.4", id = "b"), + @SpecAssertion(section = "3.9", id = "a") }) public void testMultipleInitializerMethodsAreCalled() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -35,7 +35,8 @@ @SpecAssertion(section = "3.1.4.2", id = "b"), @SpecAssertion(section = "3.1.4.2", id = "c"), @SpecAssertion(section = "2.3.5", id = "d"), - @SpecAssertion(section = "5.6.3", id = "a") + @SpecAssertion(section = "5.6.3", id = "a"), + @SpecAssertion(section = "3.9") }) public void testInjectionOfParametersIntoBeanConstructor() { @@ -136,7 +137,9 @@ @SpecAssertions({ @SpecAssertion(section = "7.3.1", id = "aa"), @SpecAssertion(section = "3.7.1", id = "a"), - @SpecAssertion(section="2.3.4", id="a") + @SpecAssertion(section="2.3.4", id="a"), + @SpecAssertion(section="3.7", id="aa"), + @SpecAssertion(section="3.7", id="ab") }) public void testCreateInjectsFieldsDeclaredInJava() { 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-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -10,13 +10,13 @@ import javax.enterprise.inject.New; import javax.enterprise.inject.spi.Bean; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; -import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.jsr299.tck.literals.NewLiteral; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -41,8 +41,9 @@ assert Dependent.class.equals(newSimpleBean.getScopeType()); } - @Test(groups = { "new" }) + @Test(groups = { "new", "broken" }) @SpecAssertion(section = "3.10", id = "r") + // @New has a member value now! public void testNewBeanHasOnlyNewBinding() { Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, new NewLiteral()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-07-27 23:00:58 UTC (rev 3294) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.lookup.injection; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -55,7 +55,9 @@ } @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.7", id = "aa") + // @SpecAssertion(section = "3.7", id = "aa") + @SpecAssertion(section = "review", id = "review") + // Looks like this got removed from the spec PLM public void testInjectingStaticField() { assert getBeans(BeanWithStaticBoundField_Broken.class).size() == 1; @@ -63,7 +65,8 @@ } @Test(groups = {"injection", "underInvestigation"}) - @SpecAssertion(section = "3.7", id = "ab") + // @SpecAssertion(section = "3.7", id = "ab") + // Looks like this got removed from the spec PLM public void testInjectingFinalField() { assert getBeans(BeanWithFinalBoundField_Broken.class).size() == 1; Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 22:37:48 UTC (rev 3293) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 23:00:58 UTC (rev 3294) @@ -1332,8 +1332,9 @@ <text>For each session bean, a second bean exists which has the same bean types.</text> </assertion> - <assertion id="l"> + <assertion id="l" testable="false"> <text>For each session bean, a second bean exists which has the same bean constructor.</text> + <note>This is a by product of the English sentence structure, session beans don't have bean constructors</note> </assertion> <assertion id="m">