commit 834d0dbd7350e0cfa056015f59d166040aa42628
author Ian Zerny <zerny@google.com> Mon Mar 02 13:48:56 2020 +0100
committer Ian Zerny <zerny@google.com> Mon Mar 02 13:48:56 2020 +0100
tree 04f28b21cd77844b1913b00ba960c6291a8cb4fe
parent efbfc9fbad2180ba94298702f2021cfda6688bcc

Fix count expectations after API level reordering.

Change-Id: Ic97546dd5cfa2850571deea28b696f71b010691e

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

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
index 190e7ee..523a018 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
@@ -17,13 +17,13 @@
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
 import com.android.tools.r8.utils.codeinspector.InstructionSubject;
 import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import it.unimi.dsi.fastutil.ints.Int2IntAVLTreeMap;
+import it.unimi.dsi.fastutil.ints.Int2IntSortedMap;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.List;
-import java.util.NavigableMap;
 import java.util.Set;
-import java.util.TreeMap;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,7 +33,7 @@
   private final Class<?> testClass;
   private final Path testJar;
   private final String testClassName;
-  private final NavigableMap<AndroidApiLevel, Integer> invokeStaticCounts = new TreeMap<>();
+  private final Int2IntSortedMap invokeStaticCounts = new Int2IntAVLTreeMap();
   private final Set<String> ignoredInvokes = new HashSet<>();
 
   AbstractBackportTest(TestParameters parameters, Class<?> targetClass,
@@ -64,11 +64,16 @@
     }
 
     // Assume all method calls will be rewritten on the lowest API level.
-    invokeStaticCounts.put(AndroidApiLevel.B, 0);
+    invokeStaticCounts.put(AndroidApiLevel.B.getLevel(), 0);
   }
 
   void registerTarget(AndroidApiLevel apiLevel, int invokeStaticCount) {
-    invokeStaticCounts.put(apiLevel, invokeStaticCount);
+    invokeStaticCounts.put(apiLevel.getLevel(), invokeStaticCount);
+  }
+
+  private int getTargetInvokesCount(AndroidApiLevel apiLevel) {
+    int key = invokeStaticCounts.headMap(apiLevel.getLevel() + 1).lastIntKey();
+    return invokeStaticCounts.get(key);
   }
 
   void ignoreInvokes(String methodName) {
@@ -119,7 +124,7 @@
         .collect(toList());
 
     AndroidApiLevel apiLevel = parameters.getApiLevel();
-    long expectedTargetInvokes = invokeStaticCounts.ceilingEntry(apiLevel).getValue();
+    long expectedTargetInvokes = getTargetInvokesCount(apiLevel);
     long actualTargetInvokes = javaInvokeStatics.size();
     assertEquals("Expected "
         + expectedTargetInvokes