commit 2daf7c5851a3cd39d6760410c170a524c6f95d4e
author Clément Béra <clementbera@google.com> Thu Jun 02 14:02:54 2022 +0200
committer Clément Béra <clementbera@google.com> Fri Jun 03 07:25:36 2022 +0000
tree 874d12d3e9663c07279f4a94fc0528725b270075
parent a31c3446a454700da34c25774f59dc95cecc3bb6

Run java.nio.file test on all android VMs

- Identify and filter out a flaky test LotsOfClose
- Run the tests on all VM > 24

Bug: b:234689448
Change-Id: I5e3a0ab0d44dbcd78797252c1499bd5808d40732

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
index 885ee2e..5cb8e57 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
@@ -27,7 +27,6 @@
 import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
 import com.android.tools.r8.references.Reference;
 import com.android.tools.r8.transformers.ClassFileTransformer;
-import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.StringUtils;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -139,7 +138,6 @@
           "WatchServiceDeleteInterference",
           "WatchServiceMayFlies",
           "WatchServiceLotsOfCancels",
-          "WatchServiceLotsOfCloses",
           "WatchServiceSensitivityModifier");
   private static final List<String> FAILING_MAIN_TESTS =
       ImmutableList.of(
@@ -160,7 +158,8 @@
           "FilesCheckPermissions",
           "FilesMisc",
           "WatchServiceWithSecurityManager",
-          "WatchServiceUpdateInterference");
+          "WatchServiceUpdateInterference",
+          "WatchServiceLotsOfCloses");
   private static final List<String> SUCCESSFUL_TESTNG_TESTS =
       ImmutableList.of("FilesStreamTest", "FilesBytesAndLines");
   private static final List<String> FAILING_TESTNG_TESTS =
@@ -238,7 +237,6 @@
     return data;
   }
 
-  @NotNull
   private static Path[] compile(String name, List<Path> sourceFiles, Path cp) throws IOException {
     List<String> options =
         Arrays.asList(
@@ -300,11 +298,9 @@
 
   @Test
   public void testNioFileAndroid() throws Exception {
-    // TODO(b/234689448): Test other android VMs.
-    // These 2 android VMs have the right amount of libs to make the tests pass.
-    Assume.assumeTrue(
-        parameters.getApiLevel().equals(AndroidApiLevel.Q)
-            || parameters.getApiLevel().equals(AndroidApiLevel.T));
+    Assume.assumeFalse(
+        "The package java.nio was not present on older devices, all tests fail.",
+        parameters.getDexRuntimeVersion().isOlderThan(Version.V8_1_0));
     String verbosity = "2";
     D8TestCompileResult compileResult =
         testForD8(parameters.getBackend())