Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

Commit

Permalink
Merge branch 'maschmid-JBSEAM-5045-test' into Seam_2_3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mareknovotny
mareknovotny committed Feb 19, 2013
2 parents 2294140 + a9eb258 commit 9e97a78
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 49 deletions.
135 changes: 90 additions & 45 deletions ...egration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
View file
@@ -1,30 +1,37 @@
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.ScriptResult;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;


// JBSEAM-5045
// TODO: merge this with ExceptionRedirectTest once JBSEAM-5067 is fixed
//JBSEAM-5045
@RunWith(Arquillian.class)
@RunAsClient
public class ErrorHandlingTest
{
private static final int AJAX_WAIT = 1000;

private final WebClient client = new WebClient();

@ArquillianResource
Expand All @@ -34,55 +41,93 @@ public class ErrorHandlingTest
@OverProtocol("Servlet 3.0")
public static Archive<?> createDeployment()
{
// This is a client test, use a real (non-mocked) Seam deployment
return Deployments.realSeamDeployment()
.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='server' action='#{xxxx.xxxxx}' value='Submit'/>" +
"<h:commandButton id='ajax' action='#{xxxx.xxxxx}' value='Ajax Submit'>"+
"<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>" +
"<h:messages globalOnly=\"true\"/>"+
"</h:body>" +
"</html>"), "error.xhtml");
// 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 testErrorHandling() throws Exception
public void testExceptionRedirectWithAjax() throws Exception
{

HtmlPage page = client.getPage(contextPath + "test.seam");
page = page.getElementById("form:server").click();

assertTrue(page.getUrl().toString().startsWith(contextPath + "error.seam"));
HtmlPage page = client.getPage(contextPath + "test.seam");

assertTrue("Page should contain form:begin button", page.getElementById("form:begin") != null);

page = client.getPage(contextPath + "test.seam");
page.getElementById("form:ajax").click();
page = page.getElementById("form:begin").click();
page = page.getElementById("form:throwAjax").click();

//waiting for processing ajax e javascript
Thread.sleep(2000);
Thread.sleep(AJAX_WAIT);

ScriptResult result = page.executeJavaScript("window.location");
assertTrue(result.getJavaScriptResult().toString().startsWith(contextPath + "error.seam"));
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;"));
}

}
}
38 changes: 34 additions & 4 deletions ...n/faces/ConversationContextFlushTest.java → ...egration/faces/ExceptionRedirectTest.java
View file
@@ -1,5 +1,6 @@
package org.jboss.seam.test.integration.faces;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.io.Serializable;
Expand Down Expand Up @@ -31,14 +32,16 @@
*/
@RunWith(Arquillian.class)
@RunAsClient
public class ConversationContextFlushTest
public class ExceptionRedirectTest
{
private final WebClient client = new WebClient();
private static final int AJAX_WAIT = 1000;

private final WebClient client = new WebClient();

@ArquillianResource
URL contextPath;

@Deployment(name="BoundComponentConversationTest")
@Deployment(name="ExceptionRedirectTest")
@OverProtocol("Servlet 3.0")
public static Archive<?> createDeployment()
{
Expand All @@ -55,6 +58,9 @@ public static Archive<?> createDeployment()
"<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")
Expand All @@ -73,7 +79,7 @@ public static Archive<?> createDeployment()
"<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\">" +
"<exception class=\"org.jboss.seam.test.integration.faces.ExceptionRedirectTest.TestException\">" +
"<redirect view-id=\"/error.xhtml\">"+
"</redirect>"+
"</exception>"), "pages.xml");
Expand Down Expand Up @@ -111,6 +117,13 @@ public String getState()
{
return state;
}

/* // Workaround
@org.jboss.seam.annotations.intercept.BypassInterceptors
public boolean equals(Object obj)
{
return super.equals(obj);
}*/
}

@Scope(ScopeType.PAGE)
Expand All @@ -130,4 +143,21 @@ public void testExceptionHandingDuringConversationWithPageScopedInjection() thro

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;"));
}
}

0 comments on commit 9e97a78

Please sign in to comment.