Mercurial > jdk8-mips64-public > nashorn / file diff

     1.1 --- a/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Sat Mar 09 21:49:32 2013 +0530
     1.2 +++ b/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Tue Mar 12 18:12:42 2013 +0530
     1.3 @@ -47,7 +47,6 @@
     1.4  import javax.script.ScriptEngineManager;
     1.5  import javax.script.ScriptException;
     1.6  import javax.script.SimpleScriptContext;
     1.7 -import jdk.nashorn.internal.runtime.Version;
     1.8  import netscape.javascript.JSObject;
     1.9  import org.testng.Assert;
    1.10  import org.testng.annotations.Test;
    1.11 @@ -129,7 +128,6 @@
    1.12          assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
    1.13          assertEquals(fac.getLanguageVersion(), "ECMA - 262 Edition 5.1");
    1.14          assertEquals(fac.getEngineName(), "Oracle Nashorn");
    1.15 -        assertEquals(fac.getEngineVersion(), Version.version());
    1.16          assertEquals(fac.getOutputStatement("context"), "print(context)");
    1.17          assertEquals(fac.getProgram("print('hello')", "print('world')"), "print('hello');print('world');");
    1.18          assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
    1.19 @@ -313,27 +311,6 @@
    1.20          }
    1.21      }
    1.22  
    1.23 -    public static void alert(final Object msg) {
    1.24 -        System.out.println(msg);
    1.25 -    }
    1.26 -
    1.27 -    @Test
    1.28 -    public void exposeMethodTest() {
    1.29 -        final ScriptEngineManager m = new ScriptEngineManager();
    1.30 -        final ScriptEngine e = m.getEngineByName("nashorn");
    1.31 -
    1.32 -        try {
    1.33 -            final Method alert = ScriptEngineTest.class.getMethod("alert", Object.class);
    1.34 -            // expose a Method object as global var.
    1.35 -            e.put("alert", alert);
    1.36 -            // call the global var.
    1.37 -            e.eval("alert.invoke(null, 'alert! alert!!')");
    1.38 -        } catch (final NoSuchMethodException | SecurityException | ScriptException exp) {
    1.39 -            exp.printStackTrace();
    1.40 -            fail(exp.getMessage());
    1.41 -        }
    1.42 -    }
    1.43 -
    1.44      @Test
    1.45      public void putGlobalFunctionTest() {
    1.46          final ScriptEngineManager m = new ScriptEngineManager();
    1.47 @@ -593,13 +570,6 @@
    1.48      }
    1.49  
    1.50      @Test
    1.51 -    public void versionTest() {
    1.52 -        final ScriptEngineManager m = new ScriptEngineManager();
    1.53 -        final ScriptEngine e = m.getEngineByName("nashorn");
    1.54 -        assertEquals(e.getFactory().getEngineVersion(), Version.version());
    1.55 -    }
    1.56 -
    1.57 -    @Test
    1.58      public void noEnumerablePropertiesTest() {
    1.59          final ScriptEngineManager m = new ScriptEngineManager();
    1.60          final ScriptEngine e = m.getEngineByName("nashorn");
    1.61 @@ -874,26 +844,4 @@
    1.62              fail(se.getMessage());
    1.63          }
    1.64      }
    1.65 -
    1.66 -    @Test
    1.67 -    public void factoryOptionsTest() {
    1.68 -        final ScriptEngineManager sm = new ScriptEngineManager();
    1.69 -        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
    1.70 -            if (fac instanceof NashornScriptEngineFactory) {
    1.71 -                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
    1.72 -                // specify --no-syntax-extensions flag
    1.73 -                final String[] options = new String[] { "--no-syntax-extensions" };
    1.74 -                final ScriptEngine e = nfac.getScriptEngine(options);
    1.75 -                try {
    1.76 -                    // try nashorn specific extension
    1.77 -                    e.eval("var f = funtion(x) 2*x;");
    1.78 -                    fail("should have thrown exception!");
    1.79 -                } catch (final ScriptException se) {
    1.80 -                }
    1.81 -                return;
    1.82 -            }
    1.83 -        }
    1.84 -
    1.85 -        fail("Cannot find nashorn factory!");
    1.86 -    }
    1.87  }