Author: dallen6 Date: 2009-07-01 03:47:54 -0400 (Wed, 01 Jul 2009) New Revision: 2937 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java Log: Assigned some existing tests to ch. 11 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -6,6 +6,7 @@ import javax.enterprise.inject.spi.Bean; import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -19,7 +20,10 @@ public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.2", id = "q") + @SpecAssertions({ + @SpecAssertion(section = "6.2", id = "q"), + @SpecAssertion(section = "11.1", id = "a") + }) public void testDestroyedInstanceMustNotBeReturnedByGet() { Bean<MySessionBean> mySessionBean = getBeans(MySessionBean.class).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -208,7 +208,8 @@ @Test(groups = { "contexts", "disposalMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6.4.1", id = "gd") + @SpecAssertion(section = "6.4.1", id = "gd"), + @SpecAssertion(section = "11.1", id = "a") }) public void testContextIsActiveWhenInvokingDisposalMethod() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -48,7 +48,8 @@ @SpecAssertion(section="8.1", id="d"), @SpecAssertion(section="8.1.1", id="a"), @SpecAssertion(section="8.1.3", id="c"), - @SpecAssertion(section="8.3", id="a") + @SpecAssertion(section="8.3", id="a"), + @SpecAssertion(section="11.1.1", id="a") }) public void testDecoratorIsManagedBean() @@ -58,13 +59,24 @@ Set<Bean<?>> beans = getCurrentManager().getBeans(TimestampLogger.class); assert beans.size() == 1; assert decorators.get(0).equals(beans.iterator().next()); + boolean implementsInterface = false; + for (Class<?> interfaze : decorators.get(0).getClass().getInterfaces()) + { + if (interfaze.equals(Decorator.class)) + { + implementsInterface = true; + break; + } + } + assert implementsInterface; } @Test @SpecAssertions ({ @SpecAssertion(section="8.1", id="b"), - @SpecAssertion(section="8.1", id="c") + @SpecAssertion(section="8.1", id="c"), + @SpecAssertion(section="11.1.1", id="b") }) public void testDecoratedTypes() { @@ -81,7 +93,10 @@ } @Test - @SpecAssertion(section="8.1.2", id="a") + @SpecAssertions({ + @SpecAssertion(section="8.1.2", id="a"), + @SpecAssertion(section="11.1.1", id="c") + }) public void testDelegateInjectionPoint() { List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Logger.TYPES); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -38,7 +38,10 @@ } @Test - @SpecAssertion(section = "2", id = "b") + @SpecAssertions({ + @SpecAssertion(section = "2", id = "b"), + @SpecAssertion(section = "11.1", id = "b") + }) public void testBindingTypesNonEmpty() { assert getBeans(RedSnapper.class).size() == 1; @@ -49,7 +52,8 @@ @SpecAssertions({ @SpecAssertion(section = "2", id = "c"), @SpecAssertion(section = "2.4", id = "a"), - @SpecAssertion(section = "3.2.3", id = "ba") + @SpecAssertion(section = "3.2.3", id = "ba"), + @SpecAssertion(section = "11.1", id = "b") }) public void testHasScopeType() { @@ -61,7 +65,8 @@ @SpecAssertions({ @SpecAssertion(section = "2", id = "d"), @SpecAssertion(section = "2.5.3", id = "a"), - @SpecAssertion(section = "3.2.3", id = "bc") + @SpecAssertion(section = "3.2.3", id = "bc"), + @SpecAssertion(section = "11.1", id = "b") }) public void testHasDeploymentType() { @@ -70,7 +75,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "5.1.3", id = "ba") + @SpecAssertions({ + @SpecAssertion(section = "5.1.3", id = "ba"), + @SpecAssertion(section = "11.1", id = "e") + }) public void testIsNullable() throws Exception { assert getBeans(int.class).size() == 1; @@ -88,7 +96,8 @@ @SpecAssertion(section = "2.2.1", id = "a"), @SpecAssertion(section = "2.2.1", id = "d"), @SpecAssertion(section = "2.2.1", id = "e"), - @SpecAssertion(section = "2.2", id = "l") + @SpecAssertion(section = "2.2", id = "l"), + @SpecAssertion(section = "11.1", id = "b") }) public void testBeanTypes() { @@ -127,7 +136,10 @@ } @Test - @SpecAssertion(section = "3.2.3", id = "bd") + @SpecAssertions({ + @SpecAssertion(section = "3.2.3", id = "bd"), + @SpecAssertion(section = "11.1", id = "b") + }) public void testMultipleStereotypes() { Bean<ComplicatedTuna> tunaBean = getBeans(ComplicatedTuna.class).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -36,7 +36,10 @@ } @Test - @SpecAssertion(section = "2.3.1", id = "b") + @SpecAssertions({ + @SpecAssertion(section = "2.3.1", id = "b"), + @SpecAssertion(section = "11.1", id = "c") + }) public void testDefaultBindingForInjectionPoint() { Bean<Order> order = getBeans(Order.class).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -61,10 +61,9 @@ } @Test(groups = { "ri-broken" }) - @SpecAssertion(id="unknown", section="unknown") -// @SpecAssertions({ -// @SpecAssertion(section = "11.2", id = "ac") -// }) + @SpecAssertions({ + @SpecAssertion(section = "11.1", id = "f") + }) public void testOnlyEnabledBeansDeployed() { assert !getBeans(User.class).isEmpty(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-06-30 18:27:59 UTC (rev 2936) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-07-01 07:47:54 UTC (rev 2937) @@ -23,7 +23,6 @@ @Artifact public class ImplicitEventTest extends AbstractJSR299Test { - // FIXME ri-broken: remove @Any from the Registration @Initializer and verify the tests pass @Test @SpecAssertions({ @SpecAssertion(section = "10.4.2", id = "a"), @@ -43,7 +42,8 @@ @SpecAssertion(section = "10.4.2", id = "c"), @SpecAssertion(section = "10.4.2", id = "d"), @SpecAssertion(section = "10.4.2", id = "e"), - @SpecAssertion(section = "10.4.2", id = "g") + @SpecAssertion(section = "10.4.2", id = "g"), + @SpecAssertion(section = "6.6.2", id = "e") }) public void testImplicitEventHasCorrectAttributes() {