commit 2c6948ad4db770fcb3c209c29007917d1f28ed6a
author Ian Zerny <zerny@google.com> Wed Nov 20 11:09:43 2019 +0100
committer Ian Zerny <zerny@google.com> Wed Nov 20 11:09:43 2019 +0100
tree 6bd7c80f144b127eb0a1f8e095f9331a2d016bd2
parent b0d92fe04fcd959529f5d8cb2605d2218d47ea68

Runtime name and filter is assumed to be lower case.

Change-Id: I40d593e3e2f68e2d5deee6ac9f1a2e48612443f8

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

diff --git a/src/test/java/com/android/tools/r8/TestParametersBuilder.java b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
index bc0e494..35d37cc 100644
--- a/src/test/java/com/android/tools/r8/TestParametersBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
@@ -225,7 +225,7 @@
     return getRuntimesProperty() != null;
   }
 
-  private static String getRuntimesProperty() {
+  public static String getRuntimesProperty() {
     return System.getProperty("runtimes");
   }
 

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

diff --git a/src/test/java/com/android/tools/r8/TestRuntime.java b/src/test/java/com/android/tools/r8/TestRuntime.java
index db24a6d..5357da6 100644
--- a/src/test/java/com/android/tools/r8/TestRuntime.java
+++ b/src/test/java/com/android/tools/r8/TestRuntime.java
@@ -211,7 +211,7 @@
 
     @Override
     public String name() {
-      return "dex-" + vm.getVersion().name();
+      return "dex-" + vm.getVersion().name().toLowerCase();
     }
 
     @Override
@@ -265,7 +265,7 @@
 
     @Override
     public String name() {
-      return vm.name();
+      return vm.name().toLowerCase();
     }
 
     public Path getJavaHome() {

src/test/java/com/android/tools/r8/utils/TestParametersTest.java

diff --git a/src/test/java/com/android/tools/r8/utils/TestParametersTest.java b/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
index 2d26e5d..16e54ed 100644
--- a/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
+++ b/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
@@ -8,10 +8,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersBuilder;
 import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRuntime;
 import com.android.tools.r8.TestRuntime.DexRuntime;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
@@ -71,4 +73,28 @@
           assertThat(apiLevels, hasItem(dexRuntime.getMinApiLevel()));
         });
   }
+
+  @Test
+  public void testJdk9Presence() {
+    assumeTrue(!TestParametersBuilder.isRuntimesPropertySet()
+        || TestParametersBuilder.getRuntimesProperty().contains("jdk9"));
+    assertTrue(TestParametersBuilder
+        .builder()
+        .withAllRuntimesAndApiLevels()
+        .build()
+        .stream()
+        .anyMatch(parameter -> parameter.getRuntime().equals(TestRuntime.getCheckedInJdk9())));
+  }
+
+  @Test
+  public void testDexDefaultPresence() {
+    assumeTrue(!TestParametersBuilder.isRuntimesPropertySet()
+        || TestParametersBuilder.getRuntimesProperty().contains("dex-default"));
+    assertTrue(TestParametersBuilder
+        .builder()
+        .withAllRuntimesAndApiLevels()
+        .build()
+        .stream()
+        .anyMatch(parameter -> parameter.getRuntime().name().equals("dex-default")));
+  }
 }