Author: pete.muir(a)jboss.org Date: 2009-07-27 17:21:44 -0400 (Mon, 27 Jul 2009) New Revision: 3292 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/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.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/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java Log: assign some tests to chapter 2 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 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -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.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; @@ -17,7 +17,8 @@ @Test(groups = { "initializerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "3.8.2", id = "b") + @SpecAssertion(section = "3.8.2", id = "b"), + @SpecAssertion(section = "2.3.5", id = "b") }) public void testBindingTypeOnInitializerParameter() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; 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.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -15,7 +16,9 @@ public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test(groups = "producerMethod") - @SpecAssertion(section = "3.3", id = "ia") + @SpecAssertions({ + @SpecAssertion(section = "3.3", id = "ia") + }) public void testParameterizedReturnTypeWithTypeParameter() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -1,10 +1,11 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; 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.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -15,7 +16,10 @@ public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.3", id = "ia") + @SpecAssertions({ + @SpecAssertion(section = "3.3", id = "ia"), + @SpecAssertion(section = "2.2.1", id="la") + }) public void testParameterizedType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -4,6 +4,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; 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.ExpectedDeploymentException; @@ -16,7 +17,10 @@ { @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "ha") + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "ha"), + @SpecAssertion(section="2.2.1", id="lb") + }) public void testParameterizedReturnTypeWithWildcard() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -9,12 +9,12 @@ import javax.enterprise.inject.TypeLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.literals.AnyLiteral; +import org.jboss.jsr299.tck.literals.CurrentLiteral; 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.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -142,7 +142,8 @@ @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "3.3.2", id = "be"), - @SpecAssertion(section = "3.3", id = "k") + @SpecAssertion(section = "3.3", id = "k"), + @SpecAssertion(section="2.3.3", id="b") }) public void testBindingType() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/RedSnapper.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -7,4 +7,19 @@ class RedSnapper implements Animal { + private boolean touched; + + public void ping() + { + this.touched = true; + } + + /** + * @return the touched + */ + public boolean isTouched() + { + return touched; + } + } 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 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -12,11 +12,11 @@ import javax.enterprise.inject.Specializes; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.impl.MockCreationalContext; 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.impl.MockCreationalContext; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -117,22 +117,26 @@ assert fishPond.postConstructCalled = true; // required by Managed Bean specification } - @Test(groups = {"beanLifecycle", "broken"}) + @Test(groups = {"beanLifecycle"}) @SpecAssertions({ @SpecAssertion(section="2", id="g"), - @SpecAssertion(section="2.2.1", id="b") + @SpecAssertion(section="2.2.1", id="b"), + @SpecAssertion(section="2.2.1", id="k") }) - public void testCreateReturnsInstanceOfBean() + public void testManagedBean() { - // TODO Test needs to use create()!!! PLM assert getBeans(RedSnapper.class).size() == 1; assert getInstanceByType(RedSnapper.class) instanceof RedSnapper; + RedSnapper redSnapper = getInstanceByType(RedSnapper.class); + redSnapper.ping(); + assert redSnapper.isTouched(); } @Test(groups = "injection") @SpecAssertions({ @SpecAssertion(section = "7.3.1", id = "aa"), - @SpecAssertion(section = "3.7.1", id = "a") + @SpecAssertion(section = "3.7.1", id = "a"), + @SpecAssertion(section="2.3.4", id="a") }) public void testCreateInjectsFieldsDeclaredInJava() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-27 20:49:52 UTC (rev 3291) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-07-27 21:21:44 UTC (rev 3292) @@ -20,10 +20,10 @@ import javax.enterprise.inject.TypeLiteral; +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.testng.annotations.Test; @@ -33,7 +33,11 @@ { @Test(groups = { "resolution", "ri-broken" }) - @SpecAssertion(section = "5.3.3", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "5.3.3", id = "a"), + @SpecAssertion(section = "2.2.1", id = "f"), + @SpecAssertion(section = "2.2.1", id = "g") + }) // WBRI-311 public void testAssignabilityToRawType() {