[HtmlUnit] SVN: [14539] trunk/htmlunit/src

[<asa...@us...>]

Revision: 14539
          http://sourceforge.net/p/htmlunit/code/14539
Author:   asashour
Date:     2017-06-03 10:19:31 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
Fix exception type

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-06-03 09:29:49 UTC (rev 14538)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2017-06-03 10:19:31 UTC (rev 14539)
@@ -75,6 +75,7 @@
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.Function;
 import net.sourceforge.htmlunit.corejs.javascript.FunctionObject;
+import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
 import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
 
 /**
@@ -2008,7 +2009,8 @@
             return domNode != null && ((DomElement) domNode).matches(selectorString);
         }
         catch (final CSSException e) {
-            throw Context.reportRuntimeError("An invalid or illegal selector was specified (selector: '"
+            throw ScriptRuntime.constructError("SyntaxError",
+                    "An invalid or illegal selector was specified (selector: '"
                     + selectorString + "' error: " + e.getMessage() + ").");
         }
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java	2017-06-03 09:29:49 UTC (rev 14538)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java	2017-06-03 10:19:31 UTC (rev 14539)
@@ -1305,7 +1305,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"exception", "done"},
+    @Alerts(DEFAULT = {"SyntaxError", "done"},
             IE = "done")
     public void matchesInvalidSelector() throws Exception {
         final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
@@ -1319,7 +1319,7 @@
             + "          alert(birds[i].textContent);\n"
             + "        }\n"
             + "      }\n"
-            + "    } catch (e) { alert('exception'); }\n"
+            + "    } catch (e) { alert(e.name); }\n"
             + "    alert('done');\n"
             + "  }\n"
             + "</script>\n"
@@ -1332,4 +1332,5 @@
 
         loadPageWithAlerts2(html);
     }
+
 }