commit 1b9b256b11246486ad2cdf1985b6bc312d9a3ee4
author Christoffer Adamsen <christofferqa@google.com> Mon Feb 17 08:58:16 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Feb 19 01:13:42 2025 -0800
tree ae4feba426853ae145af9c0c47c1ed22baf4279e
parent 629aaaf86e017acb6ef94a2719d4b8fe041e794a

Update LocalDateEpochTest

This test uses a desugared library specification that rewrites static-gets to target program fields.

The test is updated so that it instead rewrites to a non-program field.

Bug: b/391572031
Change-Id: If9d2fc3e3b3835b18e9a1c0e5b57f6453d3ca4f5

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
index 5c356b7..0c3b6c8 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
@@ -30,15 +30,18 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
 public class LocalDateEpochTest extends DesugaredLibraryTestBase {
 
-  private final TestParameters parameters;
+  @Parameter(0)
+  public TestParameters parameters;
 
   private static final String EXPECTED_OUTPUT = StringUtils.lines("1970-01-01");
 
-  @Parameterized.Parameters(name = "{0}")
+  @Parameters(name = "{0}")
   public static TestParametersCollection data() {
     return getTestParameters()
         .withDexRuntimesStartingFromIncluding(Version.V8_1_0)
@@ -46,10 +49,6 @@
         .build();
   }
 
-  public LocalDateEpochTest(TestParameters parameters) {
-    this.parameters = parameters;
-  }
-
   @Test
   public void testD8() throws Exception {
     testForD8(parameters.getBackend())
@@ -70,9 +69,9 @@
   public void testR8() throws Exception {
     parameters.assumeDexRuntime();
     testForR8(parameters.getBackend())
-        .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.R))
-        .addProgramClasses(DesugarLocalDate.class)
         .addProgramClassFileData(getMainClassFileData())
+        .addLibraryClasses(DesugarLocalDate.class)
+        .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.R))
         .addKeepMainRule(Main.class)
         .setMinApi(parameters)
         .addOptionsModification(
@@ -80,6 +79,7 @@
                 opt.getLibraryDesugaringOptions()
                     .setDesugaredLibrarySpecification(getSpecification(opt)))
         .compile()
+        .addRunClasspathClasses(DesugarLocalDate.class)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }