commit e1577b4d2ee3eaef6514641ee962fcd4e5649958
author Søren Gjesse <sgjesse@google.com> Tue Jan 18 11:27:29 2022 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Jan 18 11:27:29 2022 +0100
tree 332b35867b893cbf7f8569498de772a49c1adaf8
parent 62bcce7b8e88faa64cfb3c9b64cf7fb9d937fd25

Fix test

There is now one backport which is found in android.jar.

Change-Id: I37a5c4d51408b4b72c58592e309500895fb9bb6a

src/test/java/com/android/tools/r8/desugar/backports/TestBackportedNotPresentInAndroidJar.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/TestBackportedNotPresentInAndroidJar.java b/src/test/java/com/android/tools/r8/desugar/backports/TestBackportedNotPresentInAndroidJar.java
index bd338b6..af6b26f 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/TestBackportedNotPresentInAndroidJar.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/TestBackportedNotPresentInAndroidJar.java
@@ -9,6 +9,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.graph.DexMethod;
 import com.android.tools.r8.graph.DexType;
@@ -24,9 +26,34 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
 
+@RunWith(Parameterized.class)
 public class TestBackportedNotPresentInAndroidJar extends TestBase {
 
+  @Parameter(0)
+  public TestParameters parameters;
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withNoneRuntime().build();
+  }
+
+  private boolean expectedToAlwaysBePresentInAndroidJar(DexMethod method) {
+    return method
+            .holder
+            .toSourceString()
+            .equals("java.util.concurrent.atomic.AtomicReferenceFieldUpdater")
+        && method.name.toSourceString().equals("compareAndSet")
+        && method.proto.returnType.toSourceString().equals("boolean")
+        && method.proto.parameters.values.length == 3
+        && method.proto.parameters.values[0].toSourceString().equals("java.lang.Object")
+        && method.proto.parameters.values[1].toSourceString().equals("java.lang.Object")
+        && method.proto.parameters.values[2].toSourceString().equals("java.lang.Object");
+  }
+
   @Test
   public void testBackportedMethodsPerAPILevel() throws Exception {
     for (AndroidApiLevel apiLevel : AndroidApiLevel.values()) {
@@ -54,6 +81,10 @@
                 Arrays.stream(method.proto.parameters.values)
                     .map(DexType::toSourceString)
                     .collect(Collectors.toList()));
+        if (expectedToAlwaysBePresentInAndroidJar(method)) {
+          assertThat(foundInAndroidJar, isPresent());
+          continue;
+        }
         assertThat(
             foundInAndroidJar + " present in " + apiLevel, foundInAndroidJar, not(isPresent()));
       }