commit 92d2adbc8e8ca2ef6a5da3000f4a4f436fe7572c
author Søren Gjesse <sgjesse@google.com> Tue Jun 30 15:33:07 2020 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Jul 01 13:38:05 2020 +0000
tree 2c563fc6b80212c9a21c090b4db35b9b4280b21c
parent 5823e54b496f6c1e0e44d6d160498b1e48e2184d

Extend testForRuntime with full configuration of the D8TestBuilder

Change-Id: Ie49661944e9f569a1b5e867bd8a6a04136ae602b

src/test/java/com/android/tools/r8/TestBase.java

diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index 78eaabf..b764451 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -193,17 +193,22 @@
   }
 
   public TestBuilder<? extends TestRunResult<?>, ?> testForRuntime(
-      TestRuntime runtime, AndroidApiLevel apiLevel) {
+      TestRuntime runtime, Consumer<D8TestBuilder> d8TestBuilderConsumer) {
     if (runtime.isCf()) {
       return testForJvm();
     } else {
       assert runtime.isDex();
       D8TestBuilder d8TestBuilder = testForD8();
-      d8TestBuilder.setMinApi(apiLevel);
+      d8TestBuilderConsumer.accept(d8TestBuilder);
       return d8TestBuilder;
     }
   }
 
+  public TestBuilder<? extends TestRunResult<?>, ?> testForRuntime(
+      TestRuntime runtime, AndroidApiLevel apiLevel) {
+    return testForRuntime(runtime, d8TestBuilder -> d8TestBuilder.setMinApi(apiLevel));
+  }
+
   public TestBuilder<? extends TestRunResult<?>, ?> testForRuntime(TestParameters parameters) {
     return testForRuntime(parameters.getRuntime(), parameters.getApiLevel());
   }

src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
index ed6d43b..49fec87 100644
--- a/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
@@ -83,22 +83,14 @@
               .addRunClasspathFiles(app)
               .run(parameters.getRuntime(), InstrumentedTestClass.class);
     } else {
-      if (parameters.getRuntime().isCf()) {
-        result =
-            testForJvm()
-                .addProgramClasses(InstrumentedTestClass.class)
-                .addRunClasspathFiles(app)
-                .run(parameters.getRuntime(), InstrumentedTestClass.class);
-      } else {
-        result =
-            testForD8()
-                .addProgramClasses(InstrumentedTestClass.class)
-                .addClasspathClasses(InterfaceWithStaticMethods.class)
-                .setMinApi(parameters.getApiLevel())
-                .compile()
-                .addRunClasspathFiles(app)
-                .run(parameters.getRuntime(), InstrumentedTestClass.class);
-      }
+      result =
+          testForRuntime(
+                  parameters.getRuntime(),
+                  d8TestBuilder ->
+                      d8TestBuilder.setMinApi(parameters.getApiLevel()).addClasspathFiles(app))
+              .addProgramClasses(InstrumentedTestClass.class)
+              .addRunClasspathFiles(app)
+              .run(parameters.getRuntime(), InstrumentedTestClass.class);
     }
     if (parameters.canUseDefaultAndStaticInterfaceMethods()) {
       result.assertSuccessWithOutputLines("42");