Revision: 947
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=947&view=rev
Author: henryju
Date: 2012-07-25 14:08:13 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Do not assert page content including line separator as it makes tests platform
dependent.
Remove a wrong test (what is a frame title anyway?).
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FramesAndWindowsTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
2012-07-25 13:45:55 UTC (rev 946)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
2012-07-25 14:08:13 UTC (rev 947)
@@ -52,11 +52,11 @@
setTextField("color", "blue");
submit("button");
assertTextPresent("Submitted parameters");
- assertTextPresent("color=blue");
+ assertTextPresent("color=[blue]");
clickLink("return");
setTextField("color", "red");
submit();
- assertTextPresent("color=red");
+ assertTextPresent("color=[red]");
}
@Test
@@ -65,11 +65,11 @@
setTextField("text", "sometext");
submit("button");
assertTextPresent("Submitted parameters");
- assertTextPresent("Params are:" + System.getProperty("line.separator")
+ "text=sometext");
+ assertTextPresent("text=[sometext]");
clickLink("return");
setTextField("text", "anothertext");
submit();
- assertTextPresent("text=anothertext");
+ assertTextPresent("text=[anothertext]");
}
@Test
@@ -93,7 +93,7 @@
submit("button");
assertTextPresent("Submitted parameters");
//The following depend on the browser: IE send full path (i.e.
temp.getAbsolutePath()) but FF send only file name.
- assertTextPresent("file=" + temp.getName() + "{abcdefgh}");
+ assertTextPresent("file=[" + temp.getName() + "{abcdefgh}]");
}
@Test
@@ -103,7 +103,7 @@
assertSubmitButtonPresent();
submit();
assertTextPresent("Submitted parameters");
- assertTextPresent("color=toto");
+ assertTextPresent("color=[toto]");
}
@Test
@@ -113,7 +113,7 @@
assertSubmitButtonPresent("image");
submit("image");
assertTextPresent("Submitted parameters");
- assertTextPresent("color=toto");
+ assertTextPresent("color=[toto]");
}
@Test
@@ -122,10 +122,10 @@
checkCheckbox("checkBox");
setTextField("color", "blue");
submit();
- assertTextPresent("color=blue");
+ assertTextPresent("color=[blue]");
// checkBox contains 2 parameters: one for the hidden input and one for
// the checkbox
- assertTextPresent("checkBox=,on");
+ assertTextPresent("checkBox=[,on]");
}
@Test
@@ -135,7 +135,7 @@
checkCheckbox("checkBox", "3");
checkCheckbox("checkBox", "3"); // check for duplicates
submit();
- assertTextPresent("checkBox=1,3" +
System.getProperty("line.separator"));
+ assertTextPresent("checkBox=[1,3]");
}
@Test
@@ -145,7 +145,7 @@
checkCheckbox("checkBox", "3");
uncheckCheckbox("checkBox", "3");
submit();
- assertTextPresent("checkBox=1");
+ assertTextPresent("checkBox=[1]");
}
@Test
@@ -157,7 +157,7 @@
setTextField("color", "blue");
uncheckCheckbox("checkBox");
submit();
- assertTextPresent("color=blue" + System.getProperty("line.separator"));
+ assertTextPresent("color=[blue]");
}
@Test
@@ -166,7 +166,7 @@
clickRadioOption("radio", "1");
assertRadioOptionSelected("radio", "1");
submit();
- assertTextPresent("radio=1" + System.getProperty("line.separator"));
+ assertTextPresent("radio=[1]");
clickLink("return");
clickRadioOption("radio", "2");
clickRadioOption("radio", "3");
@@ -174,7 +174,7 @@
assertRadioOptionNotSelected("radio", "2");
assertRadioOptionSelected("radio", "3");
submit();
- assertTextPresent("radio=3" + System.getProperty("line.separator"));
+ assertTextPresent("radio=[3]");
}
@Test
@@ -182,7 +182,7 @@
beginAt("/SingleUnnamedButtonForm.html");
setTextField("color", "blue");
submit();
- assertTextPresent("color=blue" + System.getProperty("line.separator"));
+ assertTextPresent("color=[blue]");
}
@Test
@@ -190,17 +190,17 @@
beginAt("/SingleNamedButtonForm.html");
setTextField("color", "red");
submit();
- assertTextPresent("color=red");
+ assertTextPresent("color=[red]");
}
@Test
public void testSingleFormMultipleButtonSubmission() {
gotoMultiButtonPage();
submit("color");
- assertTextPresent("Params are:" + System.getProperty("line.separator")
+ "color=red");
+ assertTextPresent("color=[red]");
gotoMultiButtonPage();
submit("color", "blue");
- assertTextPresent("color=blue");
+ assertTextPresent("color=[blue]");
}
@Test
@@ -221,7 +221,7 @@
setWorkingForm("form2");
setTextField("param2", "anyvalue");
submit("button2a");
- assertTextPresent("param2=anyvalue");
+ assertTextPresent("param2=[anyvalue]");
}
@Test
@@ -231,16 +231,16 @@
setTextField("param2", "foo");
setTextField("email", "anyvalue");
submit();
- assertTextPresent("email=anyvalue");
- assertTextPresent("param2=foo");
+ assertTextPresent("email=[anyvalue]");
+ assertTextPresent("param2=[foo]");
closeBrowser();
beginAt("/MultiFormPage.html");
setWorkingForm("form3");
setTextField("param3", "foo");
setTextField("email", "anyvalue");
submit();
- assertTextPresent("param3=foo");
- assertTextPresent("email=anyvalue");
+ assertTextPresent("param3=[foo]");
+ assertTextPresent("email=[anyvalue]");
}
@Test
@@ -276,7 +276,7 @@
beginAt("/MultiFormPage.html");
setTextField("param4", "anyvalue");
submit();
- assertTextPresent("param4=anyvalue");
+ assertTextPresent("param4=[anyvalue]");
}
@Test
@@ -284,8 +284,8 @@
beginAt("/MultiFormPage.html");
setTextField("param2", "anyvalue");
submit("button2b");
- assertTextPresent("param2=anyvalue" +
System.getProperty("line.separator"));
- assertTextPresent("button2b=b2b");
+ assertTextPresent("param2=[anyvalue]");
+ assertTextPresent("button2b=[b2b]");
}
@Test
@@ -294,8 +294,8 @@
setTextField("param2", "anyvalue");
reset();
submit("button2b");
- assertTextNotPresent("param2=anyvalue\n");
- assertTextPresent("button2b=b2b");
+ assertTextNotPresent("param2=[anyvalue]");
+ assertTextPresent("button2b=[b2b]");
}
@Test
@@ -346,7 +346,7 @@
setTextField("color", "blue");
clickButtonWithText("click me");
assertTextPresent("Submitted parameters");
- assertTextPresent("color=blue");
+ assertTextPresent("color=[blue]");
}
@Test
@@ -355,7 +355,7 @@
assertHiddenFieldPresent("hidden", "foo");
setHiddenField("hidden", "bar");
submit();
- assertTextPresent("hidden=bar");
+ assertTextPresent("hidden=[bar]");
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FramesAndWindowsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FramesAndWindowsTest.java
2012-07-25 13:45:55 UTC (rev 946)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FramesAndWindowsTest.java
2012-07-25 14:08:13 UTC (rev 947)
@@ -151,7 +151,7 @@
assertFormPresent();
setTextField("color", "red");
submit("submit");
- assertTextPresent("color=red" + System.getProperty("line.separator"));
+ assertTextPresent("color=[red]");
}
@Test public void testFormInputInInlineFrame() {
@@ -160,16 +160,7 @@
assertFormPresent();
setTextField("color", "red");
submit("submit");
- assertTextPresent("color=red" + System.getProperty("line.separator"));
+ assertTextPresent("color=[red]");
}
- //TODO this just posts to a new frameset inside the frame, is the test
needed?
- @Test public void testFormInputInFrameToFrame() {
- beginAt("Frames.html");
- gotoFrame("ContentFrame");
- setTextField("color", "green");
- submit();
- assertTitleEquals("Submitted parameters");
- }
-
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
2012-07-25 13:45:55 UTC (rev 946)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/JavaScriptEventsTest.java
2012-07-25 14:08:13 UTC (rev 947)
@@ -55,14 +55,14 @@
beginAt("FormOnSubmit.html");
submit();
gotoWindow("child");
- assertTextPresent("on=submit");
+ assertTextPresent("on=[submit]");
}
@Test public void testFormOnReset() {
beginAt("FormOnSubmit.html");
reset();
gotoWindow("child");
- assertTextPresent("on=reset");
+ assertTextPresent("on=[reset]");
}
@Test public void testButtonOnClick() {
@@ -70,7 +70,7 @@
assertButtonPresent("b1");
clickButton("b1");
gotoWindow("child");
- assertTextPresent("on=click");
+ assertTextPresent("on=[click]");
}
@@ -117,7 +117,7 @@
assertTitleEquals("The Title");
selectOption("testSelect", "Value2");
assertTitleEquals("Submitted parameters");
- assertTextPresent("testSelect=V2");
+ assertTextPresent("testSelect=[V2]");
}
@Test public void testGreenLink() {
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
2012-07-25 13:45:55 UTC (rev 946)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
2012-07-25 14:08:13 UTC (rev 947)
@@ -50,7 +50,7 @@
out.write(HtmlHelper.getStart("Submitted parameters"));
out.write("<h1>Submitted parameters</h1>\n<p>Params are:<br/>");
/*
- * Prints POST and GET parameters as name=value1[,value2...] separated
+ * Prints POST and GET parameters as name=[value1[,value2...]]
separated
* by <BR/>
*/
@@ -78,7 +78,7 @@
FileItem item = (FileItem) iter.next();
if (item.isFormField()) {
- out.write(" " + item.getFieldName() + "="
+ out.write(" " + item.getFieldName() + "=["
+ item.getString());
if (item.getFieldName().equals("myReferer")) {
ref = item.getString();
@@ -86,22 +86,22 @@
} else {
String fieldName = item.getFieldName();
String fileName = item.getName();
- out.write(" " + fieldName + "=" + fileName
+ out.write(" " + fieldName + "=[" + fileName
+ "{" + new String(item.get()) + "}");
}
if (iter.hasNext()) {
- out.write("<br/>\n");
+ out.write("]<br/>\n");
}
}
- out.write(" </p>\n");
+ out.write("]</p>\n");
out.write(HtmlHelper.getLinkParagraph("return", ref));
} else {
java.util.Enumeration params = request.getParameterNames();
for (; params.hasMoreElements();) {
String p = params.nextElement().toString();
String[] v = request.getParameterValues(p);
- out.write(p + "=");
+ out.write(p + "=[");
int n = v.length;
if (n > 0) {
out.write(v[0] != null ? v[0] : "");
@@ -110,10 +110,10 @@
}
}
if (params.hasMoreElements()) {
- out.write("<br/>\n");
+ out.write("]<br/>\n");
}
}
- out.write(" </p>\n");
+ out.write("]</p>\n");
String ref = request.getHeader("Referer");
if (ref == null) {
if (request.getParameterValues("myReferer") != null) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
