Author: pete.muir(a)jboss.org Date: 2009-06-10 08:36:21 -0400 (Wed, 10 Jun 2009) New Revision: 2809 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 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/ConversationEndTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java Log: update tck to 20090519 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -13,7 +13,7 @@ * * @author David Allen * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact @IntegrationTest Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -25,7 +25,7 @@ /** * @author David Allen * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -11,14 +11,14 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact public class ConversationBeginTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "f") + @SpecAssertion(section = "6.7.4", id = "f") public void testConversationBeginMakesConversationLongRunning() { Conversation conversation = getInstanceByType(Conversation.class); 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-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -16,43 +16,42 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact - public class ConversationContextTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "e") + @SpecAssertion(section = "6.7.4", id = "e") public void testDefaultConversationIsTransient() { assert !getInstanceByType(Conversation.class).isLongRunning(); } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "ia") + @SpecAssertion(section = "6.7.4", id = "iaa") public void testBeanWithTypeConversation() { assert getBeans(Conversation.class).size() == 1; } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "ib") + @SpecAssertion(section = "6.7.4", id = "ib") public void testBeanWithRequestScope() { assert getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "ic") + @SpecAssertion(section = "6.7.4", id = "ic") public void testBeanWithDeploymentTypeStandard() { assert getBeans(Conversation.class).iterator().next().getDeploymentType().equals(Standard.class); } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "id") + @SpecAssertion(section = "6.7.4", id = "id") public void testBeanWithBindingCurrent() { boolean found = false; @@ -66,11 +65,11 @@ assert found; } - @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "ie") + @Test(groups = { "contexts", "ri-broken" }) + @SpecAssertion(section = "6.7.4", id = "ie") public void testBeanWithNameJavaxContextConversation() { - assert getBeans(Conversation.class).iterator().next().getName().equals("javax.context.conversation"); + assert getBeans(Conversation.class).iterator().next().getName().equals("javax.enterprise.context.conversation"); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -11,14 +11,14 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact public class ConversationEndTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "g") + @SpecAssertion(section = "6.7.4", id = "g") public void testConversationEndMakesConversationTransient() { Conversation conversation = getInstanceByType(Conversation.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -11,14 +11,14 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact public class ConversationIdSetByApplicationTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "ha") + @SpecAssertion(section = "6.7.4", id = "ha") public void testConversationIdMayBeSetByApplication() { Conversation conversation = getInstanceByType(Conversation.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -11,14 +11,14 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact public class ConversationIdSetByContainerTest extends AbstractJSR299Test { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "f") + @SpecAssertion(section = "6.7.4", id = "f") public void testConversationBeginMakesConversationLongRunning() { Conversation conversation = getInstanceByType(Conversation.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -14,7 +14,7 @@ * * @author Nicklas Karlsson * - * Spec version: PRD2 + * Spec version: 20090519 */ @Artifact(addCurrentPackage=false) @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @@ -31,7 +31,7 @@ { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "hb") + @SpecAssertion(section = "6.7.4", id = "hb") public void testConversationIdSetByContainerIsUnique() throws Exception { HttpClient client = new HttpClient(); @@ -43,7 +43,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "j") + @SpecAssertion(section = "6.7.4", id = "j") public void testTransientConversationInstancesDestroyedAtRequestEnd() throws Exception { HttpClient client = new HttpClient(); @@ -53,7 +53,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "k") + @SpecAssertion(section = "6.7.4", id = "k") public void testLongRunningConversationInstancesNotDestroyedAtRequestEnd() throws Exception { HttpClient client = new HttpClient(); @@ -63,7 +63,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "n") + @SpecAssertion(section = "6.7.4", id = "n") public void testManualCidPropagation() throws Exception { HttpClient client = new HttpClient(); @@ -73,7 +73,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "o") + @SpecAssertion(section = "6.7.4", id = "o") public void testConversationNotPropagated() throws Exception { HttpClient client = new HttpClient(); @@ -83,7 +83,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "p") + @SpecAssertion(section = "6.7.4", id = "p") public void testConversationsDontCrossSessionBoundary() throws Exception { HttpClient client = new HttpClient(); @@ -94,7 +94,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "b") + @SpecAssertion(section = "6.7.4", id = "b") public void testConversationActiveDuringNonFacesRequest() throws Exception { HttpClient client = new HttpClient(); @@ -102,7 +102,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "s") + @SpecAssertion(section = "6.7.4", id = "s") public void testConversationPropagationToNonExistentConversationLeadsToTransientConversation() throws Exception { HttpClient client = new HttpClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -29,7 +29,7 @@ { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "q") + @SpecAssertion(section = "6.7.4", id = "q") public void testInvalidatingSessionDestroysConversation() throws Exception { HttpClient client = new HttpClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -37,7 +37,7 @@ private static final String REDIRECT_STORM_STRENGTH = "15"; @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "l") + @SpecAssertion(section = "6.7.4", id = "l") public void testConversationPropagated() throws Exception { WebClient webClient = new WebClient(); @@ -55,7 +55,7 @@ } @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "m") + @SpecAssertion(section = "6.7.4", id = "m") public void testConversationPropagatedOverRedirect() throws Exception { WebClient webClient = new WebClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-06-10 11:57:21 UTC (rev 2808) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-06-10 12:36:21 UTC (rev 2809) @@ -29,7 +29,7 @@ { @Test(groups = { "contexts" }) - @SpecAssertion(section = "8.5.4", id = "k") + @SpecAssertion(section = "6.7.4", id = "k") public void testLongRunningConversationInstancesNotDestroyedAtRequestEnd() throws Exception { HttpClient client = new HttpClient();