#135 Exception from setWorkingForm should indicate the requested form details

henryju · henryju · commit 1e72e98b9254 · 2015-07-13T16:42:44.000Z
diff --git a/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java b/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
@@ -399,15 +399,23 @@ public void gotoFrame(String frameNameOrId) {
    */
   @Override
   public void setWorkingForm(int index) {
-    setWorkingForm(getForm(index));
+    HtmlForm newForm = getForm(index);
+    if (newForm == null) {
+      throw new UnableToSetFormException("No form found in current page with index " + index);
+    }
+    setWorkingForm(newForm);
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
   public void setWorkingForm(String nameOrId, int index) {
-    setWorkingForm(getForm(nameOrId, index));
+    HtmlForm newForm = getForm(nameOrId, index);
+    if (newForm == null) {
+      throw new UnableToSetFormException("No form found in current page with name or id [" + nameOrId + "] and index " + index);
+    }
+    setWorkingForm(newForm);
   }
 
   /**
@@ -1183,9 +1191,6 @@ protected HtmlPage getCurrentPage() {
   }
 
   private void setWorkingForm(HtmlForm newForm) {
-    if (newForm == null) {
-      throw new UnableToSetFormException("Attempted to set form to null.");
-    }
     form = newForm;
   }
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -31,6 +31,9 @@
     </properties>
     <body>
         <release version="3.3" date="UNKNOWN" description="HtmlUnit 2.17, Java 7">
+            <action type="fix" dev="henryju" issue="135" due-to="Joseph Walton">
+                Exception from setWorkingForm should indicate the requested form details.
+            </action>
             <action type="fix" dev="henryju" issue="136" due-to="Randy Chang">
                 Setting User-Agent not work when multiple WebTesters with different User-Agent.
             </action>
