Refactor AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest into multiple classes
Change-Id: Ic25834354898725db734ffcc158cdf761042885b
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryAssertJvmTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryAssertJvmTest.java
new file mode 100644
index 0000000..00c0bdb
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryAssertJvmTest.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite.assertions;
+
+import com.android.tools.r8.KotlinTestParameters;
+import com.android.tools.r8.TestParameters;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryAssertJvmTest
+ extends AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase {
+
+ public AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryAssertJvmTest(
+ TestParameters parameters, KotlinTestParameters kotlinParameters) {
+ super(parameters, kotlinParameters, true, true);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryNoAssertJvmTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryNoAssertJvmTest.java
new file mode 100644
index 0000000..6b297a3
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryNoAssertJvmTest.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite.assertions;
+
+import com.android.tools.r8.KotlinTestParameters;
+import com.android.tools.r8.TestParameters;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryNoAssertJvmTest
+ extends AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase {
+
+ public AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibLibraryNoAssertJvmTest(
+ TestParameters parameters, KotlinTestParameters kotlinParameters) {
+ super(parameters, kotlinParameters, true, false);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramAssertJvmTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramAssertJvmTest.java
new file mode 100644
index 0000000..c7fc456
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramAssertJvmTest.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite.assertions;
+
+import com.android.tools.r8.KotlinTestParameters;
+import com.android.tools.r8.TestParameters;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramAssertJvmTest
+ extends AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase {
+
+ public AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramAssertJvmTest(
+ TestParameters parameters, KotlinTestParameters kotlinParameters) {
+ super(parameters, kotlinParameters, false, true);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramNoAssertJvmTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramNoAssertJvmTest.java
new file mode 100644
index 0000000..f8f9eca
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramNoAssertJvmTest.java
@@ -0,0 +1,20 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.rewrite.assertions;
+
+import com.android.tools.r8.KotlinTestParameters;
+import com.android.tools.r8.TestParameters;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramNoAssertJvmTest
+ extends AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase {
+
+ public AssertionConfigurationKotlinWithModifiedKotlinAssertionsStdlibProgramNoAssertJvmTest(
+ TestParameters parameters, KotlinTestParameters kotlinParameters) {
+ super(parameters, kotlinParameters, false, false);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase.java
similarity index 94%
rename from src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest.java
rename to src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase.java
index 15eb747..ccfb357 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase.java
@@ -7,7 +7,6 @@
import com.android.tools.r8.AssertionsConfiguration;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.utils.internal.BooleanUtils;
import java.util.Collection;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -18,19 +17,17 @@
import org.objectweb.asm.Opcodes;
@RunWith(Parameterized.class)
-public class AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest
+public abstract class AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase
extends AssertionConfigurationKotlinTestBase implements Opcodes {
- @Parameterized.Parameters(name = "{0}, {1}, kotlin-stdlib as library: {2}, -Xassertions=jvm: {3}")
+ @Parameterized.Parameters(name = "{0}, {1}")
public static Collection<Object[]> data() {
return buildParameters(
getTestParameters().withDexRuntimesAndAllApiLevels().build(),
- getKotlinTestParameters().withAllCompilersAndLambdaGenerations().build(),
- BooleanUtils.values(),
- BooleanUtils.values());
+ getKotlinTestParameters().withAllCompilersAndLambdaGenerations().build());
}
- public AssertionConfigurationKotlinWithModifiedKotlinAssertionsTest(
+ public AssertionConfigurationKotlinWithModifiedKotlinAssertionsTestBase(
TestParameters parameters,
KotlinTestParameters kotlinParameters,
boolean kotlinStdlibAsClasspath,