[webbeans-commits] Webbeans SVN: r3065 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context: dependent and 1 other directory.

Author: shane.bryzak(a)jboss.com Date: 2009-07-16 01:37:35 -0400 (Thu, 16 Jul 2009) New Revision: 3065 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java Log: matched conversation and dependent context tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-16 05:24:38 UTC (rev 3064) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-16 05:37:35 UTC (rev 3065) @@ -16,7 +16,7 @@ * * @author Nicklas Karlsson * - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact public class ConversationContextTest extends AbstractJSR299Test @@ -30,28 +30,28 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "iaa") + @SpecAssertion(section = "6.7.5", id = "iaa") public void testBeanWithTypeConversation() { assert getBeans(Conversation.class).size() == 1; } @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "ib") + @SpecAssertion(section = "6.7.5", id = "ib") public void testBeanWithRequestScope() { assert getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "ic") + @SpecAssertion(section = "6.7.5", id = "ic") public void testBeanWithDeploymentTypeStandard() { assert getBeans(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class); } @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "id") + @SpecAssertion(section = "6.7.5", id = "id") public void testBeanWithBindingCurrent() { boolean found = false; @@ -66,8 +66,8 @@ } @Test(groups = { "contexts", "ri-broken" }) - @SpecAssertion(section = "6.7.4", id = "ie") - public void testBeanWithNameJavaxContextConversation() + @SpecAssertion(section = "6.7.5", id = "ie") + public void testBeanWithNameJavaxEnterpriseContextConversation() { assert getBeans(Conversation.class).iterator().next().getName().equals("javax.enterprise.context.conversation"); } 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-07-16 05:24:38 UTC (rev 3064) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-07-16 05:37:35 UTC (rev 3065) @@ -19,7 +19,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @BeansXml("beans.xml") @@ -174,7 +174,7 @@ @Test(groups = { "contexts", "ri-broken" }, expectedExceptions = ContextNotActiveException.class) @SpecAssertions({ @SpecAssertion(section = "6.2", id = "ha"), - @SpecAssertion(section = "6.4.1", id = "ga") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active }) public void testContextIsInactive() { @@ -185,7 +185,7 @@ @Test(groups = { "contexts", "producerMethod" }) @SpecAssertions({ @SpecAssertion(section = "6.2", id = "ha"), - @SpecAssertion(section = "6.4.1", id = "gb") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active }) public void testContextIsActiveWhenInvokingProducerMethod() { @@ -197,7 +197,7 @@ } @Test(groups = { "contexts", "producerField"}) - @SpecAssertion(section = "6.4.1", id = "gc") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active public void testContextIsActiveWhenInvokingProducerField() { // Reset test class @@ -208,7 +208,7 @@ @Test(groups = { "contexts", "disposalMethod" }) @SpecAssertions({ - @SpecAssertion(section = "6.4.1", id = "gd"), + @SpecAssertion(section = "6.4", id = "g"), @SpecAssertion(section = "11.1", id = "a") }) public void testContextIsActiveWhenInvokingDisposalMethod() @@ -223,10 +223,7 @@ } @Test(groups = { "contexts", "observerMethod" }) - @SpecAssertions({ - @SpecAssertion(section = "6.4.1", id = "ge"), - @SpecAssertion(section = "6.4.1", id = "i") - }) + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active public void testContextIsActiveWhenCreatingObserverMethodInstance() { getCurrentManager().fireEvent(new HorseInStableEvent()); @@ -234,7 +231,7 @@ } @Test(groups = { "contexts", "el" }) - @SpecAssertion(section = "6.4.1", id = "h") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active public void testContextIsActiveWhenEvaluatingElExpression() throws Exception { SensitiveFox.setManager(getCurrentManager()); @@ -251,7 +248,7 @@ } @Test(groups = { "contexts", "beanLifecycle" }) - @SpecAssertion(section = "6.4.1", id = "ja") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active public void testContextIsActiveDuringBeanCreation() throws Exception { SensitiveFox.setManager(getCurrentManager()); @@ -270,7 +267,7 @@ } @Test(groups = { "contexts", "injection" }) - @SpecAssertion(section = "6.4.1", id = "jc") + @SpecAssertion(section = "6.4", id = "g") // Dependent context is now always active public void testContextIsActiveDuringInjection() { Bean<FoxRun> foxRunBean = getBeans(FoxRun.class).iterator().next(); @@ -280,7 +277,7 @@ @Test(groups = { "contexts", "beanDestruction"}) @SpecAssertions({ - @SpecAssertion(section = "6.4.3", id = "a"), + @SpecAssertion(section = "6.4.2", id = "aaa"), @SpecAssertion(section = "6.4", id = "b") }) public void testDestroyingSimpleParentDestroysDependents() throws Exception @@ -308,10 +305,10 @@ @Test(groups = { "contexts", "beanDestruction"}) @SpecAssertions({ - @SpecAssertion(section = "6.4.3", id = "a"), + @SpecAssertion(section = "6.4.2", id = "aaa"), @SpecAssertion(section = "6.4", id = "b") }) - public void testDestroyingSimpleParentDestroysDependentsOfSameBean() throws Exception + public void testDestroyingManagedParentDestroysDependentsOfSameBean() throws Exception { new RunInDependentContext() { @@ -337,7 +334,7 @@ } @Test(groups = { "contexts", "el"}) - @SpecAssertion(section = "6.4.3", id = "c") + @SpecAssertion(section = "6.4.2", id = "eee") public void testDependentsDestroyedWhenElEvaluationCompletes() throws Exception { new RunInDependentContext() @@ -357,7 +354,7 @@ } @Test(groups = { "contexts", "producerMethod" }) - @SpecAssertion(section = "6.4.3", id = "da") + @SpecAssertion(section = "6.4.2", id = "ddd") public void testDependentsDestroyedWhenProducerMethodCompletes() throws Exception { // Reset the test class @@ -369,7 +366,7 @@ } @Test(groups = { "contexts", "producerField" }) - @SpecAssertion(section = "6.4.3", id = "db") + @SpecAssertion(section = "6.4.2", id = "ddd") public void testDependentsDestroyedWhenProducerFieldCompletes() throws Exception { new RunInDependentContext() @@ -391,8 +388,8 @@ } @Test(groups = { "contexts", "disposalMethod", "ri-broken" }) - @SpecAssertion(section = "6.4.3", id = "dc") - public void testDependentsDestroyedWhenDisposalMethodCompletes() throws Exception + @SpecAssertion(section = "6.4.2", id = "ddd") + public void testDependentsDestroyedWhenDisposerMethodCompletes() throws Exception { new RunInDependentContext() { @@ -416,7 +413,7 @@ } @Test(groups = { "contexts", "observerMethod" }) - @SpecAssertion(section = "6.4.3", id = "dd") + @SpecAssertion(section = "6.4.2", id = "ddd") public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() throws Exception { new RunInDependentContext()