stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8006412: Improve toString method of ScriptObjectMirror class

Browse Source 
Reviewed-by: jlaskey, lagergren
This commit is contained in:
Athijegannathan Sundararajan 2013-01-16 17:58:51 +05:30
parent c6c424f27a
commit d35ae9ab05
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
View File

@ -38,6 +38,7 @@ import java.util.concurrent.Callable;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptRuntime;
import netscape.javascript.JSObject;
/**
@ -67,6 +68,16 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
return sobj.hashCode();
}
@Override
public String toString() {
return inGlobal(new Callable<String>() {
@Override
public String call() {
return ScriptRuntime.safeToString(sobj);
}
});
}
private <V> V inGlobal(final Callable<V> callable) {
final ScriptObject oldGlobal = Context.getGlobal();
final boolean globalChanged = (oldGlobal != global);

22
nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
View File

@ -46,6 +46,7 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import jdk.nashorn.internal.runtime.Version;
import netscape.javascript.JSObject;
import org.testng.Assert;
import org.testng.TestNG;
import org.testng.annotations.Test;
@ -859,4 +860,25 @@ public class ScriptEngineTest {
fail(t.getMessage());
}
}
@Test
public void scriptObjectMirrorToStringTest() {
final ScriptEngineManager m = new ScriptEngineManager();
final ScriptEngine e = m.getEngineByName("nashorn");
try {
Object obj = e.eval("new TypeError('wrong type')");
Assert.assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
} catch (final Throwable t) {
t.printStackTrace();
fail(t.getMessage());
}
try {
Object obj = e.eval("function func() { print('hello'); }");
Assert.assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
} catch (final Throwable t) {
t.printStackTrace();
fail(t.getMessage());
}
}
}