Fix tests for kotlin-dev
Fixes: b/325410352
Change-Id: I40f3d25265808c8abfd0e765152bb58df2a47a33
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index 82b2875..ef121d8 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -58,7 +58,8 @@
if (kotlinTestParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0)
&& parameters.isDexRuntime()
&& parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) {
- diagnostics.assertWarningsCount(2);
+ // Kotlin stdlib has references to classes introduced at API level 24.
+ diagnostics.assertWarningsCount(3);
diagnostics.assertAllWarningsMatch(
DiagnosticsMatcher.diagnosticType(InterfaceDesugarMissingTypeDiagnostic.class));
} else {
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
index d616371..0556718 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
@@ -81,9 +81,7 @@
inspector ->
inspector
.applyIf(
- kotlinc.isOneOf(
- KotlinCompilerVersion.KOTLINC_1_8_0,
- KotlinCompilerVersion.KOTLINC_1_9_21)
+ kotlinParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0)
|| splitGroup,
i -> {
if (kotlinParameters.getLambdaGeneration().isClass()) {
@@ -128,9 +126,7 @@
assertThat(
mergeTarget,
isPresentIf(
- kotlinc.isOneOf(
- KotlinCompilerVersion.KOTLINC_1_8_0,
- KotlinCompilerVersion.KOTLINC_1_9_21)
+ kotlinParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0)
|| splitGroup));
if (mergeTarget.isAbsent()) {
