Update of /cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1973/test/net/sourceforge/jwebunit
Modified Files:
NavigationTest.java AllTests.java FormAssertionsTest.java
Removed Files:
ServletUnitTest.java
Log Message:
more test case fixes.
Index: AllTests.java
===================================================================
RCS file:
/cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit/AllTests.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AllTests.java 15 Apr 2005 04:47:43 -0000 1.18
--- AllTests.java 14 May 2005 03:02:37 -0000 1.19
***************
*** 44,50 ****
//suite.addTestSuite(JavaScriptEventsTest.class);
- //not moved over to using jetty / JWebUnitAPITestCase
- //suite.addTestSuite(ServletUnitTest.class);
-
suite.addTestSuite(MethodInvokerTest.class);
suite.addTestSuite(WebCookieTest.class);
--- 44,47 ----
--- ServletUnitTest.java DELETED ---
Index: FormAssertionsTest.java
===================================================================
RCS file:
/cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit/FormAssertionsTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FormAssertionsTest.java 15 Apr 2005 04:47:43 -0000 1.23
--- FormAssertionsTest.java 14 May 2005 03:02:37 -0000 1.24
***************
*** 30,33 ****
--- 30,34 ----
public void testAssertFormParameterPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertFormElementPresent", "testInputElement",
"noSuchElement");
assertPass("assertFormElementPresent", "checkboxselected");
***************
*** 36,43 ****
--- 37,46 ----
public void testAssertFormParameterNotPresent() throws Throwable {
+ beginAt("/testPage.html");
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");
***************
*** 45,48 ****
--- 48,52 ----
public void testAssertFormParameterNotPresentWithLabel() throws Throwable
{
+ beginAt("/testPage.html");
assertPassFail("assertFormElementNotPresentWithLabel", "No Such
Label", "Test Input");
assertPass("assertFormElementNotPresentWithLabel", "This is a test
page");
***************
*** 50,53 ****
--- 54,58 ----
public void testAssertHasForm() throws Throwable {
+ beginAt("/testPage.html");
assertPass("assertFormPresent", NOARGS);
beginAt("/noFormPage.html");
***************
*** 57,60 ****
--- 62,66 ----
public void testAssertHasNamedForm() throws Throwable {
+ beginAt("/testPage.html");
assertPass("assertFormPresent", new String[]{"form2"});
assertFail("assertFormPresent", new String[]{"noform"});
***************
*** 63,66 ****
--- 69,73 ----
public void testAssertFormParameterEquals() throws Throwable {
+ beginAt("/testPage.html");
assertPass("assertFormElementEquals", new
Object[]{"testInputElement", "testValue"});
assertFail("assertFormElementEquals", new
Object[]{"testInputElement", "noSuchValue"});
***************
*** 69,72 ****
--- 76,80 ----
public void testCheckboxSelected() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertCheckboxSelected", "checkboxselected",
"checkboxnotselected");
assertFail("assertCheckboxSelected", "nosuchbox");
***************
*** 74,77 ****
--- 82,86 ----
public void testCheckboxNotSelected() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertCheckboxNotSelected", "checkboxnotselected",
"checkboxselected");
assertFail("assertCheckboxNotSelected", "nosuchbox");
***************
*** 79,90 ****
--- 88,102 ----
public void testAssertSubmitButtonPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertSubmitButtonPresent", "submitButton",
"noSuchButton");
}
public void testAssertSubmitButtonNotPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertSubmitButtonNotPresent", "noSuchButton",
"submitButton");
}
public void testAssertSubmitButtonValue() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertSubmitButtonPresent",
new Object[]{"submitButton", "buttonLabel"},
***************
*** 93,96 ****
--- 105,109 ----
public void testAssertRadioOptionPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertRadioOptionPresent",
new String[]{"cool", "cat"},
***************
*** 99,102 ****
--- 112,116 ----
public void testAssertRadioOptionNotPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertRadioOptionNotPresent",
new String[]{"cool", "fish"},
***************
*** 105,108 ****
--- 119,123 ----
public void testAssertRadioOptionSelected() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertRadioOptionSelected",
new String[]{"cool", "dog"},
***************
*** 111,118 ****
--- 126,135 ----
public void testAssertRadioOptionNotSelected() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertRadioOptionNotSelected", new String[]{"cool",
"cat"}, new String[]{"cool", "dog"});
}
public void testAssertSelectOptionPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertOptionPresent",
new String[]{"selectOption", "One"},
***************
*** 121,124 ****
--- 138,142 ----
public void testAssertSelectOptionNotPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertOptionNotPresent",
new String[]{"selectOption", "NoSuchOption"},
***************
*** 127,130 ****
--- 145,149 ----
public void testAssertOptionsEqual() throws Throwable {
+ beginAt("/testPage.html");
assertPass("assertOptionsEqual", new Object[]{"select1", new
String[]{"one", "two", "three", "four"}});
assertFail("assertOptionsEqual", new Object[]{"select1", new
String[]{"one", "four", "three", "two"}});
***************
*** 133,136 ****
--- 152,156 ----
public void testAssertOptionsNotEqual() throws Throwable {
+ beginAt("/testPage.html");
assertFail("assertOptionsNotEqual", new Object[]{"select1", new
String[]{"one", "two", "three", "four"}});
assertPass("assertOptionsNotEqual", new Object[]{"select1", new
String[]{"one", "four", "three", "two"}});
***************
*** 139,142 ****
--- 159,163 ----
public void testAssertOptionValuesEqual() throws Throwable {
+ beginAt("/testPage.html");
assertPass("assertOptionValuesEqual", new Object[]{"select1", new
String[]{"1", "2", "3", "4"}});
assertFail("assertOptionValuesEqual", new Object[]{"select1", new
String[]{"1", "4", "3", "2"}});
***************
*** 145,148 ****
--- 166,170 ----
public void testAssertOptionValuesNotEqual() throws Throwable {
+ beginAt("/testPage.html");
assertFail("assertOptionValuesNotEqual", new Object[]{"select1", new
String[]{"1", "2", "3", "4"}});
assertPass("assertOptionValuesNotEqual", new Object[]{"select1", new
String[]{"1", "4", "3", "2"}});
***************
*** 151,162 ****
--- 173,187 ----
public void testAssertSelectedOptionEquals() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertOptionEquals", new String[]{"select1", "one"},
new String[]{"select1", "two"});
}
public void testAssertButtonPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertButtonPresent", "b1", "nobutton");
}
public void testAssertButtonNotPresent() throws Throwable {
+ beginAt("/testPage.html");
assertPassFail("assertButtonNotPresent", "nobutton", "b1");
}
Index: NavigationTest.java
===================================================================
RCS file:
/cvsroot/jwebunit/jWebUnit/test/net/sourceforge/jwebunit/NavigationTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NavigationTest.java 15 Apr 2005 04:47:43 -0000 1.17
--- NavigationTest.java 14 May 2005 03:02:37 -0000 1.18
***************
*** 39,44 ****
public void testInvalidBeginAt() {
! beginAt("/nosuchresource.html");
! assertTitleEquals("Error 404 Not Found");
}
--- 39,44 ----
public void testInvalidBeginAt() {
! //the testing engines should throw an exception if a 404 Error
is found.
! assertFail("beginAt", "/nosuchresource.html");
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
