Fix tests for Kotlin verisons on kotlin-old bot after formatting
* Kotlin 1.3 does not support trailing comma in multilline argument
lists
* Apply the version filter for kotlin-old and kotlin-dev configurations
Change-Id: If49a5c64a6ef3be9de0e555064080551e680d9a7
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
index 406920e..c9467fa 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
@@ -5,10 +5,10 @@
package com.android.tools.r8.kotlin.lambda;
import static junit.framework.TestCase.assertEquals;
-import static org.hamcrest.CoreMatchers.containsString;
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;
@@ -37,7 +37,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withAllRuntimesAndApiLevels().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build(),
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build(),
BooleanUtils.values());
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
index 5e8d962..ae02a7f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
@@ -8,10 +8,10 @@
import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_9_21;
import static com.android.tools.r8.utils.PredicateUtils.not;
import static junit.framework.TestCase.assertEquals;
-import static org.hamcrest.CoreMatchers.containsString;
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;
@@ -45,7 +45,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withAllRuntimesAndApiLevels().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build(),
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build(),
BooleanUtils.values());
}
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 fd84b48..ad623bb 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
@@ -10,6 +10,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;
@@ -40,7 +41,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withAllRuntimesAndApiLevels().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build(),
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build(),
BooleanUtils.values());
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAllowAccessModificationTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAllowAccessModificationTest.java
index 3e45bd2..dcdae26 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAllowAccessModificationTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAllowAccessModificationTest.java
@@ -9,6 +9,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringContains.containsString;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ToolHelper.ProcessResult;
@@ -53,7 +54,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withCfRuntimes().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build());
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
}
public MetadataRewriteAllowAccessModificationTest(
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAnnotationTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAnnotationTest.java
index 0e4a7f9..f3b5669 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteAnnotationTest.java
@@ -5,14 +5,13 @@
package com.android.tools.r8.kotlin.metadata;
import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_4_20;
-import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.MIN_SUPPORTED_VERSION;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentAndNotRenamed;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentAndRenamed;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.shaking.ProguardKeepAttributes;
@@ -63,7 +62,9 @@
return buildParameters(
getTestParameters().withCfRuntimes().build(),
getKotlinTestParameters()
- .withCompilersStartingFromIncluding(MIN_SUPPORTED_VERSION)
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
.withAllLambdaGenerations()
.withAllTargetVersions()
.build());
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineAnonFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineAnonFunctionTest.java
index fe162bd..077120f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineAnonFunctionTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineAnonFunctionTest.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.kotlin.metadata;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.utils.DescriptorUtils;
@@ -25,7 +26,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withCfRuntimes().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build());
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
}
public MetadataRewriteCrossinlineAnonFunctionTest(
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineBlockTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineBlockTest.java
index df8ba19..a8e0938 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineBlockTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineBlockTest.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.kotlin.metadata;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.utils.DescriptorUtils;
@@ -29,7 +30,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withCfRuntimes().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build());
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
}
public MetadataRewriteCrossinlineBlockTest(
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineConcreteFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineConcreteFunctionTest.java
index 3cd673c..5cf5276 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineConcreteFunctionTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteCrossinlineConcreteFunctionTest.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.kotlin.metadata;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.utils.DescriptorUtils;
@@ -25,7 +26,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withCfRuntimes().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build());
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
}
public MetadataRewriteCrossinlineConcreteFunctionTest(
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassNestedTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassNestedTest.java
index ae81b60..7fc82d2 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassNestedTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInSealedClassNestedTest.java
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.kotlin.metadata;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.shaking.ProguardKeepAttributes;
@@ -31,7 +32,13 @@
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withCfRuntimes().build(),
- getKotlinTestParameters().withAllCompilersLambdaGenerationsAndTargetVersions().build());
+ getKotlinTestParameters()
+ // Exclude Kotlin 1.3, as that does not support trailing comma in multi line argument
+ // lists, which the Kotlin formatter enforces.
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_4_20)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
}
public MetadataRewriteInSealedClassNestedTest(
diff --git a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
index 1c0c6a8..996d362 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -83,6 +83,10 @@
public static final KotlinCompilerVersion MIN_SUPPORTED_VERSION = KOTLINC_2_0_20;
public static final KotlinCompilerVersion MAX_SUPPORTED_VERSION = KOTLINC_2_0_20;
+ public static final KotlinCompilerVersion[] DEV_COMPILERS =
+ new KotlinCompilerVersion[] {
+ KotlinCompilerVersion.KOTLINC_2_1_0_BETA1, KotlinCompilerVersion.KOTLIN_DEV
+ };
private final String folder;
private final KotlinLambdaGeneration defaultLambdaGeneration;
diff --git a/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java b/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
index 692c387..3d7cc45 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
@@ -9,7 +9,6 @@
import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinCompilerTool.KotlinLambdaGeneration;
import com.android.tools.r8.KotlinCompilerTool.KotlinTargetVersion;
-import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -193,13 +192,15 @@
List<KotlinCompilerVersion> compilerVersions;
if (withDevCompiler) {
compilerVersions =
- ImmutableList.of(
- KotlinCompilerVersion.KOTLINC_2_1_0_BETA1, KotlinCompilerVersion.KOTLIN_DEV);
+ Arrays.stream(KotlinCompilerVersion.DEV_COMPILERS)
+ .filter(c -> compilerFilter.test(c))
+ .collect(Collectors.toList());
} else if (withOldCompilers) {
compilerVersions =
Arrays.stream(KotlinCompilerVersion.values())
.filter(c -> c.isLessThan(KotlinCompilerVersion.MIN_SUPPORTED_VERSION))
.filter(c -> oldCompilerFilter.test(c))
+ .filter(c -> compilerFilter.test(c))
.collect(Collectors.toList());
} else {
compilerVersions =
