Add more script engine tests with Rhino
Bug: 136633154
Change-Id: I54737d26275f67c4a22a5e4cb902d947442ac98f
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index f8ee25b..f7cca02 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -124,6 +124,7 @@
public static final String JSR223_RI_JAR = "third_party/jsr223-api-1.0/jsr223-api-1.0.jar";
public static final String RHINO_ANDROID_JAR =
"third_party/rhino-android-1.1.1/rhino-android-1.1.1.jar";
+ public static final String RHINO_JAR = "third_party/rhino-1.7.10/rhino-1.7.10.jar";
public static final String KT_STDLIB = "third_party/kotlin/kotlinc/lib/kotlin-stdlib.jar";
public static final String KT_REFLECT = "third_party/kotlin/kotlinc/lib/kotlin-reflect.jar";
private static final String ANDROID_JAR_PATTERN = "third_party/android_jar/lib-v%d/android.jar";
diff --git a/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java
new file mode 100644
index 0000000..5143949
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java
@@ -0,0 +1,115 @@
+// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.StringUtils;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class JavaScriptScriptEngineTest extends ScriptEngineTestBase {
+
+ private final TestParameters parameters;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().build();
+ }
+
+ public JavaScriptScriptEngineTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ private static String EXPECTED_RHINO_OUTPUT = StringUtils.lines("Mozilla Rhino", "42");
+ private static String EXPECTED_NASHORN_OUTPUT = StringUtils.lines("Oracle Nashorn", "42");
+
+ @Test
+ public void testD8() throws IOException, CompilationFailedException, ExecutionException {
+ assumeTrue("Only run D8 for dex backend", parameters.isDexRuntime());
+ testForD8()
+ .addInnerClasses(JavaScriptScriptEngineTest.class)
+ .setMinApi(parameters.getRuntime())
+ .apply(this::addRhinoForAndroid)
+ .compile()
+ .run(parameters.getRuntime(), TestClassWithExplicitRhinoScriptEngineRegistration.class)
+ .assertSuccessWithOutput(EXPECTED_RHINO_OUTPUT);
+ }
+
+ @Test
+ public void testR8() throws IOException, CompilationFailedException, ExecutionException {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(JavaScriptScriptEngineTest.class)
+ .addKeepMainRule(TestClass.class)
+ .setMinApi(parameters.getRuntime())
+ .apply(
+ b -> {
+ if (parameters.isDexRuntime()) {
+ addRhinoForAndroid(b);
+ addKeepRulesForAndroidRhino(b);
+ }
+ })
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutput(
+ parameters.isCfRuntime() ? EXPECTED_NASHORN_OUTPUT : EXPECTED_RHINO_OUTPUT);
+ }
+
+ static class TestClass {
+ public final ScriptEngineManager manager = new ScriptEngineManager();
+
+ public void run() throws Exception {
+ ScriptEngine engine = manager.getEngineByMimeType("text/javascript");
+ System.out.println(engine.getFactory().getEngineName());
+ runJavaScript(engine);
+ }
+
+ public void runJavaScript(ScriptEngine engine) throws Exception {
+ // Add a simple JavaScript function and call it.
+ engine.eval("function add(x, y) { return x + y }");
+ Object fortyTwo = engine.eval("add(40, 2)");
+ // Rhino and Nashorn in JDK8 returns a Double. Nashorn in JDK9 and JDK11 returns an Integer.
+ if (fortyTwo instanceof Double) {
+ System.out.println(((Double) fortyTwo).intValue());
+ } else if (fortyTwo instanceof Integer) {
+ System.out.println(fortyTwo);
+ } else {
+ System.out.println("Unexpected");
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ new TestClass().run();
+ }
+ }
+
+ static class TestClassWithExplicitRhinoScriptEngineRegistration extends TestClass {
+
+ public TestClassWithExplicitRhinoScriptEngineRegistration() throws Exception {
+ // D8 does not handle META-INF/services, it just produces dex files, so register
+ // the Rhino engine directly.
+ manager.registerEngineMimeType(
+ "text/javascript",
+ (ScriptEngineFactory)
+ (Class.forName("com.sun.script.javascript.RhinoScriptEngineFactory")
+ .getConstructor()
+ .newInstance()));
+ }
+
+ public static void main(String[] args) throws Exception {
+ new TestClassWithExplicitRhinoScriptEngineRegistration().run();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
index ed9eb2d..4e451ee 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
@@ -10,17 +10,14 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.DataEntryResource;
import com.android.tools.r8.R8FullTestBuilder;
-import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.StreamUtils;
import com.android.tools.r8.utils.StringUtils;
import java.io.IOException;
import java.io.Reader;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -38,7 +35,7 @@
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class ScriptEngineTest extends TestBase {
+public class ScriptEngineTest extends ScriptEngineTestBase {
private final TestParameters parameters;
@@ -69,22 +66,16 @@
StringUtils.lines(MyScriptEngine2FactoryImpl.class.getTypeName()).getBytes(),
"META-INF/services/" + ScriptEngineFactory.class.getTypeName(),
Origin.unknown()))
+ .apply(
+ b -> {
+ if (parameters.isDexRuntime()) {
+ addRhinoForAndroid(b);
+ }
+ })
// TODO(b/136633154): This should work both with and without -dontobfuscate.
.noMinification()
// TODO(b/136633154): This should work both with and without -dontshrink.
.noTreeShaking();
- if (parameters.isDexRuntime()) {
- // JSR 223: Scripting for the JavaTM Platform (https://jcp.org/en/jsr/detail?id=223).
- builder.addProgramFiles(Paths.get(ToolHelper.JSR223_RI_JAR));
- if (parameters.isDexRuntime()) {
- builder
- // The rhino-android contains concrete implementation of sun.misc.Service
- // used by the JSR 223 RI, which is not in the Android runtime (except for N?).
- .addProgramFiles(Paths.get(ToolHelper.RHINO_ANDROID_JAR))
- // The rhino-android library have references to missing classes.
- .addOptionsModification(options -> options.ignoreMissingClasses = true);
- }
- }
builder
.compile()
.writeToZip(path)
diff --git a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTestBase.java b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTestBase.java
new file mode 100644
index 0000000..af0878b
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTestBase.java
@@ -0,0 +1,59 @@
+// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite;
+
+import com.android.tools.r8.R8FullTestBuilder;
+import com.android.tools.r8.R8TestBuilder;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestBuilder;
+import com.android.tools.r8.ToolHelper;
+import java.nio.file.Paths;
+
+public class ScriptEngineTestBase extends TestBase {
+ public void addRhinoForAndroid(TestBuilder builder) {
+ builder
+ // JSR 223: Scripting for the JavaTM Platform (https://jcp.org/en/jsr/detail?id=223).
+ .addProgramFiles(Paths.get(ToolHelper.JSR223_RI_JAR))
+ // The Rhino implementation.
+ .addProgramFiles(Paths.get(ToolHelper.RHINO_JAR))
+ // The rhino-android contains concrete implementation of sun.misc.Service
+ // used by the JSR 223 RI, which is not in the Android runtime (except for N?).
+ .addProgramFiles(Paths.get(ToolHelper.RHINO_ANDROID_JAR));
+ if (builder instanceof R8FullTestBuilder) {
+ ((R8FullTestBuilder) builder)
+ // The rhino-android library have references to missing classes.
+ .addOptionsModification(options -> options.ignoreMissingClasses = true);
+ }
+ }
+
+ public void addKeepRulesForAndroidRhino(R8TestBuilder builder) {
+ builder
+ // Keep the service interface for script engine factories.
+ .addKeepClassAndMembersRules("javax.script.ScriptEngineFactory")
+ // Keep the Rhino script engine factory implementation.
+ .addKeepClassAndMembersRules("com.sun.script.javascript.RhinoScriptEngineFactory")
+ // Keep parts of com.sun.script.javascript.RhinoTopLevel.
+ .addKeepRules(
+ "-keep class com.sun.script.javascript.RhinoTopLevel {",
+ " public static java.lang.Object bindings(",
+ " org.mozilla.javascript.Context,",
+ " org.mozilla.javascript.Scriptable,",
+ " java.lang.Object[],",
+ " org.mozilla.javascript.Function);",
+ " public static java.lang.Object scope(",
+ " org.mozilla.javascript.Context,",
+ " org.mozilla.javascript.Scriptable,",
+ " java.lang.Object[],",
+ " org.mozilla.javascript.Function);",
+ " public static java.lang.Object sync(",
+ " org.mozilla.javascript.Context,",
+ " org.mozilla.javascript.Scriptable,",
+ " java.lang.Object[],",
+ " org.mozilla.javascript.Function);",
+ "}")
+ // TODO(b/136633154): See how to trim this.
+ .addKeepRules("-keep class org.mozilla.javascript.** { *; }");
+ }
+}
