[1747033] assertCheckbox[Not]Present now works if HTML type attribute value is not lowercase (e.g.: type="CHECKBOX").

henryju · henryju · commit c8549cb1b762 · 2008-04-14T12:32:53.000Z
diff --git a/jwebunit-commons-tests/src/main/resources/testcases/FormSubmissionTest/SingleNamedButtonForm.html b/jwebunit-commons-tests/src/main/resources/testcases/FormSubmissionTest/SingleNamedButtonForm.html
@@ -4,7 +4,7 @@
 	<form method="get" action="../params.jsp">
 		<input type="text" name="color" />
 		<input type="hidden" name="checkBox"/>
-		<input type="checkbox" name="checkBox" />
+		<input type="CHECKBOX" name="checkBox" />
 		<input type="submit" name="button" value="click me">
 		<input type="hidden" name="myReferer" value="FormSubmissionTest/SingleNamedButtonForm.html">
 	</form>
diff --git a/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java b/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
@@ -731,7 +731,7 @@ public void assertCheckboxPresent(String checkboxName) {
         assertFormPresent();
         Assert.assertTrue("Did not find form checkbox with name ["
                 + checkboxName + "].", getTestingEngine().hasElementByXPath(
-                "//input[@type='checkbox' and @name='" + checkboxName + "']"));
+                "//input[lower-case(@type)='checkbox' and @name='" + checkboxName + "']"));
     }
 
     /**
@@ -745,7 +745,7 @@ public void assertCheckboxPresent(String checkboxName, String checkboxValue) {
         Assert.assertTrue("Did not find form checkbox with name ["
                 + checkboxName + "] and value [" + checkboxValue + "].",
                 getTestingEngine().hasElementByXPath(
-                        "//input[@type='checkbox' and @name='" + checkboxName
+                        "//input[lower-case(@type)='checkbox' and @name='" + checkboxName
                                 + "' and @value='" + checkboxValue + "']"));
     }
 
@@ -758,7 +758,7 @@ public void assertCheckboxNotPresent(String checkboxName) {
         assertFormPresent();
         Assert.assertFalse("Found form checkbox with name [" + checkboxName
                 + "] when not expected.", getTestingEngine().hasElementByXPath(
-                "//input[@type='checkbox' and @name='" + checkboxName + "']"));
+                "//input[lower-case(@type)='checkbox' and @name='" + checkboxName + "']"));
     }
 
     /**
@@ -773,7 +773,7 @@ public void assertCheckboxNotPresent(String checkboxName,
         Assert.assertFalse("Found form checkbox with name [" + checkboxName
                 + "] and value [" + checkboxValue + "] when not expected.",
                 getTestingEngine().hasElementByXPath(
-                        "//input[@type='checkbox' and @name='" + checkboxName
+                        "//input[lower-case(@type)='checkbox' and @name='" + checkboxName
                                 + "' and @value='" + checkboxValue + "']"));
     }
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -7,7 +7,10 @@
         </author>
     </properties>
     <body>
-        <release version="1.5" date="UNKNOW">
+        <release version="1.5" date="UNKNOW" description="The latest major release before Java 1.5 migration">
+            <action type="fix" dev="henryju" issue="1747033" due-to="Carlo Possati">
+                assertCheckbox[Not]Present now works if HTML type attribute value is not lowercase (e.g.: type="CHECKBOX").
+            </action>
             <action type="update" dev="henryju">
                 Update to HtmlUnit 1.14.
             </action>
