test for the correct error

HtmlUnit · Feb 7, 2025 · ced83a1 · ced83a1
1 parent c8c1e17
commit ced83a1
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 65 deletions.
diff --git a/src/main/java/org/htmlunit/javascript/host/crypto/Crypto.java b/src/main/java/org/htmlunit/javascript/host/crypto/Crypto.java
@@ -51,7 +51,7 @@ public Crypto() {
      */
     @JsxConstructor
     public void jsConstructor() {
-        throw JavaScriptEngine.reportRuntimeError("Illegal constructor.");
+        throw JavaScriptEngine.typeError("Illegal constructor.");
     }
 
     /**

diff --git a/src/main/java/org/htmlunit/javascript/host/crypto/SubtleCrypto.java b/src/main/java/org/htmlunit/javascript/host/crypto/SubtleCrypto.java
@@ -37,7 +37,7 @@ public class SubtleCrypto extends HtmlUnitScriptable {
      */
     @JsxConstructor
     public void jsConstructor() {
-        throw JavaScriptEngine.reportRuntimeError("Illegal constructor.");
+        throw JavaScriptEngine.typeError("Illegal constructor.");
     }
 
     private NativePromise notImplemented() {

diff --git a/src/test/java/org/htmlunit/html/HtmlHeading2Test.java b/src/test/java/org/htmlunit/html/HtmlHeading2Test.java
@@ -105,9 +105,7 @@ public void setAlign() throws Exception {
             + "  function setAlign(elem, value) {\n"
             + "    try {\n"
             + "      elem.align = value;\n"
-            + "    } catch(e) {\n"
-            + "      log('error');\n"
-            + "    }\n"
+            + "    } catch(e) { logEx(e); }\n"
             + "  }\n"
 
             + "  var elem = document.getElementById('e1');\n"

diff --git a/src/test/java/org/htmlunit/html/HtmlInput3Test.java b/src/test/java/org/htmlunit/html/HtmlInput3Test.java
@@ -449,7 +449,7 @@ private void changeType(final String inputAttribs, final String value, final Str
                 + "    try {\n"
                 + "      input.type = '" + targetType + "';\n"
                 + "      log(input.value + '-' + input.defaultValue + '-' + input.getAttribute('value'));\n"
-                + "    } catch(e) { log('error'); }\n"
+                + "    } catch(e) { logEx(e); }\n"
                 + "  }\n"
                 + "</script>\n"
                 + "</head><body onload='test()'>\n"
@@ -677,7 +677,7 @@ private void changeTypeDetached(final String value, final String targetType) thr
                 + "    try {\n"
                 + "      input.type = '" + targetType + "';\n"
                 + "      log(input.value + '-' + input.defaultValue + '-' + input.getAttribute('value'));\n"
-                + "    } catch(e) { log('error'); }\n"
+                + "    } catch(e) { logEx(e); }\n"
                 + "  }\n"
                 + "</script>\n"
                 + "</head><body onload='test()'>\n"

diff --git a/src/test/java/org/htmlunit/html/HtmlOutputTest.java b/src/test/java/org/htmlunit/html/HtmlOutputTest.java
@@ -77,9 +77,7 @@ public void align() throws Exception {
             + "  function set(fs, value) {\n"
             + "    try {\n"
             + "      fs.align = value;\n"
-            + "    } catch(e) {\n"
-            + "      log('error');\n"
-            + "    }\n"
+            + "    } catch(e) { logEx(e); }\n"
             + "  }\n"
             + "  var o1 = document.getElementById('o1');\n"
             + "  var o2 = document.getElementById('o2');\n"

diff --git a/src/test/java/org/htmlunit/html/HtmlScript2Test.java b/src/test/java/org/htmlunit/html/HtmlScript2Test.java
@@ -560,8 +560,8 @@ public void addEventListener_NoContent() throws Exception {
             + "  function test() {\n"
             + "    var s1 = document.createElement('script');\n"
             + "    s1.src = '" + scriptUrl + "';\n"
-            + "    s1.addEventListener('load', function() {log('load')}, false);\n"
-            + "    s1.addEventListener('error', function() {log('error')}, false);\n"
+            + "    s1.addEventListener('load', function() { log('load'); }, false);\n"
+            + "    s1.addEventListener('error', function() { logEx(e); }, false);\n"
             + "    document.body.insertBefore(s1, document.body.firstChild);\n"
             + "  }\n"
             + "</script>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/TextDecoderTest.java b/src/test/java/org/htmlunit/javascript/host/TextDecoderTest.java
@@ -731,7 +731,7 @@ public void decode2() throws Exception {
      * @throws Exception on test failure
      */
     @Test
-    @Alerts("ex")
+    @Alerts("RangeError")
     public void decodeReplacement() throws Exception {
         final String html = "<html>\n"
             + "<head>\n"
@@ -740,7 +740,7 @@ public void decodeReplacement() throws Exception {
             + "    function doTest() {\n"
             + "      try {\n"
             + "        var dec = new TextDecoder('iso-2022-kr');\n"
-            + "      } catch(e) { log('ex'); }\n"
+            + "      } catch(e) { logEx(e); }\n"
             + "    }\n"
             + "  </script>\n"
             + "</head>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/arrays/ArrayBufferTest.java b/src/test/java/org/htmlunit/javascript/host/arrays/ArrayBufferTest.java
@@ -54,7 +54,7 @@ public void ctorLengthZero() throws Exception {
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("exception true")
+    @Alerts("RangeError")
     public void ctorLengthNegative() throws Exception {
         final String html
             = "<html><head>\n"
@@ -64,7 +64,7 @@ public void ctorLengthNegative() throws Exception {
             + "  try {\n"
             + "    var buff = new ArrayBuffer(-1);\n"
             + "    log(buff.byteLength);\n"
-            + "  } catch(e) { log('exception ' + (e instanceof RangeError)); }"
+            + "  } catch(e) { logEx(e); }"
             + "}\n"
             + "</script></head><body onload='test()'>\n"
             + "</body></html>";

diff --git a/src/test/java/org/htmlunit/javascript/host/crypto/CryptoTest.java b/src/test/java/org/htmlunit/javascript/host/crypto/CryptoTest.java
@@ -34,7 +34,7 @@ public class CryptoTest extends WebDriverTestCase {
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts({"function", "error"})
+    @Alerts({"function", "TypeError"})
     public void ctor() throws Exception {
         final String html
             = "<html>\n"
@@ -46,7 +46,7 @@ public void ctor() throws Exception {
             + "      try {\n"
             + "        log(typeof Crypto);\n"
             + "        new Crypto();\n"
-            + "      } catch(e) { log('error'); }\n"
+            + "      } catch(e) { logEx(e); }\n"
             + "    }\n"
             + "  </script>\n"
             + "</head>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/crypto/SubtleCryptoTest.java b/src/test/java/org/htmlunit/javascript/host/crypto/SubtleCryptoTest.java
@@ -36,7 +36,7 @@ public class SubtleCryptoTest extends WebDriverTestCase {
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts({"function", "error"})
+    @Alerts({"function", "TypeError"})
     public void ctor() throws Exception {
         final String html
             = "<html>\n"
@@ -48,7 +48,7 @@ public void ctor() throws Exception {
             + "      try {\n"
             + "        log(typeof SubtleCrypto);\n"
             + "        new SubtleCrypto();\n"
-            + "      } catch(e) { log('error'); }\n"
+            + "      } catch(e) { logEx(e); }\n"
             + "    }\n"
             + "  </script>\n"
             + "</head>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/css/CSSMediaRuleTest.java b/src/test/java/org/htmlunit/javascript/host/css/CSSMediaRuleTest.java
@@ -818,9 +818,7 @@ public void insertRuleWithIndexNull() throws Exception {
             + "      log(rules.item(i).cssText);\n"
             + "      log(rules.item(i).parentRule);\n"
             + "    }\n"
-            + "  } catch(e) {\n"
-            + "    log('exception'+e);\n"
-            + "  }\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script>\n"
 
             + "</body></html>";
@@ -855,9 +853,7 @@ public void insertRuleWithIndexNaN() throws Exception {
             + "      log(rules.item(i).cssText);\n"
             + "      log(rules.item(i).parentRule);\n"
             + "    }\n"
-            + "  } catch(e) {\n"
-            + "    log('exception'+e);\n"
-            + "  }\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script>\n"
 
             + "</body></html>";

diff --git a/src/test/java/org/htmlunit/javascript/host/css/CSSSelectorTest.java b/src/test/java/org/htmlunit/javascript/host/css/CSSSelectorTest.java
@@ -2124,7 +2124,7 @@ public void escapedId() throws Exception {
 
             + "  log(document.querySelectorAll('#silly\\\\~id')[0].id);\n"
             + "  log(document.querySelectorAll(\"#silly\\\\~id\")[0].id);\n"
-            + "} catch(e) {log('exception ' + e)}\n"
+            + "} catch(e) { logEx(e); }\n"
             + "</script></body></html>";
 
         loadPageVerifyTitle2(html);
@@ -2453,7 +2453,7 @@ public void xmlTagName() throws Exception {
 
             + "    res = de.querySelectorAll('rEsulT');\n"
             + "    log(res.length);\n"
-            + "  } catch(e) {log('exception ' + e)}\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script></body></html>";
 
         loadPageVerifyTitle2(html);
@@ -2507,7 +2507,7 @@ public void xmlAttribute() throws Exception {
             + "    log(res.length);\n"
             + "    log(res[0].innerHTML);\n"
 
-            + "  } catch(e) {log('exception ' + e)}\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script></body></html>";
 
         loadPageVerifyTitle2(html);

diff --git a/src/test/java/org/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java b/src/test/java/org/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java
@@ -3522,7 +3522,7 @@ public void widthAbsolute() throws Exception {
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts("exception true")
+    @Alerts("TypeError")
     public void ctor() throws Exception {
         final String html =
                 "<html>\n"
@@ -3536,9 +3536,7 @@ public void ctor() throws Exception {
                 + "    try {"
                 + "      var c = new CSSStyleDeclaration();\n"
                 + "      log(c);\n"
-                + "    } catch(e) {\n"
-                + "      log('exception ' + (e instanceof TypeError));\n"
-                + "    }\n"
+                + "    } catch(e) { logEx(e); }\n"
                 + "  </script>\n"
                 + "</body></html>";
 
@@ -3573,9 +3571,7 @@ public void item() throws Exception {
             + "  try {\n"
             + "    log(decl.item(-1));\n"
             + "    log(typeof decl.item(-1));\n"
-            + "  } catch(e) {\n"
-            + "    log('exception ');\n"
-            + "  }\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script>\n"
 
             + "</body></html>";

diff --git a/src/test/java/org/htmlunit/javascript/host/css/StyleSheetListTest.java b/src/test/java/org/htmlunit/javascript/host/css/StyleSheetListTest.java
@@ -117,24 +117,15 @@ public void arrayIndexOutOfBoundAccess() throws Exception {
 
             + "        try {\n"
             + "          log(document.styleSheets[0]);\n"
-            + "        }\n"
-            + "        catch(e) {\n"
-            + "          log('exception for 0');\n"
-            + "        }\n"
+            + "        } catch(e) { logEx(e); }\n"
 
             + "        try {\n"
             + "          log(document.styleSheets[46]);\n"
-            + "        }\n"
-            + "        catch(e) {\n"
-            + "          log('exception for 46');\n"
-            + "        }\n"
+            + "        } catch(e) { logEx(e); }\n"
 
             + "        try {\n"
             + "          log(document.styleSheets[-2]);\n"
-            + "        }\n"
-            + "        catch(e) {\n"
-            + "          log('exception for -2');\n"
-            + "        }\n"
+            + "        } catch(e) { logEx(e); }\n"
             + "      }\n"
             + "    </script>\n"
             + "  </head>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/dom/AbstractRangeTest.java b/src/test/java/org/htmlunit/javascript/host/dom/AbstractRangeTest.java
@@ -40,7 +40,7 @@ public void prototype() throws Exception {
             + "  function test() {\n"
             + "    try {\n"
             + "      log(typeof AbstractRange === 'function');\n"
-            + "    } catch(e) { log('exception' + e) }\n"
+            + "    } catch(e) { logEx(e); }\n"
             + "  }\n"
             + "</script></head><body onload='test()'>\n"
             + "</body></html>";

diff --git a/src/test/java/org/htmlunit/javascript/host/dom/Document2Test.java b/src/test/java/org/htmlunit/javascript/host/dom/Document2Test.java
@@ -439,8 +439,8 @@ public void queryCommandEnabled() throws Exception {
             + LOG_TITLE_FUNCTION
             + "function x() {\n"
             + "  var d = window.frames['f'].document;\n"
-            + "  try { log(d.queryCommandEnabled('SelectAll')); } catch(e) { log('error'); }\n"
-            + "  try { log(d.queryCommandEnabled('sElectaLL')); } catch(e) { log('error'); }\n"
+            + "  try { log(d.queryCommandEnabled('SelectAll')); } catch(e) { logEx(e); }\n"
+            + "  try { log(d.queryCommandEnabled('sElectaLL')); } catch(e) { logEx(e); }\n"
             + "}\n"
             + "</script></body></html>";
 

diff --git a/src/test/java/org/htmlunit/javascript/host/dom/DocumentTest.java b/src/test/java/org/htmlunit/javascript/host/dom/DocumentTest.java
@@ -1848,7 +1848,7 @@ public void getElementsByTagNameXml() throws Exception {
 
             + "    res = xmlDoc.getElementsByTagName('rEsulT');\n"
             + "    log(res.length);\n"
-            + "  } catch(e) {log('exception ' + e)}\n"
+            + "  } catch(e) { logEx(e); }\n"
             + "</script></body></html>";
 
         loadPageVerifyTitle2(html);

diff --git a/src/test/java/org/htmlunit/javascript/host/dom/NodeTest.java b/src/test/java/org/htmlunit/javascript/host/dom/NodeTest.java
@@ -582,9 +582,7 @@ public void replaceChild() throws Exception {
             + "      log(parent.innerHTML);\n"
             + "      log(parent.replaceChild(fragment, parent.firstChild).id);\n"
             + "      log(parent.innerHTML);\n"
-            + "    } catch(e) {\n"
-            + "      log('exception thrown');\n"
-            + "    }\n"
+            + "    } catch(e) { logEx(e); }\n"
             + "  }\n"
             + "</script></head><body onload='test()'>\n"
             + "  <div id='myDiv'><div id='myDiv2'></div><div id='myDiv3'></div></div>\n"
@@ -612,9 +610,7 @@ public void replaceChild_EmptyDocumentFragment() throws Exception {
             + "      log(parent.innerHTML);\n"
             + "      log(parent.replaceChild(fragment, parent.firstChild).id);\n"
             + "      log(parent.innerHTML);\n"
-            + "    } catch(e) {\n"
-            + "      log('exception thrown');\n"
-            + "    }\n"
+            + "    } catch(e) { logEx(e); }\n"
             + "  }\n"
             + "</script></head><body onload='test()'>\n"
             + "  <div id='myDiv'><div id='myDiv2'></div><div id='myDiv3'></div></div>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/dom/XPathResultTest.java b/src/test/java/org/htmlunit/javascript/host/dom/XPathResultTest.java
@@ -35,7 +35,7 @@ public class XPathResultTest extends WebDriverTestCase {
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts({"function", "error"})
+    @Alerts({"function", "TypeError"})
     public void ctor() throws Exception {
         final String html
             = "<html>\n"
@@ -52,7 +52,7 @@ public void ctor() throws Exception {
             + "      try {\n"
             + "        log(typeof XPathResult);\n"
             + "        new XPathResult();\n"
-            + "      } catch(e) { log('error'); }\n"
+            + "      } catch(e) { logEx(e); }\n"
             + "    }\n"
             + "  </script>\n"
             + "</head>\n"

diff --git a/src/test/java/org/htmlunit/javascript/host/event/EventTest.java b/src/test/java/org/htmlunit/javascript/host/event/EventTest.java
@@ -462,9 +462,7 @@ public void addEventListener_HandlerNull() throws Exception {
             + LOG_TITLE_FUNCTION
             + "try {\n"
             + "  window.addEventListener('mousedown', null, true);\n"
-            + "} catch (err) {\n"
-            + "  log('error');\n"
-            + "}\n"
+            + "} catch(e) { logEx(e); }\n"
             + "</script>\n"
             + "</body></html>";
         loadPageVerifyTitle2(content);

diff --git a/src/test/java/org/htmlunit/javascript/host/event/HashChangeEventTest.java b/src/test/java/org/htmlunit/javascript/host/event/HashChangeEventTest.java
@@ -131,15 +131,15 @@ public void initHashChangeEvent() throws Exception {
             + "    try {\n"
             + "      var event = document.createEvent('HashChangeEvent');\n"
             + "      log(event);\n"
-            + "    } catch(e) { log('exception createEvent'); return; }\n"
+            + "    } catch(e) { log('exception createEvent'); logEx(e); return; }\n"
 
             + "    if (!event.initHashChangeEvent) {log('missing initHashChangeEvent'); return;}\n"
 
             + "    try {\n"
             + "      event.initHashChangeEvent('hashchange', true, false, '" + URL_FIRST + "', '"
             + URL_FIRST + "#1');\n"
             + "      dump(event);\n"
-            + "    } catch(e) { log('exception initHashChangeEvent') }\n"
+            + "    } catch(e) { log('exception initHashChangeEvent'); logEx(e); }\n"
             + "  }\n"
             + DUMP_EVENT_FUNCTION
             + "</script></head><body onload='test()'>\n"