8246113: re-visit javax/script test that still requires jdk.scripting.nashorn module
Reviewed-by: jlaskey
This commit is contained in:
parent
023c53d190
commit
2f989d273d
@ -1,80 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6474943 6705893
|
||||
* @summary Test that script engine exception messages are
|
||||
* available from ScriptException.
|
||||
* @modules jdk.scripting.nashorn
|
||||
*/
|
||||
|
||||
import javax.script.Compilable;
|
||||
import javax.script.CompiledScript;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
import javax.script.ScriptException;
|
||||
|
||||
public class ExceptionTest {
|
||||
private static final String ERROR_MSG = "error from JavaScript";
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
ScriptEngineManager m = new ScriptEngineManager();
|
||||
ScriptEngine engine = Helper.getJsEngine(m);
|
||||
if (engine == null) {
|
||||
System.out.println("Warning: No js engine found; test vacuously passes.");
|
||||
return;
|
||||
}
|
||||
engine.put("msg", ERROR_MSG);
|
||||
try {
|
||||
engine.eval("throw new Error(msg);");
|
||||
} catch (ScriptException exp) {
|
||||
if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
|
||||
throw exp;
|
||||
}
|
||||
}
|
||||
try {
|
||||
engine.eval("throw (msg);");
|
||||
} catch (ScriptException exp) {
|
||||
if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
|
||||
throw exp;
|
||||
}
|
||||
}
|
||||
try {
|
||||
CompiledScript scr = ((Compilable)engine).compile("throw new Error(msg);");
|
||||
scr.eval();
|
||||
} catch (ScriptException exp) {
|
||||
if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
|
||||
throw exp;
|
||||
}
|
||||
}
|
||||
try {
|
||||
CompiledScript scr = ((Compilable)engine).compile("throw msg;");
|
||||
scr.eval();
|
||||
} catch (ScriptException exp) {
|
||||
if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
|
||||
throw exp;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,72 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6346733 6705893
|
||||
* @summary Verify that independent Bindings instances don't
|
||||
* get affected by default scope assignments. Also, verify
|
||||
* that script globals can be created and accessed from Java
|
||||
* as well as JavaScript.
|
||||
* @modules jdk.scripting.nashorn
|
||||
*/
|
||||
|
||||
import javax.script.Bindings;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
|
||||
|
||||
public class JavaScriptScopeTest {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
ScriptEngineManager manager = new ScriptEngineManager();
|
||||
ScriptEngine jsengine = Helper.getJsEngine(manager);
|
||||
if (jsengine == null) {
|
||||
System.out.println("Warning: No js engine found; test vacuously passes.");
|
||||
return;
|
||||
}
|
||||
jsengine.eval("var v = 'hello';");
|
||||
// Create a new scope
|
||||
Bindings b = jsengine.createBindings();
|
||||
// b is newly created scope. We don't expect 'v' there.
|
||||
// we expect b to be empty...
|
||||
if (b.keySet().size() != 0) {
|
||||
throw new RuntimeException("no variables expected in new scope");
|
||||
}
|
||||
|
||||
// verify that we can create new variable from Java
|
||||
jsengine.put("fromJava", "hello world");
|
||||
// below should execute without problems..
|
||||
jsengine.eval(" if (fromJava != 'hello world') throw 'unexpected'");
|
||||
|
||||
// verify that script globals are exposed to Java
|
||||
// we have created 'v' and 'fromJava' already.
|
||||
if (! jsengine.get("v").equals("hello")) {
|
||||
throw new RuntimeException("unexpected value of 'v'");
|
||||
}
|
||||
|
||||
if (! jsengine.get("fromJava").equals("hello world")) {
|
||||
throw new RuntimeException("unexpected value of 'fromJava'");
|
||||
}
|
||||
}
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6346732 6705893
|
||||
* @summary should be able to assign null and undefined
|
||||
* value to JavaScript global variables.
|
||||
* @modules jdk.scripting.nashorn
|
||||
*/
|
||||
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
|
||||
public class NullUndefinedVarTest {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
ScriptEngineManager manager = new ScriptEngineManager();
|
||||
ScriptEngine jsengine = Helper.getJsEngine(manager);
|
||||
if (jsengine == null) {
|
||||
System.out.println("Warning: No js engine found; test vacuously passes.");
|
||||
return;
|
||||
}
|
||||
jsengine.eval("var n = null; " +
|
||||
"if (n !== null) throw 'expecting null';" +
|
||||
"var u = undefined; " +
|
||||
"if (u !== undefined) throw 'undefined expected';");
|
||||
}
|
||||
}
|
@ -1,50 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6398614 6705893
|
||||
* @summary Create a user defined ScriptContext and check
|
||||
* that script can access variables from non-standard scopes
|
||||
* @modules jdk.scripting.nashorn
|
||||
*/
|
||||
|
||||
import javax.script.ScriptContext;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
|
||||
public class PluggableContextTest {
|
||||
public static void main(String[] args) throws Exception {
|
||||
ScriptEngineManager m = new ScriptEngineManager();
|
||||
ScriptContext ctx = new MyContext();
|
||||
ctx.setAttribute("x", "hello", MyContext.APP_SCOPE);
|
||||
ScriptEngine e = Helper.getJsEngine(m);
|
||||
if (e == null) {
|
||||
System.out.println("Warning: No js engine found; test vacuously passes.");
|
||||
return;
|
||||
}
|
||||
// the following reference to 'x' throws exception
|
||||
// if APP_SCOPE is not searched.
|
||||
e.eval("x", ctx);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user