Revision: 472
Author: henryju
Date: 2006-06-05 08:19:57 -0700 (Mon, 05 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jwebunit/?rev=472&view=rev
Log Message:
-----------
Add assertResetButton*Present methods
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
===================================================================
---
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
2006-06-05 14:16:53 UTC (rev 471)
+++
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/IJWebUnitDialog.java
2006-06-05 15:19:57 UTC (rev 472)
@@ -349,10 +349,16 @@
boolean hasRadioOption(String radioGroup, String radioOptionValue);
/**
+ * Checks if the current form contains a submit button.
+ *
+ */
+ boolean hasSubmitButton();
+
+ /**
* Checks if the current form contains a specific submit button.
*
* @param nameOrID
- * name of id of the button to check for.
+ * name or id of the button to check for.
*/
boolean hasSubmitButton(String nameOrID);
@@ -397,6 +403,20 @@
void submit(String buttonName, String buttonValue);
/**
+ * Checks if the current form contains a reset button.
+ *
+ */
+ boolean hasResetButton();
+
+ /**
+ * Checks if the current form contains a specific reset button.
+ *
+ * @param nameOrID
+ * name or id of the button to check for.
+ */
+ boolean hasResetButton(String nameOrID);
+
+ /**
* Reset the current form with the default reset button. See
* [EMAIL PROTECTED] #getForm}for an explanation of how the current form is
* established.
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
2006-06-05 14:16:53 UTC (rev 471)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTestCase.java
2006-06-05 15:19:57 UTC (rev 472)
@@ -369,19 +369,70 @@
tester.assertSelectedOptionsMatch(selectName, regexps);
}
+ /**
+ * @see net.sourceforge.jwebunit.WebTester#assertSubmitButtonPresent()
+ */
+ public void assertSubmitButtonPresent() {
+ getTester().assertSubmitButtonPresent();
+ }
+
+ /**
+ * @see
net.sourceforge.jwebunit.WebTester#assertSubmitButtonPresent(String)
+ */
public void assertSubmitButtonPresent(String buttonName) {
getTester().assertSubmitButtonPresent(buttonName);
}
+ /**
+ * @see net.sourceforge.jwebunit.WebTester#assertSubmitButtonNotPresent()
+ */
+ public void assertSubmitButtonNotPresent() {
+ getTester().assertSubmitButtonNotPresent();
+ }
+
+ /**
+ * @see
net.sourceforge.jwebunit.WebTester#assertSubmitButtonNotPresent(String)
+ */
public void assertSubmitButtonNotPresent(String buttonName) {
getTester().assertSubmitButtonNotPresent(buttonName);
}
+ /**
+ * @see
net.sourceforge.jwebunit.WebTester#assertSubmitButtonPresent(String, String)
+ */
public void assertSubmitButtonPresent(String buttonName,
String expectedValue) {
getTester().assertSubmitButtonPresent(buttonName, expectedValue);
}
+ /**
+ * @see net.sourceforge.jwebunit.WebTester#assertResetButtonPresent()
+ */
+ public void assertResetButtonPresent() {
+ getTester().assertResetButtonPresent();
+ }
+
+ /**
+ * @see net.sourceforge.jwebunit.WebTester#assertResetButtonPresent(String)
+ */
+ public void assertResetButtonPresent(String buttonName) {
+ getTester().assertResetButtonPresent(buttonName);
+ }
+
+ /**
+ * @see net.sourceforge.jwebunit.WebTester#assertResetButtonNotPresent()
+ */
+ public void assertResetButtonNotPresent() {
+ getTester().assertResetButtonNotPresent();
+ }
+
+ /**
+ * @see
net.sourceforge.jwebunit.WebTester#assertResetButtonNotPresent(String)
+ */
+ public void assertResetButtonNotPresent(String buttonName) {
+ getTester().assertResetButtonNotPresent(buttonName);
+ }
+
public void assertButtonPresent(String buttonID) {
getTester().assertButtonPresent(buttonID);
}
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
===================================================================
--- trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
2006-06-05 14:16:53 UTC (rev 471)
+++ trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/WebTester.java
2006-06-05 15:19:57 UTC (rev 472)
@@ -1103,6 +1103,16 @@
}
/**
+ * Assert that a submit button is present.
+ *
+ */
+ public void assertSubmitButtonPresent() {
+ assertFormPresent();
+ Assert.assertTrue("no submit button found.",
+ getDialog().hasSubmitButton());
+ }
+
+ /**
* Assert that a submit button with a given name is present.
*
* @param buttonName
@@ -1114,6 +1124,17 @@
}
/**
+ * Assert that no submit button is present in the current form.
+ *
+ * @param buttonName
+ */
+ public void assertSubmitButtonNotPresent() {
+ assertFormPresent();
+ Assert.assertFalse("Submit Button found.",
+ getDialog().hasSubmitButton());
+ }
+
+ /**
* Assert that a submit button with a given name is not present.
*
* @param buttonName
@@ -1138,6 +1159,49 @@
}
/**
+ * Assert that a reset button is present.
+ *
+ */
+ public void assertResetButtonPresent() {
+ assertFormPresent();
+ Assert.assertTrue("no reset button found.",
+ getDialog().hasResetButton());
+ }
+
+ /**
+ * Assert that a reset button with a given name is present.
+ *
+ * @param buttonName
+ */
+ public void assertResetButtonPresent(String buttonName) {
+ assertFormPresent();
+ Assert.assertTrue("Reset Button [" + buttonName + "] not found.",
+ getDialog().hasResetButton(buttonName));
+ }
+
+ /**
+ * Assert that no reset button is present in the current form.
+ *
+ * @param buttonName
+ */
+ public void assertResetButtonNotPresent() {
+ assertFormPresent();
+ Assert.assertFalse("Reset Button found.",
+ getDialog().hasResetButton());
+ }
+
+ /**
+ * Assert that a reset button with a given name is not present.
+ *
+ * @param buttonName
+ */
+ public void assertResetButtonNotPresent(String buttonName) {
+ assertFormPresent();
+ Assert.assertFalse("Reset Button [" + buttonName + "] found.",
+ getDialog().hasResetButton(buttonName));
+ }
+
+ /**
* Assert that a button with a given id is present.
*
* @param buttonId
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Jwebunit-development mailing list
Jwebunit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
