-
Notifications
You must be signed in to change notification settings - Fork 829
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
When InterfaceAdapter is used, the wrong thisObj is used #1453
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
package org.mozilla.javascript.tests; | ||
|
||
import org.junit.After; | ||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
import org.mozilla.javascript.Context; | ||
import org.mozilla.javascript.Scriptable; | ||
|
||
public class JavaAdapterInvokeTest { | ||
Context cx = null; | ||
Scriptable topScope = null; | ||
|
||
@Before | ||
public void enterContext() { | ||
cx = Context.enter(); | ||
cx.setOptimizationLevel(-1); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dunno what our policy is, but should this test not also be run in non-interpreted mode? |
||
topScope = cx.initStandardObjects(); | ||
} | ||
|
||
@After | ||
public void exitContext() { | ||
Context.exit(); | ||
} | ||
|
||
public interface AdapterInterface { | ||
int m1(int i); | ||
|
||
int m2(); | ||
} | ||
|
||
public static class AdapterClass { | ||
private AdapterInterface adapter; | ||
|
||
public AdapterClass(AdapterInterface adapter) { | ||
this.adapter = adapter; | ||
} | ||
|
||
public int doIt(int i) { | ||
return this.adapter.m1(i) + this.adapter.m2(); | ||
} | ||
} | ||
|
||
@Test | ||
public void testInvoke() throws NoSuchMethodException { | ||
String testCode = | ||
"'use strict'\n" | ||
+ "var impl = {" | ||
+ " m1: function(i) { return i + 1 },\n" | ||
+ " m2: function() { return 7 }\n" | ||
+ "}\n" | ||
+ "adapter = new Packages." | ||
+ AdapterClass.class.getName() | ||
+ "(impl)\n" | ||
+ "adapter.doIt(42)"; | ||
|
||
Number result = (Number) cx.evaluateString(topScope, testCode, "", 1, null); | ||
Assert.assertEquals(50, result.intValue()); | ||
} | ||
|
||
@Test | ||
public void testInvokeWithPrototype() throws NoSuchMethodException { | ||
String testCode = | ||
"'use strict'\n" | ||
+ "function Obj() {}\n" | ||
+ "Obj.prototype.m1 = function(i) { return i + 1 }\n" | ||
+ "Obj.prototype.m2 = function() { return 7 }\n" | ||
+ "var impl = new Obj()\n" | ||
+ "adapter = new Packages." | ||
+ AdapterClass.class.getName() | ||
+ "(impl)\n" | ||
+ "adapter.doIt(42)"; | ||
|
||
Number result = (Number) cx.evaluateString(topScope, testCode, "", 1, null); | ||
Assert.assertEquals(50, result.intValue()); | ||
} | ||
|
||
@Test | ||
public void testInvokeWithPrototypeAndCtor() throws NoSuchMethodException { | ||
String testCode = | ||
"'use strict'\n" | ||
+ "function Obj() { this.myObj = {one: 1} }\n" | ||
+ "Obj.prototype.m1 = function(i) { return i + this.myObj.one }\n" | ||
+ "Obj.prototype.m2 = function() { return 7 }\n" | ||
+ "var impl = new Obj()\n" | ||
+ "adapter = new Packages." | ||
+ AdapterClass.class.getName() | ||
+ "(impl)\n" | ||
+ "adapter.doIt(42)"; | ||
|
||
Number result = (Number) cx.evaluateString(topScope, testCode, "", 1, null); | ||
Assert.assertEquals(50, result.intValue()); | ||
} | ||
|
||
@Test | ||
public void testInvokeJsOnly() throws NoSuchMethodException { | ||
String testCode = | ||
"'use strict'\n" | ||
+ "function Obj() { this.myObj = {one: 1} }\n" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What about a testcase where .myObj is added on the prototype, instead of the |
||
+ "Obj.prototype.m1 = function(i) { return i + this.myObj.one }\n" | ||
+ "Obj.prototype.m2 = function() { return 7 }\n" | ||
+ "function Adapter(adapter) { this.adapter = adapter }\n" | ||
+ "Adapter.prototype.doIt = function(i) { return this.adapter.m1(i) + this.adapter.m2() }\n" | ||
+ "var impl = new Obj()\n" | ||
+ "adapter = new Adapter(impl)\n" | ||
+ "adapter.doIt(42)"; | ||
|
||
Number result = (Number) cx.evaluateString(topScope, testCode, "", 1, null); | ||
Assert.assertEquals(50, result.intValue()); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thisObject
is an instance ofJavaAdapterInvokeTest.AdapterClass
and we want to call a method ontarget