[weld-commits] Weld SVN: r4194 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/conversation/client and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-10-19 09:15:36 -0400 (Mon, 19 Oct 2009) New Revision: 4194 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java Log: remove isLongRunning(), support @New Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-10-19 13:14:13 UTC (rev 4193) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-10-19 13:15:36 UTC (rev 4194) @@ -22,7 +22,7 @@ { super.beforeMethod(); Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral()); - if (conversation.isLongRunning()) + if (!conversation.isTransient()) { conversation.end(); } @@ -35,7 +35,7 @@ Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral()); assert conversation.isTransient(); conversation.begin(); - assert conversation.isLongRunning(); + assert !conversation.isTransient(); } @Test(groups = { "contexts" }, expectedExceptions = IllegalStateException.class) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-10-19 13:14:13 UTC (rev 4193) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-10-19 13:15:36 UTC (rev 4194) @@ -25,7 +25,7 @@ @SpecAssertion(section = "6.7.4", id = "e") public void testDefaultConversationIsTransient() { - assert !getInstanceByType(Conversation.class, new AnyLiteral()).isLongRunning(); + assert getInstanceByType(Conversation.class, new AnyLiteral()).isTransient(); } @Test(groups = { "contexts" }) @@ -62,7 +62,7 @@ public void testTransientConversationHasNullId() { Conversation conversation = getInstanceByType(Conversation.class, new AnyLiteral()); - assert !conversation.isLongRunning(); + assert conversation.isTransient(); assert conversation.getId() == null; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-10-19 13:14:13 UTC (rev 4193) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-10-19 13:15:36 UTC (rev 4194) @@ -21,7 +21,7 @@ { super.beforeMethod(); Conversation conversation = getInstanceByType(Conversation.class); - if (conversation.isLongRunning()) + if (!conversation.isTransient()) { conversation.end(); } @@ -38,10 +38,8 @@ Conversation conversation = getInstanceByType(Conversation.class); assert conversation.isTransient(); conversation.begin(); - assert conversation.isLongRunning(); assert !conversation.isTransient(); conversation.end(); - assert !conversation.isLongRunning(); assert conversation.isTransient(); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-19 13:14:13 UTC (rev 4193) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-19 13:15:36 UTC (rev 4194) @@ -50,7 +50,7 @@ Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class); HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse(); response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId()); - response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(conversation.isLongRunning())); + response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(!conversation.isTransient())); response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(OldSPIBridge.getInstanceByType(beanManager, Cloud.class).isRained()).toString()); response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString()); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java 2009-10-19 13:14:13 UTC (rev 4193) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java 2009-10-19 13:15:36 UTC (rev 4194) @@ -12,7 +12,7 @@ private Set<String> children; @Inject - public void initialize(@New HashSet<String> children) + public void initialize((a)New(HashSet.class) Set<String> children) { this.children = children; }