commit 1915d36642e99f9ac0b1efdb9b88b6728e0ae144
author Christoffer Adamsen <christofferqa@google.com> Mon Jun 03 16:44:46 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Jun 03 18:49:16 2024 +0000
tree add0afb9fcd2d906579d7b7962483c50853dbcdb
parent a3e66fdc2349c5d2895482801c10b10cec7822fd

Update internal test expectation

Change-Id: Idf0c8b275b5f564d92141910a2cdf122f212a3bc

src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
index bfb7a05..236c586 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
@@ -16,7 +16,6 @@
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.ThrowableConsumer;
 import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.references.Reference;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.AssertionUtils;
 import com.google.common.collect.Sets;
@@ -25,7 +24,6 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,13 +65,9 @@
         compileWithR8(
             builder ->
                 builder.addOptionsModification(
-                    options -> {
-                      options.testing.processingContextsConsumer =
-                          id -> assertNull(idsRoundOne.put(id, id));
-                      options
-                          .getOpenClosedInterfacesOptions()
-                          .suppressSingleOpenInterface(Reference.classFromClass(Lock.class));
-                    }));
+                    options ->
+                        options.testing.processingContextsConsumer =
+                            id -> assertNull(idsRoundOne.put(id, id))));
     compileResult.runDex2Oat(parameters.getRuntime()).assertNoVerificationErrors();
 
     Map<String, String> idsRoundTwo = new ConcurrentHashMap<>();
@@ -81,16 +75,12 @@
         compileWithR8(
             builder ->
                 builder.addOptionsModification(
-                    options -> {
-                      options.testing.processingContextsConsumer =
-                          id -> {
-                            AssertionUtils.assertNotNull(idsRoundOne.get(id));
-                            assertNull(idsRoundTwo.put(id, id));
-                          };
-                      options
-                          .getOpenClosedInterfacesOptions()
-                          .suppressSingleOpenInterface(Reference.classFromClass(Lock.class));
-                    }));
+                    options ->
+                        options.testing.processingContextsConsumer =
+                            id -> {
+                              AssertionUtils.assertNotNull(idsRoundOne.get(id));
+                              assertNull(idsRoundTwo.put(id, id));
+                            }));
 
     // Verify that the result of the two compilations was the same.
     assertEquals(