Revision: 517
Author: henryju
Date: 2006-06-28 05:06:29 -0700 (Wed, 28 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=517&view=rev
Log Message:
-----------
Fix the new test (input file) to make it pass when launched from Maven.
Move TestContextBundle.properties to resources folder.
Modified Paths:
--------------
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextTest.java
Added Paths:
-----------
branches/1.x/jwebunit-commons-tests/src/main/resources/TestContextBundle.properties
Removed Paths:
-------------
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextBundle.properties
Modified:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
2006-06-28 11:31:24 UTC (rev 516)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
2006-06-28 12:06:29 UTC (rev 517)
@@ -4,6 +4,10 @@
******************************************************************************/
package net.sourceforge.jwebunit.tests;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import java.net.URL;
import net.sourceforge.jwebunit.tests.util.JettySetup;
@@ -21,165 +25,177 @@
*/
public class FormSubmissionTest extends JWebUnitAPITestCase {
- public static Test suite() {
- Test suite = new TestSuite(FormSubmissionTest.class);
- return new JettySetup(suite);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- getTestContext().setBaseUrl(HOST_PATH + "/FormSubmissionTest");
- }
+ public static Test suite() {
+ Test suite = new TestSuite(FormSubmissionTest.class);
+ return new JettySetup(suite);
+ }
- public void testSetTextField() {
- beginAt("/SingleNamedButtonForm.html");
- setTextField("color", "blue");
- submit("button");
+ public void setUp() throws Exception {
+ super.setUp();
+ getTestContext().setBaseUrl(HOST_PATH + "/FormSubmissionTest");
+ }
+
+ public void testSetTextField() {
+ beginAt("/SingleNamedButtonForm.html");
+ setTextField("color", "blue");
+ submit("button");
assertTextPresent("Submitted parameters");
- assertTextPresent("Params are: color=blue");
- clickLink("return");
+ assertTextPresent("Params are: color=blue");
+ clickLink("return");
setTextField("color", "red");
- submit();
- assertTextPresent("Params are: color=red");
- }
+ submit();
+ assertTextPresent("Params are: color=red");
+ }
public void testSetFileField() {
beginAt("/InputFileForm.html");
- URL url = getClass().getResource("data.txt");
- assertNotNull(url);
- //FIXME HtmlUnit bug, need to remove file:/
- String filename = url.toString().substring(6);
+ File temp = null;
+ try {
+ // Create temp file.
+ temp = File.createTempFile("data", ".txt");
+ // Delete temp file when program exits.
+ temp.deleteOnExit();
+ // Write to temp file
+ BufferedWriter out = new BufferedWriter(new FileWriter(temp));
+ out.write("abcdefgh");
+ out.close();
+ } catch (IOException e) {
+ fail(e.toString());
+ }
+ String filename = temp.getAbsolutePath();
setTextField("file", filename);
submit("button");
assertTextPresent("Submitted parameters");
- assertMatch("file=data\\.txt\\{This file.*\\}");
+ assertTextPresent("file=" + temp.getName() + "{abcdefgh}");
}
public void testCheckBoxSelection() {
- beginAt("/SingleNamedButtonForm.html");
- checkCheckbox("checkBox");
+ beginAt("/SingleNamedButtonForm.html");
+ checkCheckbox("checkBox");
setTextField("color", "blue");
- submit();
- //checkBox contains 2 parameters: one for the hidden input and one for
the checkbox
- assertTextPresent("Params are: color=blue checkBox=,on");
- }
+ submit();
+ // checkBox contains 2 parameters: one for the hidden input and one for
+ // the checkbox
+ assertTextPresent("Params are: color=blue checkBox=,on");
+ }
- public void testCheckBoxSelectionWithSameFieldName() {
- beginAt("/CheckboxForm.html");
- checkCheckbox("checkBox", "1");
- checkCheckbox("checkBox", "3");
- checkCheckbox("checkBox", "3"); // check for duplicates
- submit();
- assertTextPresent("Params are: checkBox=1,3 ");
- }
+ public void testCheckBoxSelectionWithSameFieldName() {
+ beginAt("/CheckboxForm.html");
+ checkCheckbox("checkBox", "1");
+ checkCheckbox("checkBox", "3");
+ checkCheckbox("checkBox", "3"); // check for duplicates
+ submit();
+ assertTextPresent("Params are: checkBox=1,3 ");
+ }
- public void testCheckBoxDeSelectionWithSameFieldName() {
- beginAt("/CheckboxForm.html");
- checkCheckbox("checkBox", "1");
- checkCheckbox("checkBox", "3");
- uncheckCheckbox("checkBox", "3");
- submit();
- assertTextPresent("Params are: checkBox=1");
- }
+ public void testCheckBoxDeSelectionWithSameFieldName() {
+ beginAt("/CheckboxForm.html");
+ checkCheckbox("checkBox", "1");
+ checkCheckbox("checkBox", "3");
+ uncheckCheckbox("checkBox", "3");
+ submit();
+ assertTextPresent("Params are: checkBox=1");
+ }
- public void testCheckBoxDeselection() {
- beginAt("/SingleNamedButtonForm.html");
- checkCheckbox("checkBox"); //Fail with httpunit because of
hidden field with same name
+ public void testCheckBoxDeselection() {
+ beginAt("/SingleNamedButtonForm.html");
+ checkCheckbox("checkBox"); // Fail with httpunit because of hidden
+ // field with same name
assertCheckboxSelected("checkBox");
setTextField("color", "blue");
- uncheckCheckbox("checkBox");
- submit();
- assertTextPresent("Params are: color=blue ");
- }
+ uncheckCheckbox("checkBox");
+ submit();
+ assertTextPresent("Params are: color=blue ");
+ }
- public void testSingleFormSingleUnnamedButtonSubmission() {
- beginAt("/SingleUnnamedButtonForm.html");
+ public void testSingleFormSingleUnnamedButtonSubmission() {
+ beginAt("/SingleUnnamedButtonForm.html");
setTextField("color", "blue");
- submit();
- assertTextPresent(" color=blue ");
- }
+ submit();
+ assertTextPresent(" color=blue ");
+ }
- public void testSingleNamedButtonSubmission() {
- beginAt("/SingleNamedButtonForm.html");
+ public void testSingleNamedButtonSubmission() {
+ beginAt("/SingleNamedButtonForm.html");
setTextField("color", "red");
- submit();
- assertTextPresent("Params are: color=red");
- }
+ submit();
+ assertTextPresent("Params are: color=red");
+ }
- public void testSingleFormMultipleButtonSubmission() {
- gotoMultiButtonPage();
- submit("color");
- assertTextPresent("Params are: color=red");
- gotoMultiButtonPage();
- submit("color", "blue");
- assertTextPresent("Params are: color=blue");
- }
+ public void testSingleFormMultipleButtonSubmission() {
+ gotoMultiButtonPage();
+ submit("color");
+ assertTextPresent("Params are: color=red");
+ gotoMultiButtonPage();
+ submit("color", "blue");
+ assertTextPresent("Params are: color=blue");
+ }
- public void testBogusParameter() {
- gotoMultiButtonPage();
- try {
+ public void testBogusParameter() {
+ gotoMultiButtonPage();
+ try {
setTextField("nonexistent", "anyvalue");
- } catch (AssertionFailedError e) {
- return;
- }
- fail("Expected AssertionFailedError");
- }
+ } catch (AssertionFailedError e) {
+ return;
+ }
+ fail("Expected AssertionFailedError");
+ }
- public void testParamSetOnMultiForm() {
- beginAt("/MultiFormPage.html");
+ public void testParamSetOnMultiForm() {
+ beginAt("/MultiFormPage.html");
setTextField("param1", "anyvalue");
- setWorkingForm("form2");
+ setWorkingForm("form2");
setTextField("param2", "anyvalue");
- submit("button2a");
- assertTextPresent("param2=anyvalue");
- }
+ submit("button2a");
+ assertTextPresent("param2=anyvalue");
+ }
- public void testSetWorkingFormById() {
- beginAt("/MultiFormPage.html");
- setWorkingForm("form5");
- }
+ public void testSetWorkingFormById() {
+ beginAt("/MultiFormPage.html");
+ setWorkingForm("form5");
+ }
- public void testInvalidButton() {
+ public void testInvalidButton() {
beginAt("/InvalidActionForm.html");
- try {
- submit("button1");
+ try {
+ submit("button1");
fail("Should have failed because the target page does not exist");
- } catch (RuntimeException e) {
- //TODO Have a better way to know if 404 happened
- assertTrue("Should return 404 error", true);
- }
- }
+ } catch (RuntimeException e) {
+ // TODO Have a better way to know if 404 happened
+ assertTrue("Should return 404 error", true);
+ }
+ }
- public void testUnnamedSubmitOnSpecificForm() {
- beginAt("/MultiFormPage.html");
+ public void testUnnamedSubmitOnSpecificForm() {
+ beginAt("/MultiFormPage.html");
setTextField("param4", "anyvalue");
- submit();
- assertTextPresent("param4=anyvalue");
- }
+ submit();
+ assertTextPresent("param4=anyvalue");
+ }
- public void testNamedSubmitOnSpecificForm() {
- beginAt("/MultiFormPage.html");
+ public void testNamedSubmitOnSpecificForm() {
+ beginAt("/MultiFormPage.html");
setTextField("param2", "anyvalue");
- submit("button2b");
- assertTextPresent("param2=anyvalue ");
+ submit("button2b");
+ assertTextPresent("param2=anyvalue ");
assertTextPresent(" button2b=b2b");
- }
+ }
- public void testSubmissionReset() {
- beginAt("/MultiFormPage.html");
+ public void testSubmissionReset() {
+ beginAt("/MultiFormPage.html");
setTextField("param2", "anyvalue");
reset();
- submit("button2b");
+ submit("button2b");
assertTextNotPresent("param2=anyvalue ");
assertTextPresent(" button2b=b2b");
- }
+ }
- public void testSelectOption() {
- beginAt("/MultiFormPage.html");
- assertSelectedOptionEquals("select1", "one");
- selectOption("select1", "two");
- assertSelectedOptionEquals("select1", "two");
- }
+ public void testSelectOption() {
+ beginAt("/MultiFormPage.html");
+ assertSelectedOptionEquals("select1", "one");
+ selectOption("select1", "two");
+ assertSelectedOptionEquals("select1", "two");
+ }
public void testSelectOptionByValue() {
beginAt("/MultiFormPage.html");
@@ -188,8 +204,8 @@
assertSelectedOptionValueEquals("select1", "2");
}
- private void gotoMultiButtonPage() {
- beginAt("/MultiNamedButtonForm.html");
- }
+ private void gotoMultiButtonPage() {
+ beginAt("/MultiNamedButtonForm.html");
+ }
}
\ No newline at end of file
Deleted:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextBundle.properties
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextBundle.properties
2006-06-28 11:31:24 UTC (rev 516)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextBundle.properties
2006-06-28 12:06:29 UTC (rev 517)
@@ -1 +0,0 @@
-prop1=val1
\ No newline at end of file
Modified:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextTest.java
2006-06-28 11:31:24 UTC (rev 516)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextTest.java
2006-06-28 12:06:29 UTC (rev 517)
@@ -42,8 +42,8 @@
}
public void testResourceBundle() {
- String name = "net.sourceforge.jwebunit.TestContextBundle";
-
context.setResourceBundleName("net.sourceforge.jwebunit.TestContextBundle");
+ String name = "/TestContextBundle";
+ context.setResourceBundleName("/TestContextBundle");
assertEquals(name, context.getResourceBundleName());
}
Copied:
branches/1.x/jwebunit-commons-tests/src/main/resources/TestContextBundle.properties
(from rev 513,
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TestContextBundle.properties)
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/resources/TestContextBundle.properties
(rev 0)
+++
branches/1.x/jwebunit-commons-tests/src/main/resources/TestContextBundle.properties
2006-06-28 12:06:29 UTC (rev 517)
@@ -0,0 +1 @@
+prop1=val1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
