Fix another test for kotlin-old
Change-Id: Ic6f0d563a198c69bb0fad63b043a6e389e12cc0e
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
index 239585f..9c109ec 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
@@ -9,6 +9,7 @@
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestBase;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
@@ -105,12 +106,26 @@
ClassReference mainKt = Reference.classFromTypeName(getMainClassName());
inspector.applyIf(
kotlinParameters.getLambdaGeneration().isClass(),
- i ->
- i.assertIsCompleteMergeGroup(
+ i -> {
+ List<ClassReference> group = new ArrayList<>();
+ group.add(
+ lambdasInInput.getKStyleLambdaReferenceFromTypeName(
+ getTestName(), "MainKt$testStateless$11"));
+ group.add(
+ lambdasInInput.getKStyleLambdaReferenceFromTypeName(
+ getTestName(), "MainKt$testStateless$12"));
+ if (kotlinParameters
+ .getCompilerVersion()
+ .isLessThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_6_0)
+ && kotlinParameters
+ .getCompilerVersion()
+ .isGreaterThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_5_0)) {
+ group.add(
lambdasInInput.getKStyleLambdaReferenceFromTypeName(
- getTestName(), "MainKt$testStateless$11"),
- lambdasInInput.getKStyleLambdaReferenceFromTypeName(
- getTestName(), "MainKt$testStateless$12")),
+ getTestName(), "MainKt$testStateless$6"));
+ }
+ i.assertIsCompleteMergeGroup(group);
+ },
i ->
i.assertIsCompleteMergeGroup(
SyntheticItemsTestUtils.syntheticLambdaClass(mainKt, 0),
