You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/09 15:30:12 UTC
svn commit: r995418 - in /myfaces/gsoc/webapptest:
api/src/main/java/org/apache/myfaces/test/webapp/api/tester/
examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/
impl/src/main/java/org/apache/myfaces/test/webapp/impl/ impl/src/main...
Author: jakobk
Date: Thu Sep 9 13:30:12 2010
New Revision: 995418
URL: http://svn.apache.org/viewvc?rev=995418&view=rev
Log:
MYFACESTEST-27 Allow non-string assertion values
Modified:
myfaces/gsoc/webapptest/api/src/main/java/org/apache/myfaces/test/webapp/api/tester/WebappTester.java
myfaces/gsoc/webapptest/examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/MyWebappTestCase.java
myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/WebappTesterImpl.java
myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/metadata/assertion/TestAssertCondition.java
Modified: myfaces/gsoc/webapptest/api/src/main/java/org/apache/myfaces/test/webapp/api/tester/WebappTester.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/api/src/main/java/org/apache/myfaces/test/webapp/api/tester/WebappTester.java?rev=995418&r1=995417&r2=995418&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/api/src/main/java/org/apache/myfaces/test/webapp/api/tester/WebappTester.java (original)
+++ myfaces/gsoc/webapptest/api/src/main/java/org/apache/myfaces/test/webapp/api/tester/WebappTester.java Thu Sep 9 13:30:12 2010
@@ -46,7 +46,7 @@ public interface WebappTester {
public Call expectLastCall();
public interface Assertable {
- public PhaseAware is(String expectedValue);
+ public PhaseAware is(Object expectedValue);
}
public interface PhaseAware {
Modified: myfaces/gsoc/webapptest/examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/MyWebappTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/MyWebappTestCase.java?rev=995418&r1=995417&r2=995418&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/MyWebappTestCase.java (original)
+++ myfaces/gsoc/webapptest/examples/simple/src/test/java/org/apache/myfaces/test/webapp/examples/MyWebappTestCase.java Thu Sep 9 13:30:12 2010
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.test.webapp.examples;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
import javax.faces.event.PhaseId;
import org.apache.myfaces.test.webapp.api.annotation.Assertable;
@@ -25,12 +27,17 @@ import org.apache.myfaces.test.webapp.ap
import org.apache.myfaces.test.webapp.api.annotation.Tester;
import org.apache.myfaces.test.webapp.api.annotation.View;
import org.apache.myfaces.test.webapp.api.runner.WebappTestRunner;
+import org.apache.myfaces.test.webapp.api.tester.ServerSideCode;
import org.apache.myfaces.test.webapp.api.tester.WebappTester;
import org.jboss.arquillian.api.Deployment;
import org.jboss.shrinkwrap.api.Archive;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
/**
* @author Jakob Korherr
*/
@@ -41,7 +48,7 @@ public class MyWebappTestCase
{
@Tester
- private static WebappTester webappTestCase;
+ private static WebappTester webappTester;
@Assertable
private ExampleBean exampleBean;
@@ -49,20 +56,35 @@ public class MyWebappTestCase
@Deployment
public static Archive<?> createDeployment()
{
- return webappTestCase.createArchive(null);
+ return webappTester.createArchive(null);
}
@Test
public void testApplyInputValue() throws Exception
{
- webappTestCase.assertThat(exampleBean.getInput()).is("default value").after(PhaseId.RENDER_RESPONSE);
- webappTestCase.assertThat("#{exampleBean.input}").is("default value").after(PhaseId.RENDER_RESPONSE);
+ webappTester.assertThat(exampleBean.getInput()).is("default value").after(PhaseId.RENDER_RESPONSE);
+ webappTester.assertThat("#{exampleBean.input}").is("default value").after(PhaseId.RENDER_RESPONSE);
- webappTestCase.input("test value").into("testForm:fieldId");
- webappTestCase.click("testForm:buttonId");
+ webappTester.input("test value").into("testForm:fieldId");
+ webappTester.click("testForm:buttonId");
- webappTestCase.assertThat(exampleBean.getInput()).is("test value").after(PhaseId.UPDATE_MODEL_VALUES);
- webappTestCase.assertThat(exampleBean.getInput()).is("after action value").after(PhaseId.INVOKE_APPLICATION);
+ webappTester.assertThat(exampleBean.getInput()).is("test value").after(PhaseId.UPDATE_MODEL_VALUES);
+ webappTester.assertThat(exampleBean.getInput()).is("after action value").after(PhaseId.INVOKE_APPLICATION);
+
+ final FacesMessage msg = new FacesMessage("some summary");
+ webappTester.assertThat(new ServerSideCode()
+ {
+
+ public Object execute() throws Exception
+ {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ facesContext.addMessage(null, msg);
+
+ return facesContext.getMessageList(null);
+ }
+
+ }).is(Arrays.asList(msg)).after(PhaseId.INVOKE_APPLICATION);
}
}
Modified: myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/WebappTesterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/WebappTesterImpl.java?rev=995418&r1=995417&r2=995418&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/WebappTesterImpl.java (original)
+++ myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/WebappTesterImpl.java Thu Sep 9 13:30:12 2010
@@ -224,7 +224,7 @@ public class WebappTesterImpl implements
this.assertCondition = assertCondition;
}
- public PhaseAware is(String expectedValue) {
+ public PhaseAware is(Object expectedValue) {
assertCondition.setExpectedValue(expectedValue);
return new PhaseAwareImpl(assertCondition);
Modified: myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/metadata/assertion/TestAssertCondition.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/metadata/assertion/TestAssertCondition.java?rev=995418&r1=995417&r2=995418&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/metadata/assertion/TestAssertCondition.java (original)
+++ myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/metadata/assertion/TestAssertCondition.java Thu Sep 9 13:30:12 2010
@@ -32,7 +32,7 @@ import javax.faces.context.FacesContext;
*/
public class TestAssertCondition extends TestAssertion {
- private String expectedValue;
+ private Object expectedValue;
@Override
public void doAssertion() {
@@ -81,7 +81,7 @@ public class TestAssertCondition extends
}
- public void setExpectedValue(String expectedValue) {
+ public void setExpectedValue(Object expectedValue) {
this.expectedValue = expectedValue;
}