Seam SVN: r15414 - in branches/enterprise/WFK-2_1/jboss-seam/src/main: resources/META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:27:26 -0500 (Tue, 19 Feb 2013)
New Revision: 15414
Added:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml
Log:
readd JBSEAM-5045
Added: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java (rev 0)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java 2013-02-19 16:27:26 UTC (rev 15414)
@@ -0,0 +1,49 @@
+package org.jboss.seam.jsf;
+
+import javax.faces.context.ExceptionHandler;
+import javax.faces.context.ExceptionHandlerFactory;
+import javax.faces.context.FacesContext;
+
+import org.jboss.seam.web.ExceptionFilter;
+
+import com.sun.faces.application.ApplicationAssociate;
+import com.sun.faces.context.AjaxExceptionHandlerImpl;
+import com.sun.faces.context.ExceptionHandlerImpl;
+
+
+
+/**
+ * Factory not to be used AjaxExceptionHandlerImpl class and
+ * always be an exception to be thrown by capturad ExceptionFilter
+ *
+ * @see AjaxExceptionHandlerImpl
+ * @see ExceptionFilter
+ * @author Tiago Peruzzo
+ *
+ */
+public class SeamExceptionHandlerFactory extends ExceptionHandlerFactory {
+
+ private ApplicationAssociate associate;
+
+
+ @Override
+ public ExceptionHandler getExceptionHandler() {
+ FacesContext fc = FacesContext.getCurrentInstance();
+ ApplicationAssociate associate = getAssociate(fc);
+ return new ExceptionHandlerImpl(((associate != null) ? associate.isErrorPagePresent() : Boolean.TRUE));
+ }
+
+
+ // --------------------------------------------------------- Private Methods
+
+ private ApplicationAssociate getAssociate(FacesContext ctx) {
+ if (associate == null) {
+ associate = ApplicationAssociate.getCurrentInstance();
+ if (associate == null) {
+ associate = ApplicationAssociate.getInstance(ctx.getExternalContext());
+ }
+ }
+ return associate;
+ }
+
+}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-02-19 16:27:13 UTC (rev 15413)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-02-19 16:27:26 UTC (rev 15414)
@@ -6,6 +6,7 @@
<factory>
<application-factory>org.jboss.seam.jsf.SeamApplicationFactory</application-factory>
+ <exception-handler-factory>org.jboss.seam.jsf.SeamExceptionHandlerFactory</exception-handler-factory>
</factory>
<application>
11 years, 9 months
- 1
- 0
Seam SVN: r15413 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:27:13 -0500 (Tue, 19 Feb 2013)
New Revision: 15413
Added:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java
Removed:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java
Log:
back ported ErrorHandlingTest and ExceptionRedirectTest
Deleted: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java 2013-02-19 16:05:43 UTC (rev 15412)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java 2013-02-19 16:27:13 UTC (rev 15413)
@@ -1,133 +0,0 @@
-package org.jboss.seam.test.integration.faces;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.Serializable;
-import java.net.URL;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OverProtocol;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.test.integration.Deployments;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-/**
- * JBSEAM-5067, handling exception in ExceptionFilter while long-running conversation with
- * Page-scoped injection throws an exception in ServerConversationContext.flush
- *
- */
-(a)RunWith(Arquillian.class)
-@RunAsClient
-public class ConversationContextFlushTest
-{
-private final WebClient client = new WebClient();
-
- @ArquillianResource
- URL contextPath;
-
- @Deployment(name="BoundComponentConversationTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- // This is a client test, use a real (non-mocked) Seam deployment
- return Deployments.realSeamDeployment()
- .addClasses(TestComponent.class, PageScopedComponent.class)
- .addAsWebResource(new StringAsset(
- "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
- " xmlns:h=\"http://java.sun.com/jsf/html\"" +
- " xmlns:f=\"http://java.sun.com/jsf/core\"" +
- " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
- "<h:head></h:head>" +
- "<h:body>" +
- "<h:form id='form'>" +
- "<h:commandButton id='begin' action='#{testComponent.begin}' value='Begin' />" +
- "<h:commandButton id='throw' action='#{testComponent.throwTestException}' value='Throw' />" +
- "</h:form>" +
- "</h:body>" +
- "</html>"), "test.xhtml")
- .addAsWebResource(new StringAsset(
- "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
- " xmlns:h=\"http://java.sun.com/jsf/html\"" +
- " xmlns:f=\"http://java.sun.com/jsf/core\"" +
- " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
- "<h:head></h:head>" +
- "<h:body>" +
- " Exception handled, state: <h:outputText value='#{testComponent.state}'/>" +
- "</h:body>" +
- "</html>"), "error.xhtml")
- .addAsWebInfResource(new StringAsset(
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
- " xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
- "<exception class=\"org.jboss.seam.test.integration.faces.ConversationContextFlushTest.TestException\">" +
- "<redirect view-id=\"/error.xhtml\">"+
- "</redirect>"+
- "</exception>"), "pages.xml");
- }
-
- public static class TestException extends Exception
- {
- private static final long serialVersionUID = 1L;
- }
-
- @Scope(ScopeType.CONVERSATION)
- @Name("testComponent")
- public static class TestComponent implements Serializable
- {
- private static final long serialVersionUID = 1L;
-
- public String state = "";
-
- @In(create=true)
- private PageScopedComponent pageScoped;
-
- @Begin
- public void begin()
- {
- state += "begin;";
- }
-
- public void throwTestException() throws TestException
- {
- state += "throwTestException;";
- throw new TestException();
- }
-
- public String getState()
- {
- return state;
- }
- }
-
- @Scope(ScopeType.PAGE)
- @Name("pageScoped")
- public static class PageScopedComponent implements Serializable
- {
- private static final long serialVersionUID = 1L;
- }
-
- @Test
- public void testExceptionHandingDuringConversationWithPageScopedInjection() throws Exception
- {
- HtmlPage page = client.getPage(contextPath + "test.seam");
-
- page = page.getElementById("form:begin").click();
- page = page.getElementById("form:throw").click();
-
- assertTrue(page.getBody().getTextContent().contains("Exception handled, state: begin;throwTestException;"));
- }
-}
Copied: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java (from rev 15412, branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java)
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java 2013-02-19 16:27:13 UTC (rev 15413)
@@ -0,0 +1,134 @@
+package org.jboss.seam.test.integration.faces;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.net.URL;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.test.integration.Deployments;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+// TODO: merge this with ExceptionRedirectTest once JBSEAM-5067 is fixed
+//JBSEAM-5045
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class ErrorHandlingTest
+{
+ private static final int AJAX_WAIT = 1000;
+
+ private final WebClient client = new WebClient();
+
+ @ArquillianResource
+ URL contextPath;
+
+ @Deployment(name="ErrorHandlingTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ // This is a client test, use a real (non-mocked) Seam deployment
+ return Deployments.realSeamDeployment()
+ .addClasses(TestComponent.class, TestException.class)
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ "<h:form id='form'>" +
+ "<h:commandButton id='begin' action='#{testComponent.begin}' value='Begin' />" +
+ "<h:commandButton id='throwAjax' action='#{testComponent.throwTestException}' value='Throw Ajax'>" +
+ "<f:ajax/>" +
+ "</h:commandButton>" +
+ "</h:form>" +
+ "</h:body>" +
+ "</html>"), "test.xhtml")
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ " Exception handled, state: <h:outputText value='#{testComponent.state}'/>" +
+ "</h:body>" +
+ "</html>"), "error.xhtml")
+ .addAsWebInfResource(new StringAsset(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+ " xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
+ "<exception class=\"org.jboss.seam.test.integration.faces.ErrorHandlingTest.TestException\">" +
+ "<redirect view-id=\"/error.xhtml\">"+
+ "</redirect>"+
+ "</exception>"), "pages.xml");
+ }
+
+ public static class TestException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ @Scope(ScopeType.CONVERSATION)
+ @Name("testComponent")
+ public static class TestComponent implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ public String state = "";
+
+ @Begin
+ public void begin()
+ {
+ state += "begin;";
+ }
+
+ public void throwTestException() throws TestException
+ {
+ state += "throwTestException;";
+ throw new TestException();
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+ }
+
+ // JBSEAM-5045
+ @Test
+ public void testExceptionRedirectWithAjax() throws Exception
+ {
+ HtmlPage page = client.getPage(contextPath + "test.seam");
+
+ assertTrue("Page should contain form:begin button", page.getElementById("form:begin") != null);
+
+ page = page.getElementById("form:begin").click();
+ page = page.getElementById("form:throwAjax").click();
+
+ Thread.sleep(AJAX_WAIT);
+
+ page = (HtmlPage) client.getCurrentWindow().getEnclosedPage();
+
+ assertFalse("Page should not contain form:begin button, as it should have been redirected.", page.getElementById("form:begin") != null);
+
+ assertTrue(page.getBody().getTextContent().contains("Exception handled, state: begin;throwTestException;"));
+ }
+}
+
Copied: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java (from rev 15412, branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java)
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-02-19 16:27:13 UTC (rev 15413)
@@ -0,0 +1,164 @@
+package org.jboss.seam.test.integration.faces;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.net.URL;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.test.integration.Deployments;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ * JBSEAM-5067, handling exception in ExceptionFilter while long-running conversation with
+ * Page-scoped injection throws an exception in ServerConversationContext.flush
+ *
+ */
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class ExceptionRedirectTest
+{
+ private static final int AJAX_WAIT = 1000;
+
+ private final WebClient client = new WebClient();
+
+ @ArquillianResource
+ URL contextPath;
+
+ @Deployment(name="ExceptionRedirectTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ // This is a client test, use a real (non-mocked) Seam deployment
+ return Deployments.realSeamDeployment()
+ .addClasses(TestComponent.class, PageScopedComponent.class)
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ "<h:form id='form'>" +
+ "<h:commandButton id='begin' action='#{testComponent.begin}' value='Begin' />" +
+ "<h:commandButton id='throw' action='#{testComponent.throwTestException}' value='Throw' />" +
+ "<h:commandButton id='throwAjax' action='#{testComponent.throwTestException}' value='Throw Ajax'>" +
+ "<f:ajax/>" +
+ "</h:commandButton>" +
+ "</h:form>" +
+ "</h:body>" +
+ "</html>"), "test.xhtml")
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ " Exception handled, state: <h:outputText value='#{testComponent.state}'/>" +
+ "</h:body>" +
+ "</html>"), "error.xhtml")
+ .addAsWebInfResource(new StringAsset(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+ " xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
+ "<exception class=\"org.jboss.seam.test.integration.faces.ExceptionRedirectTest.TestException\">" +
+ "<redirect view-id=\"/error.xhtml\">"+
+ "</redirect>"+
+ "</exception>"), "pages.xml");
+ }
+
+ public static class TestException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ @Scope(ScopeType.CONVERSATION)
+ @Name("testComponent")
+ public static class TestComponent implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ public String state = "";
+
+ @In(create=true)
+ private PageScopedComponent pageScoped;
+
+ @Begin
+ public void begin()
+ {
+ state += "begin;";
+ }
+
+ public void throwTestException() throws TestException
+ {
+ state += "throwTestException;";
+ throw new TestException();
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+
+ /* // Workaround
+ @org.jboss.seam.annotations.intercept.BypassInterceptors
+ public boolean equals(Object obj)
+ {
+ return super.equals(obj);
+ }*/
+ }
+
+ @Scope(ScopeType.PAGE)
+ @Name("pageScoped")
+ public static class PageScopedComponent implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ @Test
+ public void testExceptionHandingDuringConversationWithPageScopedInjection() throws Exception
+ {
+ HtmlPage page = client.getPage(contextPath + "test.seam");
+
+ page = page.getElementById("form:begin").click();
+ page = page.getElementById("form:throw").click();
+
+ assertTrue(page.getBody().getTextContent().contains("Exception handled, state: begin;throwTestException;"));
+ }
+
+ // JBSEAM-5045
+ @Test
+ public void testExceptionHandingDuringConversationWithPageScopedInjectionWithAjax() throws Exception
+ {
+ HtmlPage page = client.getPage(contextPath + "test.seam");
+
+ page = page.getElementById("form:begin").click();
+ page = page.getElementById("form:throwAjax").click();
+
+ Thread.sleep(AJAX_WAIT);
+
+ page = (HtmlPage) client.getCurrentWindow().getEnclosedPage();
+
+ assertFalse("Page should not contain form:begin button, as it should have been redirected.", page.getElementById("form:begin") != null);
+ assertTrue("Page should contain 'Exception handled, state: begin;throwTestException;'", page.getBody().getTextContent().contains("Exception handled, state: begin;throwTestException;"));
+ }
+}
+
11 years, 9 months
- 1
- 0
Seam SVN: r15412 - in branches/enterprise/WFK-2_1/seam-integration-tests/src/test: java/org/jboss/seam/test/integration/faces/conversations and 8 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:05:43 -0500 (Tue, 19 Feb 2013)
New Revision: 15412
Added:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationAction.java
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/MyConversationEndingException.java
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyException.java
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/
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/error.xhtml
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/home.xhtml
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/output.xhtml
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/pages.xml
Log:
ConversationPropagationsTest
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationAction.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationAction.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationAction.java 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,131 @@
+package org.jboss.seam.test.integration.faces.conversations;
+
+import java.io.Serializable;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.faces.Redirect;
+import org.jboss.seam.international.StatusMessages;
+import org.jboss.seam.log.Log;
+
+@Name("ConversationAction")
+(a)Scope(ScopeType.CONVERSATION)
+public class ConversationAction implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @Logger
+ private Log log;
+
+ @In
+ StatusMessages statusMessages;
+
+ @Out(value = "state", scope = ScopeType.SESSION)
+ String state = "";
+
+ @Out(value = "foo", scope = ScopeType.CONVERSATION)
+ String foo = "";
+
+ @Out(value = "bar", scope = ScopeType.PAGE)
+ String bar = "";
+
+ @Begin
+ public void begin()
+ {
+ state += "begin;";
+ }
+
+ @End
+ public void end()
+ {
+ state += "end;";
+ }
+
+ public void xyzzy()
+ {
+ state += "xyzzy;";
+ }
+
+ public String viewOutput()
+ {
+
+ state += "viewOutput;";
+
+ return "output";
+ }
+
+ public String redirectOutput()
+ {
+
+ state += "redirectOutput;";
+
+ return "output?faces-redirect=true";
+ }
+
+ public void raiseException() throws MyException
+ {
+ state += "raiseException;";
+ throw new MyException();
+ }
+
+ public void raiseConversationEndingException() throws MyConversationEndingException
+ {
+ state += "raiseConversationEndingException;";
+ throw new MyConversationEndingException();
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+
+ public String pagesRender()
+ {
+ state += "pagesRender;";
+
+ return "render";
+ }
+
+ public String pagesRedirect()
+ {
+ state += "pagesRedirect;";
+
+ return "redirect";
+ }
+
+ public void programmaticRedirect()
+ {
+
+ state += "programmaticRedirect;";
+
+ Redirect redirect = Redirect.instance();
+ redirect.setViewId("/output.xhtml");
+ redirect.execute();
+ }
+
+ public void programmaticRedirectNoPropagation()
+ {
+
+ state += "programmaticRedirectNoPropagation;";
+
+ Redirect redirect = Redirect.instance();
+ redirect.setConversationPropagationEnabled(false);
+ redirect.setViewId("/output.xhtml");
+ redirect.execute();
+
+ // FacesManager.instance().redirect("/output.xhtml", null, false, false);
+ }
+
+ /*
+ @BypassInterceptors
+ public boolean equals(Object other) {
+ return super.equals(other);
+ }
+ */
+}
Added: 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 (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,219 @@
+package org.jboss.seam.test.integration.faces.conversations;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.test.integration.Deployments;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ * Tests various conversation propagation scenarios.
+ *
+ * @author maschmid
+ *
+ */
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class ConversationPropagationsTest
+{
+ private static String FORM_PREFIX_ID = "form:";
+
+ private static int JAVASCRIPT_WAIT = 1000;
+
+ private final WebClient client = new WebClient();
+
+ @ArquillianResource
+ URL contextPath;
+
+ @Deployment(name = "ConversationPropagationsTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ // This is a client test, use a real (non-mocked) Seam deployment
+ WebArchive war = Deployments.realSeamDeployment().addClasses(ConversationAction.class, MyException.class,
+ MyConversationEndingException.class);
+
+ war.delete("WEB-INF/pages.xml");
+
+ war.addAsWebResource("org/jboss/seam/test/integration/faces/conversations/conversations.xhtml",
+ "conversations.xhtml")
+ .addAsWebResource("org/jboss/seam/test/integration/faces/conversations/error.xhtml", "error.xhtml")
+ .addAsWebResource("org/jboss/seam/test/integration/faces/conversations/home.xhtml", "home.xhtml")
+ .addAsWebResource("org/jboss/seam/test/integration/faces/conversations/output.xhtml", "output.xhtml")
+ .addAsWebInfResource("org/jboss/seam/test/integration/faces/conversations/pages.xml", "pages.xml");
+
+ return war;
+ }
+
+ @Test
+ public void conversationTest() throws FailingHttpStatusCodeException, MalformedURLException, IOException
+ {
+ HtmlPage page = client.getPage(contextPath + "conversations.seam");
+ assertEquals("Seam Conversations Test", page.getTitleText());
+ }
+
+ private void testScenario(String output, String... ids) throws FailingHttpStatusCodeException,
+ MalformedURLException, IOException
+ {
+ HtmlPage page = client.getPage(contextPath + "conversations.seam");
+
+ for (String id : ids)
+ {
+ page.getElementById(FORM_PREFIX_ID + id).click();
+ client.waitForBackgroundJavaScript(JAVASCRIPT_WAIT);
+ page = (HtmlPage) client.getCurrentWindow().getEnclosedPage();
+ }
+
+ page = (HtmlPage) client.getCurrentWindow().getEnclosedPage();
+
+ assertTrue("Page should contain '" + output + "'", page.getBody().getTextContent().contains(output));
+ }
+
+ private void testCommonScenario(String output, String... ids) throws FailingHttpStatusCodeException,
+ MalformedURLException, IOException
+ {
+ List<String> allIds = new LinkedList<String>();
+ allIds.add("begin");
+ allIds.add("xyzzy");
+ allIds.addAll(Arrays.asList(ids));
+ testScenario(output, allIds.toArray(new String[]
+ {}));
+
+ // test with AJAX button
+ allIds = new LinkedList<String>();
+ allIds.add("begin");
+ allIds.add("ajax");
+ allIds.addAll(Arrays.asList(ids));
+ testScenario(output, allIds.toArray(new String[]
+ {}));
+ }
+
+ @Test
+ public void testViewOutput() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;viewOutput;. Conversation: true.", "view_output");
+ }
+
+ @Test
+ public void testRedirectOutput() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;redirectOutput;. Conversation: true.", "redirect_output");
+ }
+
+ @Test
+ public void testPagesRender() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;pagesRender;. Conversation: true.", "pages_render");
+ }
+
+ @Test
+ public void testPagesRedirect() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;pagesRedirect;. Conversation: true.", "pages_redirect");
+ }
+
+ @Test
+ public void testProgrammaticRedirect() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;programmaticRedirect;. Conversation: true.", "programmatic_redirect");
+ }
+
+ @Test
+ public void testProgrammaticRedirectAjax() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;programmaticRedirect;. Conversation: true.", "programmatic_redirect_ajax");
+ }
+
+ @Test
+ public void testProgrammaticRedirectNoPropagation() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "programmatic_redirect_no_propagation");
+ }
+
+ @Test
+ public void testProgrammaticRedirectNoPropagationAjax() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "programmatic_redirect_no_propagation_ajax");
+ }
+
+ @Test
+ public void testOutputLink() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "output_link");
+ }
+
+ @Test
+ public void testOutputLinkWithCid() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;. Conversation: true.", "output_link_with_cid");
+ }
+
+ @Test
+ public void testSButtonActionPropagationNone() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "sbutton_view_action_propagation_none");
+ }
+
+ @Test
+ public void testSButtonViewPropagationNone() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "sbutton_view_propagation_none");
+ }
+
+ @Test
+ public void testSButtonPropagationJoin() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;. Conversation: true.", "sbutton_view_propagation_join");
+ }
+
+ @Test
+ public void testSButtonViewPropagationNoneWithConversationPropagationNone() throws Exception
+ {
+ testCommonScenario("Output: . Conversation: false.", "sbutton_view_propagation_none_with_conversationPropagation");
+ }
+
+ @Test
+ public void testException() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;raiseException;. Conversation: true.", "exception");
+ }
+
+ @Test
+ public void testConversationEndingException() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;raiseConversationEndingException;. Conversation: false.",
+ "conversation_ending_exception");
+ }
+
+ @Test
+ public void testExceptionByAjax() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;raiseException;. Conversation: true.", "exception_by_ajax");
+ }
+
+ @Test
+ public void testConversationEndingExceptionByAjax() throws Exception
+ {
+ testCommonScenario("Output: begin;xyzzy;raiseConversationEndingException;. Conversation: false.",
+ "conversation_ending_exception_by_ajax");
+ }
+}
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyConversationEndingException.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyConversationEndingException.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyConversationEndingException.java 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,6 @@
+package org.jboss.seam.test.integration.faces.conversations;
+
+public class MyConversationEndingException extends Exception
+{
+ private static final long serialVersionUID = 1L;
+}
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyException.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyException.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/MyException.java 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,6 @@
+package org.jboss.seam.test.integration.faces.conversations;
+
+public class MyException extends Exception
+{
+ private static final long serialVersionUID = 1L;
+}
Added: 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 (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,154 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a="http://richfaces.org/a4j"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Seam Conversations Test</title>
+</h:head>
+<h:body>
+ <h:form id="form">
+
+ <div>
+ <h:commandButton id="begin" value="begin"
+ action="#{ConversationAction.begin()}" />
+ </div>
+
+ <div>
+ <h:commandButton id="end" value="end"
+ action="#{ConversationAction.end()}" />
+ </div>
+
+ <div>
+ <h:commandButton id="view_output" value="view output"
+ action="#{ConversationAction.viewOutput()}" />
+ </div>
+ <div>
+ <h:commandButton id="redirect_output" value="redirect output"
+ action="#{ConversationAction.redirectOutput()}" />
+ </div>
+ <div>
+ <h:commandButton id="pages_render" value="pages render"
+ action="#{ConversationAction.pagesRender}" />
+ </div>
+ <div>
+ <h:commandButton id="pages_redirect" value="pages redirect"
+ action="#{ConversationAction.pagesRedirect}" />
+ </div>
+
+ <div>
+ <h:commandButton id="programmatic_redirect" value="programmatic redirect"
+ action="#{ConversationAction.programmaticRedirect()}" />
+ </div>
+
+ <div>
+ <h:commandButton id="programmatic_redirect_ajax" value="programmatic redirect with AJAX"
+ action="#{ConversationAction.programmaticRedirect()}">
+ <f:ajax />
+ </h:commandButton>
+ </div>
+
+ <div>
+ <h:commandButton id="programmatic_redirect_no_propagation" value="programmatic redirect no propagation"
+ action="#{ConversationAction.programmaticRedirectNoPropagation()}" />
+ </div>
+
+ <div>
+ <h:commandButton id="programmatic_redirect_no_propagation_ajax" value="programmatic redirect no propagation with AJAX"
+ action="#{ConversationAction.programmaticRedirectNoPropagation()}">
+ <f:ajax />
+ </h:commandButton>
+ </div>
+
+ <div>
+ <h:outputLink id="output_link" value="output.seam">
+ Output Link
+ </h:outputLink>
+ </div>
+
+ <div>
+ <h:outputLink id="output_link_with_cid" value="output.seam">
+ <s:conversationId />
+ Output Link with cid
+ </h:outputLink>
+ </div>
+
+ <div>
+ <s:button id="sbutton_view_action_propagation_none" action="#{ConversationAction.viewOutput()}"
+ value="SButton view action no propagation" propagation="none"></s:button>
+ </div>
+
+ <div>
+ <s:button id="sbutton_view_propagation_none" view="/output.xhtml" value="SButton view no propagation"
+ propagation="none"></s:button>
+ </div>
+
+ <div>
+ <s:button id="sbutton_view_propagation_join" view="/output.xhtml" value="SButton view join propagation"
+ propagation="join"></s:button>
+ </div>
+
+ <div>
+ <s:button id="sbutton_view_propagation_none_with_conversationPropagation" view="/output.xhtml"
+ value="SButton view no propagation with s:conversationPropagation none"
+ propagation="none">
+ <s:conversationPropagation type="none" />
+ </s:button>
+ </div>
+
+ <div>
+ <h:commandButton id="exception" value="exception"
+ action="#{ConversationAction.raiseException()}" />
+ </div>
+ <div>
+ <h:commandButton id="conversation_ending_exception"
+ value="conversation ending exception"
+ action="#{ConversationAction.raiseConversationEndingException()}" />
+ </div>
+
+ <div>
+ <h:commandButton id="exception_by_ajax" value="exception by AJAX"
+ action="#{ConversationAction.raiseException()}">
+ <f:ajax />
+ </h:commandButton>
+ </div>
+ <div>
+ <h:commandButton id="conversation_ending_exception_by_ajax"
+ value="conversation ending exception by AJAX"
+ action="#{ConversationAction.raiseConversationEndingException()}">
+ <f:ajax />
+ </h:commandButton>
+ </div>
+
+ <div>
+ <h:outputLink id="localhost" value="http://127.0.0.1:8080">
+ http://127.0.0.1:8080
+ </h:outputLink>
+ </div>
+
+ <div>
+ <h:commandButton id="xyzzy" action="#{ConversationAction.xyzzy}" value="Xyzzy">
+ </h:commandButton>
+ </div>
+
+ <div>
+ <h:commandButton id="ajax" action="#{ConversationAction.xyzzy}" value="AJAX">
+ <f:ajax render="ajaxOutput"></f:ajax>
+ </h:commandButton>
+ </div>
+
+ <h:panelGroup id="ajaxOutput">
+ <h:outputText value="#{ConversationAction.state}" />
+ <h:outputLink id="ajaxOutput_link" value="output.seam">
+ <s:conversationId />
+ Output Link with cid
+ </h:outputLink>
+ </h:panelGroup>
+
+ </h:form>
+</h:body>
+</html>
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/error.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/error.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/error.xhtml 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a="http://richfaces.org/a4j"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Seam Conversations Test Error</title>
+</h:head>
+<h:body>
+ <h1>Error</h1>
+ <p>Something bad happened :-(</p>
+
+ <h:messages id="errorMessage" styleClass="message"/>
+</h:body>
+</html>
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/home.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/home.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/home.xhtml 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a="http://richfaces.org/a4j"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Seam Conversations Test Home</title>
+</h:head>
+<h:body>
+ <h:form id="ConversationActionForm">
+ <s:link view="/conversations.xhtml" value="Conversations"/>
+ </h:form>
+</h:body>
+</html>
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/output.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/output.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/output.xhtml 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Seam Conversations Test Output</title>
+</h:head>
+<h:body>
+ Output: <h:outputText value="#{ConversationAction.state}"/>. Conversation: <h:outputText value="#{conversation.longRunning}" />.
+</h:body>
+</html>
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/pages.xml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/pages.xml (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/pages.xml 2013-02-19 16:05:43 UTC (rev 15412)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pages xmlns="http://jboss.org/schema/seam/pages"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd"
+
+ no-conversation-view-id="/home.xhtml"
+ login-view-id="/login.xhtml">
+
+ <page view-id="/conversations.xhtml">
+ <navigation from-action="#{ConversationAction.pagesRender}">
+ <rule if-outcome="render">
+ <render view-id="/output.xhtml"/>
+ </rule>
+ </navigation>
+
+ <navigation from-action="#{ConversationAction.pagesRedirect}">
+ <rule if-outcome="redirect">
+ <redirect view-id="/output.xhtml"/>
+ </rule>
+ </navigation>
+ </page>
+
+
+ <page view-id="*">
+ <navigation>
+ <rule if-outcome="home">
+ <redirect view-id="/home.xhtml"/>
+ </rule>
+ </navigation>
+ </page>
+
+ <exception class="org.jboss.seam.framework.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message severity="warn">Record not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message severity="warn">Record not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.EntityExistsException">
+ <redirect view-id="/error.xhtml">
+ <message severity="warn">Duplicate record</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.OptimisticLockException">
+ <end-conversation/>
+ <redirect view-id="/error.xhtml">
+ <message severity="warn">Another user changed the same data, please try again</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.AuthorizationException">
+ <redirect view-id="/error.xhtml">
+ <message severity="error">You don't have permission to access this resource</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.NotLoggedInException">
+ <redirect view-id="/login.xhtml">
+ <message severity="warn">#{messages['org.jboss.seam.NotLoggedIn']}</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/error.xhtml">
+ <message severity="warn">Your session has timed out, please try again</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.ConcurrentRequestTimeoutException" log-level="trace">
+ <http-error error-code="503" />
+ </exception>
+
+ <exception class="org.jboss.seam.test.integration.faces.conversations.MyException">
+ <redirect view-id="/output.xhtml">
+ <message severity="warn">MyException!</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.test.integration.faces.conversations.MyConversationEndingException">
+ <end-conversation/>
+ <redirect view-id="/output.xhtml">
+ <message severity="warn">MyConversationEndingException!</message>
+ </redirect>
+ </exception>
+
+ <exception>
+ <redirect view-id="/error.xhtml">
+ <message severity="error">Unexpected error, please try again</message>
+ </redirect>
+ </exception>
+</pages>
11 years, 9 months
- 1
- 0
Seam SVN: r15411 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:05:19 -0500 (Tue, 19 Feb 2013)
New Revision: 15411
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java
Log:
JBSEAM-5074 add missing getRequestCharacterEncoding method to MockExternalContext
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java 2013-02-19 16:05:10 UTC (rev 15410)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java 2013-02-19 16:05:19 UTC (rev 15411)
@@ -194,6 +194,12 @@
}
@Override
+ public String getRequestCharacterEncoding()
+ {
+ return request.getCharacterEncoding();
+ }
+
+ @Override
public String getRequestContextPath()
{
String path = (String) request.getAttribute("org.jboss.seam.web.requestContextPath");
11 years, 9 months
- 1
- 0
Seam SVN: r15410 - branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:05:10 -0500 (Tue, 19 Feb 2013)
New Revision: 15410
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java
Log:
UIToken contained unnecessary UTF-8 char, uncompilable if encoding wasn't UTF-8
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2013-02-19 16:04:59 UTC (rev 15409)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2013-02-19 16:05:10 UTC (rev 15410)
@@ -18,7 +18,7 @@
* <strong>UIToken</strong> is a UIComponent that produces a random token that
* is inserted into a hidden form field to help to secure JSF form posts against
* cross-site request forgery (XSRF) attacks. This is an adaptation of the
- * recommendation called Keyed‐Hashing for Message Authentication that is
+ * recommendation called Keyed-Hashing for Message Authentication that is
* referenced in the Cross Site Reference Forgery by Jesse Burns
* (http://www.isecpartners.com/files/XSRF_Paper_0.pdf)
* </p>
11 years, 9 months
- 1
- 0
Seam SVN: r15409 - in branches/enterprise/WFK-2_1/seam-integration-tests/src/test: resources and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:04:59 -0500 (Tue, 19 Feb 2013)
New Revision: 15409
Added:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/RealLocaleTest.java
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/locale.xhtml
Log:
real localization test added
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/RealLocaleTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/RealLocaleTest.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/RealLocaleTest.java 2013-02-19 16:04:59 UTC (rev 15409)
@@ -0,0 +1,100 @@
+package org.jboss.seam.test.integration.i8ln;
+
+import static org.junit.Assert.assertTrue;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.test.integration.Deployments;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class RealLocaleTest {
+
+ @Deployment(name="RealLocaleTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ return Deployments.realSeamDeployment()
+ .addClass(TestBean.class)
+ .addAsWebResource("locale.xhtml","locale.xhtml");
+ }
+
+ @ArquillianResource
+ URL url;
+
+ @Test
+ public void testDefaultLocale() throws Exception{
+
+ WebClient client = new WebClient();
+ HtmlPage page = client.getPage(url+"locale.seam");
+
+ String pageBody = page.getBody().asText();
+ assertTrue("Default locale is not set correctly!",pageBody.contains("Default locale: fr_CA"));
+
+ }
+
+ @Test
+ public void testSupportedLocale() throws Exception{
+
+ WebClient client = new WebClient();
+ HtmlPage page = client.getPage(url+"locale.seam");
+
+ String pageBody = page.getBody().asText();
+ String[] locales = new String [] {"fr_CA", "fr_FR" , "en"};
+
+ for (String locale : locales) {
+ assertTrue("Supported locale is not set correctly!", pageBody.contains("Supported locale: "+locale));
+ }
+
+ }
+
+ @Name("testBean")
+ public static class TestBean
+ {
+ Application app = FacesContext.getCurrentInstance().getApplication();
+
+ public String getDefaultLocale(){
+
+ if(app.getDefaultLocale() == null){
+ return "";
+ }
+ return app.getDefaultLocale().toString();
+ }
+
+ public List<Locale> getSupportedLocale(){
+
+ List<Locale> locales = new ArrayList<Locale>();
+
+ if(app.getSupportedLocales() == null){
+ return locales;
+ }
+
+ Iterator<Locale> it = app.getSupportedLocales();
+
+ while(it.hasNext()){
+ locales.add(it.next());
+ }
+ return locales;
+ }
+ }
+}
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/locale.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/locale.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/locale.xhtml 2013-02-19 16:04:59 UTC (rev 15409)
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<h:head></h:head>
+<h:body>
+ <h:outputText value='Default locale: #{testBean.defaultLocale}' />
+
+ <h:dataTable id="locale" value="#{testBean.supportedLocale}" var="loc" >
+ <h:column>
+ Supported locale: #{loc.toString()}
+ </h:column>
+ </h:dataTable>
+
+</h:body>
+</html>
\ No newline at end of file
11 years, 9 months
- 1
- 0
Seam SVN: r15408 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:04:47 -0500 (Tue, 19 Feb 2013)
New Revision: 15408
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/home.xhtml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/userdetail.xhtml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml
Log:
JBSEAM-5071 use jsf dataTable instead of the richfaces one; fix css
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/home.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/home.xhtml 2013-02-19 16:04:38 UTC (rev 15407)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/home.xhtml 2013-02-19 16:04:47 UTC (rev 15408)
@@ -8,7 +8,7 @@
template="/layout/template.xhtml">
<ui:define name="head">
- <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/>
+ <h:outputStylesheet name="useradmin.css"/>
</ui:define>
<ui:define name="body">
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml 2013-02-19 16:04:38 UTC (rev 15407)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/roledetail.xhtml 2013-02-19 16:04:47 UTC (rev 15408)
@@ -9,7 +9,7 @@
template="/layout/template.xhtml">
<ui:define name="head">
- <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/>
+ <h:outputStylesheet name="useradmin.css"/>
</ui:define>
<ui:define name="body">
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2013-02-19 16:04:38 UTC (rev 15407)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/rolemanager.xhtml 2013-02-19 16:04:47 UTC (rev 15408)
@@ -9,7 +9,7 @@
template="/layout/template.xhtml">
<ui:define name="head">
- <link href="../resources/useradmin.css" rel="stylesheet" type="text/css"/>
+ <h:outputStylesheet name="useradmin.css"/>
<script type="text/javascript">
function confirmDelete()
{
@@ -25,7 +25,7 @@
<s:button id="newRole" action="#{roleAction.createRole}" styleClass="newrole" rendered="#{s:hasPermission('seam.role', 'create', null)}"/>
<h:form id="rolesCmdForm" prependId="false">
- <rich:dataTable id="roles" var="_role" value="#{roles}"
+ <h:dataTable id="roles" var="_role" value="#{roles}"
styleClass="useradmin" headerClass="header" rowClasses="odd,even" columnClasses=",,action">
<h:column id="role">
<f:facet name="header">Role</f:facet>
@@ -50,7 +50,7 @@
<s:link id="delete" value="Delete" action="#{identityManager.deleteRole(roleSearch.selectedRole)}"
rendered="#{s:hasPermission('seam.role', 'delete')}" onclick="return confirmDelete()"/>
</h:column>
- </rich:dataTable>
+ </h:dataTable>
</h:form>
</ui:define>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/userdetail.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/userdetail.xhtml 2013-02-19 16:04:38 UTC (rev 15407)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/userdetail.xhtml 2013-02-19 16:04:47 UTC (rev 15408)
@@ -9,7 +9,7 @@
template="/layout/template.xhtml">
<ui:define name="head">
- <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/>
+ <h:outputStylesheet name="useradmin.css"/>
</ui:define>
<ui:define name="body">
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml 2013-02-19 16:04:38 UTC (rev 15407)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/useradmin/usermanager.xhtml 2013-02-19 16:04:47 UTC (rev 15408)
@@ -9,7 +9,7 @@
template="/layout/template.xhtml">
<ui:define name="head">
- <link href="../stylesheet/useradmin.css" rel="stylesheet" type="text/css"/>
+ <h:outputStylesheet name="useradmin.css"/>
<script type="text/javascript">
function confirmDelete()
@@ -26,7 +26,7 @@
<s:button id="newUser" action="#{userAction.createUser}" styleClass="newuser" rendered="#{s:hasPermission('seam.user', 'create')}"/>
<h:form id="usersCmdForm" prependId="false">
- <rich:dataTable id="users" var="_user" value="#{users}"
+ <h:dataTable id="users" var="_user" value="#{users}"
styleClass="useradmin" headerClass="header" rowClasses="odd,even" columnClasses=",,enabled,action">
<h:column id="username">
<f:facet name="header">Username</f:facet>
@@ -55,7 +55,7 @@
<s:link id="delete" value="Delete" action="#{identityManager.deleteUser(userSearch.selectedUser)}"
rendered="#{s:hasPermission('seam.user', 'delete')}" onclick="return confirmDelete()"/>
</h:column>
- </rich:dataTable>
+ </h:dataTable>
</h:form>
</ui:define>
11 years, 9 months
- 1
- 0
Seam SVN: r15407 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:04:38 -0500 (Tue, 19 Feb 2013)
New Revision: 15407
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserAccount.java
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserPermission.java
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserRole.java
Log:
JBSEAM-5070 use strategy=GenerationType.IDENTITY in seam-gen IDM templates
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserAccount.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserAccount.java 2013-02-19 16:04:31 UTC (rev 15406)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserAccount.java 2013-02-19 16:04:38 UTC (rev 15407)
@@ -6,6 +6,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -32,7 +33,7 @@
private Set<UserRole> roles;
@Id
- @GeneratedValue
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
public Long getId() {
return id;
}
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserPermission.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserPermission.java 2013-02-19 16:04:31 UTC (rev 15406)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserPermission.java 2013-02-19 16:04:38 UTC (rev 15407)
@@ -4,6 +4,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -25,7 +26,7 @@
private String action;
private String discriminator;
- @Id @GeneratedValue
+ @Id @GeneratedValue(strategy=GenerationType.IDENTITY)
public Long getId()
{
return id;
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserRole.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserRole.java 2013-02-19 16:04:31 UTC (rev 15406)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/src/UserRole.java 2013-02-19 16:04:38 UTC (rev 15407)
@@ -5,6 +5,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -28,7 +29,7 @@
private Set<UserRole> groups;
@Id
- @GeneratedValue
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
public Long getId() {
return id;
}
11 years, 9 months
- 1
- 0
Seam SVN: r15406 - branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:04:31 -0500 (Tue, 19 Feb 2013)
New Revision: 15406
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
Log:
JBSEAM-5052 add the converter also during decode in UISelectItems
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2013-02-19 16:04:20 UTC (rev 15405)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2013-02-19 16:04:31 UTC (rev 15406)
@@ -169,18 +169,28 @@
public abstract void setItemValue(Object itemValue);
@Override
+ public void decode(FacesContext context) {
+ super.decode(context);
+ addConverterChainIfRequired();
+ }
+
+ @Override
public void encodeEnd(FacesContext context) throws IOException {
- if(isShowNoSelectionLabel()){
- ConverterChain converterChain = new ConverterChain(this.getParent());
- Converter noSelectionConverter = new NoSelectionConverter();
- // Make sure that the converter is only added once
- if (!converterChain.containsConverterType(noSelectionConverter)) {
- converterChain.addConverterToChain(noSelectionConverter, ConverterChain.CHAIN_START);
- }
- }
- super.encodeEnd(context);
+ super.encodeEnd(context);
+ addConverterChainIfRequired();
}
+ private void addConverterChainIfRequired() {
+ if(isShowNoSelectionLabel()){
+ ConverterChain converterChain = new ConverterChain(this.getParent());
+ Converter noSelectionConverter = new NoSelectionConverter();
+ // Make sure that the converter is only added once
+ if (!converterChain.containsConverterType(noSelectionConverter)) {
+ converterChain.addConverterToChain(noSelectionConverter, ConverterChain.CHAIN_START);
+ }
+ }
+ }
+
@Override
@Attribute(description = @Description("an EL expression specifying the data that backs the List<SelectItem>"))
public Object getValue()
@@ -343,5 +353,4 @@
return Arrays.asList((Object[]) array);
}
}
-
}
11 years, 9 months
- 1
- 0
Seam SVN: r15405 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-02-19 11:04:20 -0500 (Tue, 19 Feb 2013)
New Revision: 15405
Added:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java
Log:
test for JBSEAM-5067
Added: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java (rev 0)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ConversationContextFlushTest.java 2013-02-19 16:04:20 UTC (rev 15405)
@@ -0,0 +1,133 @@
+package org.jboss.seam.test.integration.faces;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.net.URL;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.test.integration.Deployments;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ * JBSEAM-5067, handling exception in ExceptionFilter while long-running conversation with
+ * Page-scoped injection throws an exception in ServerConversationContext.flush
+ *
+ */
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class ConversationContextFlushTest
+{
+private final WebClient client = new WebClient();
+
+ @ArquillianResource
+ URL contextPath;
+
+ @Deployment(name="BoundComponentConversationTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ // This is a client test, use a real (non-mocked) Seam deployment
+ return Deployments.realSeamDeployment()
+ .addClasses(TestComponent.class, PageScopedComponent.class)
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ "<h:form id='form'>" +
+ "<h:commandButton id='begin' action='#{testComponent.begin}' value='Begin' />" +
+ "<h:commandButton id='throw' action='#{testComponent.throwTestException}' value='Throw' />" +
+ "</h:form>" +
+ "</h:body>" +
+ "</html>"), "test.xhtml")
+ .addAsWebResource(new StringAsset(
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
+ " xmlns:h=\"http://java.sun.com/jsf/html\"" +
+ " xmlns:f=\"http://java.sun.com/jsf/core\"" +
+ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" +
+ "<h:head></h:head>" +
+ "<h:body>" +
+ " Exception handled, state: <h:outputText value='#{testComponent.state}'/>" +
+ "</h:body>" +
+ "</html>"), "error.xhtml")
+ .addAsWebInfResource(new StringAsset(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+ " xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
+ "<exception class=\"org.jboss.seam.test.integration.faces.ConversationContextFlushTest.TestException\">" +
+ "<redirect view-id=\"/error.xhtml\">"+
+ "</redirect>"+
+ "</exception>"), "pages.xml");
+ }
+
+ public static class TestException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ @Scope(ScopeType.CONVERSATION)
+ @Name("testComponent")
+ public static class TestComponent implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ public String state = "";
+
+ @In(create=true)
+ private PageScopedComponent pageScoped;
+
+ @Begin
+ public void begin()
+ {
+ state += "begin;";
+ }
+
+ public void throwTestException() throws TestException
+ {
+ state += "throwTestException;";
+ throw new TestException();
+ }
+
+ public String getState()
+ {
+ return state;
+ }
+ }
+
+ @Scope(ScopeType.PAGE)
+ @Name("pageScoped")
+ public static class PageScopedComponent implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ @Test
+ public void testExceptionHandingDuringConversationWithPageScopedInjection() throws Exception
+ {
+ HtmlPage page = client.getPage(contextPath + "test.seam");
+
+ page = page.getElementById("form:begin").click();
+ page = page.getElementById("form:throw").click();
+
+ assertTrue(page.getBody().getTextContent().contains("Exception handled, state: begin;throwTestException;"));
+ }
+}
11 years, 9 months
- 1
- 0