commit 43edda73b03c2f61aaad544df0c543c740700b6a
author Clément Béra <clementbera@google.com> Wed Jun 16 15:40:38 2021 +0000
committer Clément Béra <clementbera@google.com> Thu Jun 17 07:21:20 2021 +0000
tree 367cc5a3e1a5973f971e58dcf756525415d644f7
parent 9088c62ad3709ed163ab21dfede1e35670a613ec

RequireNonNullWithSupplier is always supported in ObjectsTest

Change-Id: I49cf02d5ba23ad581c212dcbc3fde4a5a227cf31

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ObjectsTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ObjectsTest.java
index e98a07d..213324c 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ObjectsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ObjectsTest.java
@@ -45,6 +45,25 @@
 @RunWith(Parameterized.class)
 public class ObjectsTest extends DesugaredLibraryTestBase implements Opcodes {
 
+  private static final String EXPECTED_OUTPUT =
+      StringUtils.lines(
+          "1",
+          "false",
+          "false",
+          Objects.toString(Objects.hash(1, 2)),
+          "4",
+          "NPE",
+          "Was null",
+          "Supplier said was null",
+          "5",
+          "6",
+          "true",
+          "false",
+          "1",
+          "2",
+          "3",
+          "4");
+
   private final TestParameters parameters;
   private final boolean libraryDesugarJavaUtilObjects;
   private final boolean shrinkDesugaredLibrary = false;
@@ -329,11 +348,8 @@
               parameters.getApiLevel(),
               desugaredLibraryKeepRules,
               shrinkDesugaredLibrary)
-          .run(
-              parameters.getRuntime(),
-              TestClass.class,
-              Boolean.toString(libraryDesugarJavaUtilObjects))
-          .assertSuccessWithOutput(expectedOutput(libraryDesugarJavaUtilObjects));
+          .run(parameters.getRuntime(), TestClass.class)
+          .assertSuccessWithOutput(EXPECTED_OUTPUT);
     } else {
       // Build the desugared library in class file format.
       Path desugaredLib =
@@ -343,11 +359,8 @@
       testForJvm()
           .addProgramFiles(jar)
           .addRunClasspathFiles(desugaredLib)
-          .run(
-              parameters.getRuntime(),
-              TestClass.class,
-              Boolean.toString(libraryDesugarJavaUtilObjects))
-          .assertSuccessWithOutput(expectedOutput(libraryDesugarJavaUtilObjects));
+          .run(parameters.getRuntime(), TestClass.class)
+          .assertSuccessWithOutput(EXPECTED_OUTPUT);
     }
   }
 
@@ -375,11 +388,8 @@
             keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .inspect(this::inspect)
-        .run(
-            parameters.getRuntime(),
-            TestClass.class,
-            Boolean.toString(libraryDesugarJavaUtilObjects))
-        .assertSuccessWithOutput(expectedOutput(libraryDesugarJavaUtilObjects));
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
 
   @Test
@@ -411,33 +421,8 @@
             keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .inspect(this::inspect)
-        .run(
-            parameters.getRuntime(),
-            TestClass.class,
-            Boolean.toString(libraryDesugarJavaUtilObjects))
-        .assertSuccessWithOutput(expectedOutput(libraryDesugarJavaUtilObjects));
-  }
-
-  private String expectedOutput(boolean objectsRequireNonNullWithSupplierSupported) {
-    return StringUtils.lines(
-        "1",
-        "false",
-        "false",
-        Objects.toString(Objects.hash(1, 2)),
-        "4",
-        "NPE",
-        "Was null",
-        objectsRequireNonNullWithSupplierSupported
-            ? "Supplier said was null"
-            : "Not supported (b/174840626)",
-        "5",
-        "6",
-        "true",
-        "false",
-        "1",
-        "2",
-        "3",
-        "4");
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
 
   static class TestClass {
@@ -522,7 +507,6 @@
     }
 
     public static void main(String[] args) throws Exception {
-      boolean objectsRequireNonNullWithSupplierSupported = Boolean.parseBoolean(args[0]);
       // Android K methods.
       objectsCompare("b", "a");
       objectsDeepEquals(args, new Object());
@@ -531,11 +515,7 @@
       objectsHashCode(4);
       objectsRequireNonNull(getNonNullableNull());
       objectsRequireNonNullWithMessage(null, "Was null");
-      if (objectsRequireNonNullWithSupplierSupported) {
-        objectsRequireNonNullWithSupplier(null, () -> "Supplier said was null");
-      } else {
-        System.out.println("Not supported (b/174840626)");
-      }
+      objectsRequireNonNullWithSupplier(null, () -> "Supplier said was null");
       objectsToString(makeNullable("5"));
       objectsToStringWithNullDefault(getNonNullableNull(), "6");