Revision: 463
Author: henryju
Date: 2006-05-23 02:04:39 -0700 (Tue, 23 May 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=463&view=rev
Log Message:
-----------
Split FormAssertionsTest and FormSubmissionTest to move **WithLabel out, as it
is only supported by HttpUnitDialog.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
trunk/jwebunit-httpunit-plugin/src/test/java/net/sourceforge/jwebunit/httpunit/JWebUnitTest.java
Added Paths:
-----------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsWithLabelTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsTest.java
2006-05-23 08:50:32 UTC (rev 462)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsTest.java
2006-05-23 09:04:39 UTC (rev 463)
@@ -40,18 +40,6 @@
assertPassFail("assertFormElementNotPresent", "noSuchElement",
"testInputElement");
}
- public void testAssertFormParameterPresentWithLabel() throws Throwable {
- beginAt("/testPage.html");
- assertPassFail("assertFormElementPresentWithLabel", "Test Input", "No
Such Label");
- assertFail("assertFormElementPresentWithLabel", "This is a test page");
- }
-
- public void testAssertFormParameterNotPresentWithLabel() throws Throwable {
- beginAt("/testPage.html");
- assertPassFail("assertFormElementNotPresentWithLabel", "No Such
Label", "Test Input");
- assertPass("assertFormElementNotPresentWithLabel", "This is a test
page");
- }
-
public void testAssertHasForm() throws Throwable {
beginAt("/testPage.html");
assertPass("assertFormPresent", NOARGS);
Added:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsWithLabelTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsWithLabelTest.java
(rev 0)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormAssertionsWithLabelTest.java
2006-05-23 09:04:39 UTC (rev 463)
@@ -0,0 +1,35 @@
+/*
+ * User: djoiner
+ * Date: Sep 9, 2002
+ * Time: 3:15:10 PM
+ */
+package net.sourceforge.jwebunit.tests;
+
+import net.sourceforge.jwebunit.tests.util.JettySetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class FormAssertionsWithLabelTest extends JWebUnitAPITestCase {
+
+ public static Test suite() {
+ Test suite = new TestSuite(FormAssertionsWithLabelTest.class);
+ return new JettySetup(suite);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ getTestContext().setBaseUrl(HOST_PATH + "/FormAssertionsTest");
+ }
+
+ public void testAssertFormParameterPresentWithLabel() throws Throwable {
+ beginAt("/testPage.html");
+ assertPassFail("assertFormElementPresentWithLabel", "Test Input", "No
Such Label");
+ assertFail("assertFormElementPresentWithLabel", "This is a test page");
+ }
+
+ public void testAssertFormParameterNotPresentWithLabel() throws Throwable {
+ beginAt("/testPage.html");
+ assertPassFail("assertFormElementNotPresentWithLabel", "No Such
Label", "Test Input");
+ assertPass("assertFormElementNotPresentWithLabel", "This is a test
page");
+ }
+}
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
2006-05-23 08:50:32 UTC (rev 462)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionTest.java
2006-05-23 09:04:39 UTC (rev 463)
@@ -170,24 +170,6 @@
assertSelectedOptionValueEquals("select1", "2");
}
- public void testSimpleLabeledForm() {
- beginAt("/QueryFormSimple.html");
- setFormElementWithLabel("First", "oneValue");
- setFormElementWithLabel("Second", "anotherValue");
- submit();
- assertTextPresent(" param1=oneValue ");
- assertTextPresent(" param2=anotherValue ");
- }
-
- public void testTrickyLabeledForm() {
- beginAt("/QueryFormTricky.html");
- setFormElementWithLabel("Trick", "oneValue");
- setFormElementWithLabel("Treat", "anotherValue");
- submit();
- assertTextPresent(" param3=oneValue ");
- assertTextPresent(" param4=anotherValue ");
- }
-
private void gotoMultiButtonPage() {
beginAt("/MultiNamedButtonForm.html");
}
Added:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
(rev 0)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/FormSubmissionWithLabelTest.java
2006-05-23 09:04:39 UTC (rev 463)
@@ -0,0 +1,46 @@
+package net.sourceforge.jwebunit.tests;
+
+import net.sourceforge.jwebunit.tests.util.JettySetup;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Test form submission related methods of WebTestCase.
+ *
+ * If there is more than one submit button on a page, WebTestCase / httpunit
+ * require indication of which button to submit with prior to form submission.
+ *
+ * @author Jim Weaver
+ */
+public class FormSubmissionWithLabelTest extends JWebUnitAPITestCase {
+
+ public static Test suite() {
+ Test suite = new TestSuite(FormSubmissionWithLabelTest.class);
+ return new JettySetup(suite);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ getTestContext().setBaseUrl(HOST_PATH + "/FormSubmissionTest");
+ }
+
+ public void testSimpleLabeledForm() {
+ beginAt("/QueryFormSimple.html");
+ setFormElementWithLabel("First", "oneValue");
+ setFormElementWithLabel("Second", "anotherValue");
+ submit();
+ assertTextPresent(" param1=oneValue ");
+ assertTextPresent(" param2=anotherValue ");
+ }
+
+ public void testTrickyLabeledForm() {
+ beginAt("/QueryFormTricky.html");
+ setFormElementWithLabel("Trick", "oneValue");
+ setFormElementWithLabel("Treat", "anotherValue");
+ submit();
+ assertTextPresent(" param3=oneValue ");
+ assertTextPresent(" param4=anotherValue ");
+ }
+
+}
\ No newline at end of file
Modified:
trunk/jwebunit-httpunit-plugin/src/test/java/net/sourceforge/jwebunit/httpunit/JWebUnitTest.java
===================================================================
---
trunk/jwebunit-httpunit-plugin/src/test/java/net/sourceforge/jwebunit/httpunit/JWebUnitTest.java
2006-05-23 08:50:32 UTC (rev 462)
+++
trunk/jwebunit-httpunit-plugin/src/test/java/net/sourceforge/jwebunit/httpunit/JWebUnitTest.java
2006-05-23 09:04:39 UTC (rev 463)
@@ -28,6 +28,7 @@
TestSuite suite = new TestSuite("Test for net.sourceforge.jwebunit");
//$JUnit-BEGIN$
suite.addTestSuite(FormSubmissionTest.class);
+ suite.addTestSuite(FormSubmissionWithLabelTest.class);
suite.addTestSuite(WebAssertionsTest.class);
suite.addTestSuite(FramesAndWindowsTest.class);
suite.addTestSuite(FormSubmissionCheckboxesTest.class);
@@ -41,6 +42,7 @@
suite.addTestSuite(WebCookieTest.class);
suite.addTestSuite(TestContextTest.class);
suite.addTestSuite(FormAssertionsTest.class);
+ suite.addTestSuite(FormAssertionsWithLabelTest.class);
suite.addTestSuite(NavigationTest.class);
//$JUnit-END$
return new JettySetup(suite);
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
