Fix hasOwnProperty on NativeJavaObject

This failed since #1157 with "TypeError: Expected argument of type object, but instead had type object"
mozilla · Aug 17, 2022 · bec677b · bec677b
1 parent 0497ce6
commit bec677b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/org/mozilla/javascript/AbstractEcmaObjectOperations.java b/src/org/mozilla/javascript/AbstractEcmaObjectOperations.java
@@ -34,7 +34,7 @@ enum INTEGRITY_LEVEL {
      * @see <a href="https://262.ecma-international.org/12.0/#sec-hasownproperty"></a>
      */
     static boolean hasOwnProperty(Context cx, Object o, Object property) {
-        ScriptableObject obj = ScriptableObject.ensureScriptableObject(o);
+        Scriptable obj = ScriptableObject.ensureScriptable(o);
         boolean result;
         if (property instanceof Symbol) {
             result = ScriptableObject.ensureSymbolScriptable(o).has((Symbol) property, obj);

diff --git a/testsrc/org/mozilla/javascript/tests/NativeObjectTest.java b/testsrc/org/mozilla/javascript/tests/NativeObjectTest.java
@@ -4,10 +4,13 @@
 
 package org.mozilla.javascript.tests;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
 
 public class NativeObjectTest {
 
@@ -83,4 +86,22 @@ public void getOwnPropertyDescriptorAttributes_captureStackTrace() throws Except
         Assert.assertEquals("true true false", result);
         Context.exit();
     }
+
+    public static class JavaObj{
+    	public String name = "test";
+    }
+
+    @Test
+	public void testNativeJavaObject_hasOwnProperty() {
+		Context cx = Context.enter();
+		try {
+			Scriptable scope = cx.initStandardObjects();
+			ScriptableObject.putProperty(scope, "javaObj", Context.javaToJS(new JavaObj(), scope));
+			Object result = cx.evaluateString(scope, "Object.prototype.hasOwnProperty.call(javaObj, \"name\");", "", 1,
+					null);
+			assertTrue((Boolean) result);
+		} finally {
+			Context.exit();
+		}
+    }
 }