Author: maschmid Date: 2013-10-11 09:27:03 -0400 (Fri, 11 Oct 2013) New Revision: 15611 Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml Log: add test for JBSEAM-5127 Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java =================================================================== --- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java 2013-10-10 22:11:05 UTC (rev 15610) +++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java 2013-10-11 13:27:03 UTC (rev 15611) @@ -114,6 +114,12 @@ } @Test + public void testViewOutputAjax() throws Exception + { + testCommonScenario("Output: begin;xyzzy;viewOutput;. Conversation: true.", "view_output_ajax"); + } + + @Test public void testRedirectOutput() throws Exception { testCommonScenario("Output: begin;xyzzy;redirectOutput;. Conversation: true.", "redirect_output"); @@ -126,6 +132,12 @@ } @Test + public void testPagesRenderAjax() throws Exception + { + testCommonScenario("Output: begin;xyzzy;pagesRender;. Conversation: true.", "pages_render_ajax"); + } + + @Test public void testPagesRedirect() throws Exception { testCommonScenario("Output: begin;xyzzy;pagesRedirect;. Conversation: true.", "pages_redirect"); Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml =================================================================== --- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml 2013-10-10 22:11:05 UTC (rev 15610) +++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml 2013-10-11 13:27:03 UTC (rev 15611) @@ -27,7 +27,15 @@ <h:commandButton id="view_output" value="view output" action="#{ConversationAction.viewOutput()}" /> </div> + <div> + <h:commandButton id="view_output_ajax" value="view output by AJAX" + action="#{ConversationAction.viewOutput()}"> + <f:ajax /> + </h:commandButton> + </div> + + <div> <h:commandButton id="redirect_output" value="redirect output" action="#{ConversationAction.redirectOutput()}" /> </div> @@ -35,6 +43,13 @@ <h:commandButton id="pages_render" value="pages render" action="#{ConversationAction.pagesRender}" /> </div> + <div> + <h:commandButton id="pages_render_ajax" value="pages render ajax" + action="#{ConversationAction.pagesRender}" > + <f:ajax /> + </h:commandButton> + </div> + <div> <h:commandButton id="pages_redirect" value="pages redirect" action="#{ConversationAction.pagesRedirect}" />