more on error handling

Author: rbri

src/main/java/org/htmlunit/javascript/host/canvas/ImageData.java

@@ -25,6 +25,7 @@
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.host.dom.DOMException;
 import org.htmlunit.platform.canvas.rendering.RenderingBackend;
 
 /**
@@ -61,7 +62,7 @@ public ImageData() {
     public static ImageData jsConstructor(final Context cx, final Scriptable scope,
             final Object[] args, final Function ctorObj, final boolean inNewExpr) {
         if (args.length < 2) {
-            throw JavaScriptEngine.reportRuntimeError("ImageData ctor - too less arguments");
+            throw JavaScriptEngine.typeError("ImageData ctor - too less arguments");
         }
 
         NativeUint8ClampedArray data = null;
@@ -70,23 +71,35 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
         if (args[0] instanceof NativeUint8ClampedArray) {
             data = (NativeUint8ClampedArray) args[0];
             if (data.getArrayLength() % 4 != 0) {
-                throw JavaScriptEngine.reportRuntimeError("ImageData ctor - data length mod 4 not zero");
+                throw JavaScriptEngine.asJavaScriptException(
+                        (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                        new DOMException(
+                                "ImageData ctor - data length mod 4 not zero",
+                                DOMException.INVALID_STATE_ERR));
             }
 
             width = (int) JavaScriptEngine.toInteger(args[1]);
             if (args.length < 3) {
                 height = data.getArrayLength() / 4 / width;
 
                 if (data.getArrayLength() != 4 * width * height) {
-                    throw JavaScriptEngine.reportRuntimeError("ImageData ctor - width not correct");
+                    throw JavaScriptEngine.asJavaScriptException(
+                            (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                            new DOMException(
+                                    "ImageData ctor - width not correct",
+                                    DOMException.INDEX_SIZE_ERR));
                 }
             }
             else {
                 height = (int) JavaScriptEngine.toInteger(args[2]);
             }
 
             if (data.getArrayLength() != 4 * width * height) {
-                throw JavaScriptEngine.reportRuntimeError("ImageData ctor - width/height not correct");
+                throw JavaScriptEngine.asJavaScriptException(
+                        (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                        new DOMException(
+                                "ImageData ctor - width/height not correct",
+                                DOMException.INDEX_SIZE_ERR));
             }
         }
         else {
@@ -95,10 +108,18 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
         }
 
         if (width < 0) {
-            throw JavaScriptEngine.reportRuntimeError("ImageData ctor - width negative");
+            throw JavaScriptEngine.asJavaScriptException(
+                    (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                    new DOMException(
+                            "ImageData ctor - width negative",
+                            DOMException.INDEX_SIZE_ERR));
         }
         if (height < 0) {
-            throw JavaScriptEngine.reportRuntimeError("ImageData ctor - height negative");
+            throw JavaScriptEngine.asJavaScriptException(
+                    (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                    new DOMException(
+                            "ImageData ctor - height negative",
+                            DOMException.INDEX_SIZE_ERR));
         }
 
         final ImageData result = new ImageData(null, 0, 0, width, height);

src/test/java/org/htmlunit/javascript/host/canvas/ImageDataTest.java

@@ -122,7 +122,8 @@ public void ctorArrayWidthHeight() throws Exception {
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts({"exception", "exception", "exception", "exception", "exception", "exception", "exception"})
+    @Alerts({"TypeError", "IndexSizeError", "IndexSizeError", "IndexSizeError",
+             "IndexSizeError", "InvalidStateError", "IndexSizeError"})
     public void ctorArrayInvalid() throws Exception {
         final String html =
             "<html><head><script>\n"
@@ -131,34 +132,34 @@ public void ctorArrayInvalid() throws Exception {
 
             + "  try {\n"
             + "    var imageData = new ImageData();\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  try {\n"
             + "    var imageData = new ImageData(-2, 1);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  try {\n"
             + "    var imageData = new ImageData(2, -1);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  try {\n"
             + "    var imageData = new ImageData(-2, -1);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  var arr = new Uint8ClampedArray(8);\n"
             + "  try {\n"
             + "    var imageData = new ImageData(arr, 3);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  arr = new Uint8ClampedArray(11);\n"
             + "  try {\n"
             + "    var imageData = new ImageData(arr, 2);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "  arr = new Uint8ClampedArray(8);\n"
             + "  try {\n"
             + "    var imageData = new ImageData(arr, 2, 2);\n"
-            + "  } catch (e) { log('exception');}\n"
+            + "  } catch (e) { log(e.name);}\n"
 
             + "}\n"
             + "</script>\n"