commit 77fd585cc61ddc13f962cf25ea15c31cd8d1d79d
author clementbera <clementbera@google.com> Tue Dec 17 11:31:50 2019 +0100
committer clementbera <clementbera@google.com> Tue Dec 17 11:31:50 2019 +0100
tree 00be11b582bebb8a770d3847a1dd18fa4c0773d1
parent 2c51d078a660feb47cd65dc069cc3b2b4ac0f186

Fix Red tests

Change-Id: I54e9df9ba9440b2170c1e016439c5fedc5673599

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/FeatureSplitTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/FeatureSplitTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/FeatureSplitTest.java
index 2f02755..d4f08fc 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/FeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/FeatureSplitTest.java
@@ -5,7 +5,6 @@
 package com.android.tools.r8.desugar.desugaredlibrary;
 
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
@@ -37,8 +36,6 @@
 
   private final TestParameters parameters;
   private final boolean shrinkDesugaredLibrary;
-  private final Class<?>[] baseAndFeatureClasses =
-      new Class<?>[] {BaseClass.class, FeatureClass.class, FeatureClass2.class};
 
   @Parameters(name = "{1}, shrinkDesugaredLibrary: {0}")
   public static List<Object[]> data() {
@@ -71,6 +68,10 @@
   }
 
   private void assertKeepThe3StreamMethods(String keepRules) {
+    // Stream desugaring is not needed >= N.
+    if (parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel()) {
+      return;
+    }
     // Ensure count, toArray and forEach are kept.
     assertTrue(
         keepRules.contains(
@@ -83,16 +84,10 @@
                 + "    java.lang.Object[] toArray();"));
   }
 
-  private void assertClassPresent(Path basePath, Class<?> present)
+  private void assertClassPresent(Path appPath, Class<?> present)
       throws IOException, ExecutionException {
-    CodeInspector inspector = new CodeInspector(basePath);
-    for (Class<?> clazz : baseAndFeatureClasses) {
-      if (clazz == present) {
-        assertTrue(inspector.clazz(present).isPresent());
-      } else {
-        assertFalse(inspector.clazz(present).isPresent());
-      }
-    }
+    CodeInspector inspector = new CodeInspector(appPath);
+    assertTrue(inspector.clazz(present).isPresent());
   }
 
   private void verifyRun(
@@ -255,8 +250,8 @@
           .enableCoreLibraryDesugaring(parameters.getApiLevel(), keepRuleConsumer)
           .compile()
           .writeToZip(basePath);
-      // Library desugaring is not needed above N.
-      if (parameters.getApiLevel().getLevel() > AndroidApiLevel.N.getLevel()) {
+      // Stream desugaring is not needed >= N.
+      if (parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel()) {
         return this;
       }
       desugaredLibrary =