Revision: 181
http://jsptest.svn.sourceforge.net/jsptest/?rev=181&view=rev
Author: lkoskela
Date: 2007-10-29 23:04:38 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
form().shouldHaveSubmitButton("foo") now works with both "name" and "value" HTML attributes:
<input type="submit" name="foo"/>
<input type="submit" value="foo"/>
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseFormAssertions.java
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java 2007-10-30 05:41:32 UTC (rev 180)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java 2007-10-30 06:04:38 UTC (rev 181)
@@ -44,6 +44,9 @@
if (name.equals(element.getAttribute("VALUE"))) {
return true;
}
+ if (name.equals(element.getAttribute("NAME"))) {
+ return true;
+ }
}
}
return false;
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseFormAssertions.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseFormAssertions.java 2007-10-30 05:41:32 UTC (rev 180)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseFormAssertions.java 2007-10-30 06:04:38 UTC (rev 181)
@@ -28,6 +28,7 @@
h.append("<html><body>");
h.append("<form name='form_name' action='act.do'>");
h.append(" <input type='text' name='field' value='hello'>");
+ h.append(" <input type='submit' name='submit_name' value='submit_value'>");
h.append("</form>");
h.append("</body></html>");
}
@@ -41,6 +42,17 @@
}
}
+ public void testUnnamedFormShouldHaveButton() throws Exception {
+ testcase.form().shouldHaveSubmitButton();
+ testcase.form().shouldHaveSubmitButton("submit_value");
+ testcase.form().shouldHaveSubmitButton("submit_name");
+ try {
+ testcase.form().shouldHaveSubmitButton("nosuchbutton");
+ throw new RuntimeException("Test should've failed");
+ } catch (AssertionFailedError expected) {
+ }
+ }
+
public void testNamedFormShouldHaveField() throws Exception {
testcase.form("form_name").shouldHaveField("field");
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
