moveBefore() simplified and the implementation moved to the correct place

Author: rbri

src/main/java/org/htmlunit/javascript/host/Element.java

@@ -838,47 +838,7 @@ public void insertAdjacentHTML(final String position, final String text) {
     @JsxFunction({CHROME, EDGE, FF})
     public static void moveBefore(final Context context, final Scriptable scope,
             final Scriptable thisObj, final Object[] args, final Function function) {
-        ((HTMLElement) thisObj).moveBeforeImpl(args);
-    }
-
-    /**
-     * Add a DOM node as a child to this node before the referenced node.
-     * If the referenced node is null, append to the end.
-     * @param args the arguments
-     * @throws DOMException in case of problems
-     */
-    protected void moveBeforeImpl(final Object[] args) throws org.w3c.dom.DOMException {
-        if (args.length < 2) {
-            throw JavaScriptEngine.typeError(
-                    "Failed to execute 'moveBefore' on 'Element': 2 arguments required, but only 0 present.");
-        }
-
-        final Object movedNodeObject = args[0];
-        if (!(movedNodeObject instanceof Node)) {
-            throw JavaScriptEngine.typeError(
-                    "Failed to execute 'moveBefore' on 'Element': parameter 1 is not of type 'Node'.");
-        }
-        final Object referenceNodeObject = args[1];
-        if (referenceNodeObject != null && !(referenceNodeObject instanceof Node)) {
-            throw JavaScriptEngine.typeError(
-                    "Failed to execute 'moveBefore' on 'Element': parameter 2 is not of type 'Node'.");
-        }
-
-        try {
-            if (referenceNodeObject == null) {
-                getDomNodeOrDie().moveBefore(((Node) movedNodeObject).getDomNodeOrDie(), null);
-                return;
-            }
-
-            getDomNodeOrDie().moveBefore(
-                    ((Node) movedNodeObject).getDomNodeOrDie(), ((Node) referenceNodeObject).getDomNodeOrDie());
-        }
-        catch (final org.w3c.dom.DOMException e) {
-            throw JavaScriptEngine.asJavaScriptException(
-                    getWindow(),
-                    "Failed to execute 'moveChild' on '" + this + ": " + e.getMessage(),
-                    e.code);
-        }
+        Node.moveBefore(context, scope, thisObj, args, function);
     }
 
     /**

src/main/java/org/htmlunit/javascript/host/dom/DocumentFragment.java

@@ -14,6 +14,10 @@
  */
 package org.htmlunit.javascript.host.dom;
 
+import static org.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
+import static org.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
+import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
+
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Scriptable;
@@ -101,6 +105,21 @@ public static void replaceChildren(final Context context, final Scriptable scope
         Node.replaceChildren(context, thisObj, args, function);
     }
 
+    /**
+     * Moves a given Node inside the invoking node as a direct child, before a given reference node.
+     *
+     * @param context the JavaScript context
+     * @param scope the scope
+     * @param thisObj the scriptable
+     * @param args the arguments passed into the method
+     * @param function the function
+     */
+    @JsxFunction({CHROME, EDGE, FF})
+    public static void moveBefore(final Context context, final Scriptable scope,
+            final Scriptable thisObj, final Object[] args, final Function function) {
+        Node.moveBefore(context, scope, thisObj, args, function);
+    }
+
     /**
      * Retrieves all element nodes from descendants of the starting element node that match any selector
      * within the supplied selector strings.

src/main/java/org/htmlunit/javascript/host/dom/Node.java

@@ -471,6 +471,51 @@ public Node replaceChild(final Object newChildObject, final Object oldChildObjec
         return null;
     }
 
+    /**
+     * Moves a given Node inside the invoking node as a direct child, before a given reference node.
+     *
+     * @param context the JavaScript context
+     * @param scope the scope
+     * @param thisObj the scriptable
+     * @param args the arguments passed into the method
+     * @param function the function
+     */
+    public static void moveBefore(final Context context, final Scriptable scope,
+            final Scriptable thisObj, final Object[] args, final Function function) {
+        if (args.length < 2) {
+            throw JavaScriptEngine.typeError(
+                    "Failed to execute 'moveBefore' on 'Element': 2 arguments required, but only 0 present.");
+        }
+
+        final Object movedNodeObject = args[0];
+        if (!(movedNodeObject instanceof Node)) {
+            throw JavaScriptEngine.typeError(
+                    "Failed to execute 'moveBefore' on 'Element': parameter 1 is not of type 'Node'.");
+        }
+        final Object referenceNodeObject = args[1];
+        if (referenceNodeObject != null && !(referenceNodeObject instanceof Node)) {
+            throw JavaScriptEngine.typeError(
+                    "Failed to execute 'moveBefore' on 'Element': parameter 2 is not of type 'Node'.");
+        }
+
+        final Node node = (Node) thisObj;
+        try {
+            if (referenceNodeObject == null) {
+                node.getDomNodeOrDie().moveBefore(((Node) movedNodeObject).getDomNodeOrDie(), null);
+                return;
+            }
+
+            node.getDomNodeOrDie().moveBefore(
+                    ((Node) movedNodeObject).getDomNodeOrDie(), ((Node) referenceNodeObject).getDomNodeOrDie());
+        }
+        catch (final org.w3c.dom.DOMException e) {
+            throw JavaScriptEngine.asJavaScriptException(
+                    node.getWindow(),
+                    "Failed to execute 'moveChild' on '" + node + ": " + e.getMessage(),
+                    e.code);
+        }
+    }
+
     /**
      * Clones this node.
      * @param deep if {@code true}, recursively clones all descendants

src/main/java/org/htmlunit/javascript/host/html/HTMLDocument.java

@@ -15,6 +15,8 @@
 package org.htmlunit.javascript.host.html;
 
 import static org.htmlunit.BrowserVersionFeatures.HTMLDOCUMENT_ELEMENTS_BY_NAME_EMPTY;
+import static org.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
+import static org.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
 import static org.htmlunit.javascript.configuration.SupportedBrowser.FF_ESR;
 
@@ -160,6 +162,21 @@ private static String concatArgsAsString(final Object[] args) {
         return builder.toString();
     }
 
+    /**
+     * Moves a given Node inside the invoking node as a direct child, before a given reference node.
+     *
+     * @param context the JavaScript context
+     * @param scope the scope
+     * @param thisObj the scriptable
+     * @param args the arguments passed into the method
+     * @param function the function
+     */
+    @JsxFunction({CHROME, EDGE, FF})
+    public static void moveBefore(final Context context, final Scriptable scope,
+            final Scriptable thisObj, final Object[] args, final Function function) {
+        Node.moveBefore(context, scope, thisObj, args, function);
+    }
+
     /**
      * JavaScript function "writeln" may accept a variable number of arguments.
      * @param context the JavaScript context

src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java

@@ -629,7 +629,8 @@ public void htmlElement() throws Exception {
                 + "getAttributeNodeNS(),getAttributeNS(),getBoundingClientRect(),getClientRects(),"
                 + "getElementsByClassName(),getElementsByTagName(),getElementsByTagNameNS(),getHTML(),"
                 + "hasAttribute(),hasAttributeNS(),hasAttributes(),id[GSCE],innerHTML[GSCE],insertAdjacentElement(),"
-                + "insertAdjacentHTML(),insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),"
+                + "insertAdjacentHTML(),insertAdjacentText(),lastElementChild[GCE],localName[GCE],"
+                + "matches(),moveBefore(),"
                 + "namespaceURI[GCE],nextElementSibling[GCE],onbeforecopy[GSCE],onbeforecut[GSCE],onbeforepaste[GSCE],"
                 + "onsearch[GSCE],onwebkitfullscreenchange[GSCE],onwebkitfullscreenerror[GSCE],outerHTML[GSCE],"
                 + "prefix[GCE],prepend(),previousElementSibling[GCE],querySelector(),querySelectorAll(),remove(),"
@@ -644,7 +645,8 @@ public void htmlElement() throws Exception {
                 + "getAttributeNodeNS(),getAttributeNS(),getBoundingClientRect(),getClientRects(),"
                 + "getElementsByClassName(),getElementsByTagName(),getElementsByTagNameNS(),getHTML(),"
                 + "hasAttribute(),hasAttributeNS(),hasAttributes(),id[GSCE],innerHTML[GSCE],insertAdjacentElement(),"
-                + "insertAdjacentHTML(),insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),"
+                + "insertAdjacentHTML(),insertAdjacentText(),lastElementChild[GCE],localName[GCE],"
+                + "matches(),moveBefore(),"
                 + "namespaceURI[GCE],nextElementSibling[GCE],onbeforecopy[GSCE],onbeforecut[GSCE],onbeforepaste[GSCE],"
                 + "onsearch[GSCE],onwebkitfullscreenchange[GSCE],onwebkitfullscreenerror[GSCE],outerHTML[GSCE],"
                 + "prefix[GCE],prepend(),previousElementSibling[GCE],querySelector(),querySelectorAll(),remove(),"
@@ -660,7 +662,8 @@ public void htmlElement() throws Exception {
                 + "getElementsByTagName(),getElementsByTagNameNS(),"
                 + "getHTML(),hasAttribute(),hasAttributeNS(),hasAttributes(),"
                 + "id[GSCE],innerHTML[GSCE],insertAdjacentElement(),insertAdjacentHTML(),insertAdjacentText(),"
-                + "lastElementChild[GCE],localName[GCE],matches(),mozMatchesSelector(),namespaceURI[GCE],"
+                + "lastElementChild[GCE],localName[GCE],matches(),moveBefore(),"
+                + "mozMatchesSelector(),namespaceURI[GCE],"
                 + "nextElementSibling[GCE],outerHTML[GSCE],prefix[GCE],prepend(),previousElementSibling[GCE],"
                 + "querySelector(),querySelectorAll(),releaseCapture(),remove(),removeAttribute(),"
                 + "removeAttributeNode(),removeAttributeNS(),replaceChildren(),replaceWith(),"
@@ -827,7 +830,7 @@ public void element() throws Exception {
                 + "getElementsByTagName(),getElementsByTagNameNS(),getHTML(),"
                 + "hasAttribute(),hasAttributeNS(),"
                 + "hasAttributes(),id[GSCE],innerHTML[GSCE],insertAdjacentElement(),insertAdjacentHTML(),"
-                + "insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),namespaceURI[GCE],"
+                + "insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),moveBefore(),namespaceURI[GCE],"
                 + "nextElementSibling[GCE],onbeforecopy[GSCE],onbeforecut[GSCE],onbeforepaste[GSCE],onsearch[GSCE],"
                 + "onwebkitfullscreenchange[GSCE],onwebkitfullscreenerror[GSCE],outerHTML[GSCE],prefix[GCE],prepend(),"
                 + "previousElementSibling[GCE],querySelector(),querySelectorAll(),remove(),removeAttribute(),"
@@ -845,7 +848,7 @@ public void element() throws Exception {
                 + "getElementsByTagName(),getElementsByTagNameNS(),getHTML(),"
                 + "hasAttribute(),hasAttributeNS(),"
                 + "hasAttributes(),id[GSCE],innerHTML[GSCE],insertAdjacentElement(),insertAdjacentHTML(),"
-                + "insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),namespaceURI[GCE],"
+                + "insertAdjacentText(),lastElementChild[GCE],localName[GCE],matches(),moveBefore(),namespaceURI[GCE],"
                 + "nextElementSibling[GCE],onbeforecopy[GSCE],onbeforecut[GSCE],onbeforepaste[GSCE],onsearch[GSCE],"
                 + "onwebkitfullscreenchange[GSCE],onwebkitfullscreenerror[GSCE],outerHTML[GSCE],prefix[GCE],prepend(),"
                 + "previousElementSibling[GCE],querySelector(),querySelectorAll(),remove(),removeAttribute(),"
@@ -863,7 +866,8 @@ public void element() throws Exception {
                 + "getElementsByTagName(),getElementsByTagNameNS(),getHTML(),hasAttribute(),hasAttributeNS(),"
                 + "hasAttributes(),id[GSCE],innerHTML[GSCE],insertAdjacentElement(),insertAdjacentHTML(),"
                 + "insertAdjacentText(),lastElementChild[GCE],localName[GCE],"
-                + "matches(),mozMatchesSelector(),namespaceURI[GCE],"
+                + "matches(),moveBefore(),"
+                + "mozMatchesSelector(),namespaceURI[GCE],"
                 + "nextElementSibling[GCE],outerHTML[GSCE],prefix[GCE],prepend(),"
                 + "previousElementSibling[GCE],querySelector(),querySelectorAll(),releaseCapture(),"
                 + "remove(),removeAttribute(),"
@@ -15494,12 +15498,12 @@ public void document() throws Exception {
             FF = "constructor()",
             FF_ESR = "constructor()")
     @HtmlUnitNYI(CHROME = "constructor(),dispatchEvent(),documentElement[GCE],getElementById(),"
-                + "open(),write(),writeln()",
+                + "moveBefore(),open(),write(),writeln()",
             EDGE = "constructor(),dispatchEvent(),documentElement[GCE],getElementById(),"
-                + "open(),write(),writeln()",
-            FF_ESR = "close(),constructor(),dispatchEvent(),documentElement[GCE],getElementById(),"
-                + "open(),write(),writeln()",
+                + "moveBefore(),open(),write(),writeln()",
             FF = "close(),constructor(),dispatchEvent(),documentElement[GCE],getElementById(),"
+                + "moveBefore(),open(),write(),writeln()",
+            FF_ESR = "close(),constructor(),dispatchEvent(),documentElement[GCE],getElementById(),"
                 + "open(),write(),writeln()")
     public void htmlDocument() throws Exception {
         testString("", "document");
@@ -15786,13 +15790,13 @@ public void range() throws Exception {
                 + "getElementById(),lastElementChild[GCE],prepend(),querySelector(),querySelectorAll(),"
                 + "replaceChildren()")
     @HtmlUnitNYI(CHROME = "append(),childElementCount[GCE],children[GCE],constructor(),firstElementChild[GCE],"
-                + "getElementById(),lastElementChild[GCE],prepend(),querySelector(),querySelectorAll(),"
+                + "getElementById(),lastElementChild[GCE],moveBefore(),prepend(),querySelector(),querySelectorAll(),"
                 + "replaceChildren()",
             EDGE = "append(),childElementCount[GCE],children[GCE],constructor(),firstElementChild[GCE],"
-                + "getElementById(),lastElementChild[GCE],prepend(),querySelector(),querySelectorAll(),"
+                + "getElementById(),lastElementChild[GCE],moveBefore(),prepend(),querySelector(),querySelectorAll(),"
                 + "replaceChildren()",
             FF = "append(),childElementCount[GCE],children[GCE],constructor(),firstElementChild[GCE],"
-                + "getElementById(),lastElementChild[GCE],prepend(),querySelector(),querySelectorAll(),"
+                + "getElementById(),lastElementChild[GCE],moveBefore(),prepend(),querySelector(),querySelectorAll(),"
                 + "replaceChildren()")
     public void documentFragment() throws Exception {
         testString("", "document.createDocumentFragment()");