scope handling fix (wip)

rbri · rbri · commit 8216672446ce · 2026-04-16T16:10:46.000+02:00
diff --git a/src/main/java/org/htmlunit/javascript/host/dom/XPathEvaluator.java b/src/main/java/org/htmlunit/javascript/host/dom/XPathEvaluator.java
@@ -18,7 +18,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.NativeFunction;
 import org.htmlunit.corejs.javascript.Scriptable;
-import org.htmlunit.corejs.javascript.TopLevel;
+import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
@@ -141,7 +141,7 @@ else if (resolver instanceof NativeFunction nativeFunction) {
 
         try {
             final String xpath = JavaScriptEngine.toString(args[0]);
-            final Window window = (Window) ((TopLevel) scope).getGlobalThis();
+            final Window window = (Window) (ScriptableObject.getTopLevelScope(scope)).getGlobalThis();
             final DomNode doc = window.getDocument().getDocumentElement().getDomNodeOrDie();
             final XPathExpression xPathExpression  = new XPathExpression(xpath, prefixResolver, doc);
             xPathExpression.setParentScope(evaluator.getParentScope());
diff --git a/src/test/java/org/htmlunit/javascript/host/dom/XPathEvaluatorTest.java b/src/test/java/org/htmlunit/javascript/host/dom/XPathEvaluatorTest.java
@@ -27,6 +27,38 @@
  */
 public class XPathEvaluatorTest extends WebDriverTestCase {
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts({"function", "[object XPathEvaluator]", "[object HTMLHtmlElement]", "first", "second", ""})
+    public void ctor() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><body>\n"
+            + "<span id='first'>hello</span>\n"
+            + "<div><span id='second'>world</span></div>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION
+            + "var res = '';\n"
+            + "try {\n"
+            + "  res += typeof window.XPathEvaluator + '§';\n"
+            + "  var xpe = new XPathEvaluator();\n"
+            + "  res += xpe + '§';\n"
+            + "  var nsResolver = xpe.createNSResolver(document.documentElement);\n"
+            + "  res += nsResolver + '§';\n"
+            + "  var result = xpe.evaluate('//span', document.body, nsResolver, 0, null);\n"
+            + "  var found = [];\n"
+            + "  var next;\n"
+            + "  while (next = result.iterateNext()) {\n"
+            + "    res += next.id + '§';\n"
+            + "  }\n"
+            + "} catch(e) { res += 'exception' + '§'; }\n"
+            + "log(res);\n"
+            + "</script></body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * @throws Exception if the test fails
      */
@@ -236,6 +268,27 @@ public void namespacesWithCustomNSResolver() throws Exception {
         loadPageVerifyTitle2(html);
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts("[object XPathExpression]")
+    public void createExpression() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><body>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION
+            + "var res = '';\n"
+            + "try {\n"
+            + "  var expression = new XPathEvaluator().createExpression('//span');\n"
+            + "  res += expression;\n"
+            + "} catch(e) { res += e.name; }\n"
+            + "log(res);\n"
+            + "</script></body></html>";
+
+        loadPageVerifyTitle2(html);
+    }
+
     /**
      * @throws Exception if the test fails
      */
