commit a24c6b9517d11c749e3a2222204e91ee5f7398b1
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 08 10:56:36 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 08 10:56:36 2020 +0200
tree b81b3c7c7e061f63816e2011c6c1bc588c763d25
parent c024b80d5a04f4a9f80e346ae359148950f63d3a

Update test expectation for CustomCollectionForwardingTest

Change-Id: I09a15f4b01db3af5ee23fe22cf1b7419e3bc2473

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index d37c554..7e1a627 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -266,6 +266,10 @@
         return isOlderThanOrEqual(Version.V4_4_4);
       }
 
+      public boolean isDefault() {
+        return this == DEFAULT;
+      }
+
       public boolean isLatest() {
         return this == V10_0_0;
       }

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CustomCollectionForwardingTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CustomCollectionForwardingTest.java
index 0a3ce0a..42582e6 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CustomCollectionForwardingTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CustomCollectionForwardingTest.java
@@ -46,7 +46,9 @@
   @Test
   public void testCustomCollectionD8() throws Exception {
     expectThrowsWithHorizontalClassMergingIf(
-        shrinkDesugaredLibrary && parameters.getApiLevel().isLessThan(AndroidApiLevel.N));
+        shrinkDesugaredLibrary
+            && parameters.getApiLevel().isLessThan(AndroidApiLevel.N)
+            && !parameters.getDexRuntimeVersion().isDefault());
     KeepRuleConsumer keepRuleConsumer = createKeepRuleConsumer(parameters);
     testForD8()
         .addInnerClasses(CustomCollectionForwardingTest.class)