commit 6dab47ef3d0b7798c6c63a25ec51490745ceeccd
author Søren Gjesse <sgjesse@google.com> Wed Sep 20 13:49:14 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Sep 20 13:49:14 2023 +0200
tree 18161b4c412ddaafe0a02f23acf3b192b2552e88
parent 40325a911bd40169e3e0df6710d811f8ae868ff0

Fix test expectation

Change-Id: I66cfccfba79e38d470b26c27998c5147c5bccab5

src/test/java/com/android/tools/r8/rewrite/arrays/ConstClassArrayWithNonUniqueValuesTest.java

diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/ConstClassArrayWithNonUniqueValuesTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/ConstClassArrayWithNonUniqueValuesTest.java
index 9a71af8..213e3e4 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/ConstClassArrayWithNonUniqueValuesTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/ConstClassArrayWithNonUniqueValuesTest.java
@@ -67,21 +67,21 @@
         method.streamInstructions().filter(InstructionSubject::isConstClass).count());
   }
 
-  private void inspect(CodeInspector inspector) {
-    inspect(inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m1"), 1, 100, false);
-    inspect(
-        inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m2"),
-        maxMaterializingConstants == 2 ? 32 : 26,
-        104,
-        false);
-  }
-
   private void configure(TestCompilerBuilder<?, ?, ?, ?, ?> builder) {
     builder.addOptionsModification(
         options ->
             options.rewriteArrayOptions().maxMaterializingConstants = maxMaterializingConstants);
   }
 
+  private void inspectD8(CodeInspector inspector) {
+    inspect(inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m1"), 1, 100, false);
+    inspect(
+        inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m2"),
+        maxMaterializingConstants == 2 ? 98 : 26,
+        104,
+        false);
+  }
+
   @Test
   public void testD8() throws Exception {
     parameters.assumeDexRuntime();
@@ -90,10 +90,19 @@
         .setMinApi(parameters)
         .apply(this::configure)
         .run(parameters.getRuntime(), TestClass.class)
-        .inspect(this::inspect)
+        .inspect(this::inspectD8)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
 
+  private void inspectR8(CodeInspector inspector) {
+    inspect(inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m1"), 1, 100, false);
+    inspect(
+        inspector.clazz(TestClass.class).uniqueMethodWithOriginalName("m2"),
+        maxMaterializingConstants == 2 ? 32 : 26,
+        104,
+        false);
+  }
+
   @Test
   public void testR8() throws Exception {
     testForR8(parameters.getBackend())
@@ -104,7 +113,7 @@
         .addDontObfuscate()
         .apply(this::configure)
         .run(parameters.getRuntime(), TestClass.class)
-        .inspect(this::inspect)
+        .inspect(this::inspectR8)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }