Clean-up keep rules in enum unboxing test into an enum
Change-Id: Id1701418d3724d32c3c0a118ef69ccddc866e53d
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
index 1cf4e93..6483aee 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
@@ -23,7 +23,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -31,7 +31,7 @@
}
public AnnotationEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -46,7 +46,7 @@
.addInnerClasses(AnnotationEnumUnboxingTest.class)
.noMinification()
.addKeepMainRule(Main.class)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addKeepClassRules(ClassAnnotationDefault.class)
.addKeepRuntimeVisibleAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
index 19c069d..9873711 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
@@ -23,7 +23,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -31,7 +31,7 @@
}
public ComparisonEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -45,7 +45,7 @@
.addKeepMainRules(INPUTS)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
index 7582177..d1e5b4a 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
@@ -28,7 +28,7 @@
public class DoubleProcessingEnumUnboxingTest extends EnumUnboxingTestBase {
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
private final boolean minification;
@Parameters(name = "{0} valueOpt: {1} keep: {2} minif: {3}")
@@ -43,7 +43,7 @@
public DoubleProcessingEnumUnboxingTest(
TestParameters parameters,
boolean enumValueOptimization,
- KeepRule enumKeepRules,
+ EnumKeepRules enumKeepRules,
boolean minification) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
@@ -59,7 +59,7 @@
.addProgramClasses(JavaLibrary1.class, JavaLibrary1.LibEnum1.class)
.addKeepMethodRules(
Reference.methodFromMethod(JavaLibrary1.class.getDeclaredMethod("libCall")))
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.minification(minification)
@@ -72,7 +72,7 @@
.addProgramClasses(App.class, App.AppEnum.class)
.addProgramFiles(javaLibShrunk)
.addKeepMainRule(App.class)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
index e5f3913..49fc118 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
@@ -29,7 +29,7 @@
public class DoubleProcessingMergeEnumUnboxingTest extends EnumUnboxingTestBase {
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
private final boolean minification;
@Parameters(name = "{0} valueOpt: {1} keep: {2} minif: {3}")
@@ -44,7 +44,7 @@
public DoubleProcessingMergeEnumUnboxingTest(
TestParameters parameters,
boolean enumValueOptimization,
- KeepRule enumKeepRules,
+ EnumKeepRules enumKeepRules,
boolean minification) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
@@ -63,7 +63,7 @@
.addProgramClasses(App.class, App.AppEnum.class)
.addProgramFiles(javaLibShrunk1, javaLibShrunk2)
.addKeepMainRule(App.class)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
@@ -82,7 +82,7 @@
return testForR8(Backend.CF)
.addProgramClasses(libClass, enumLibClass)
.addKeepMethodRules(Reference.methodFromMethod(libClass.getDeclaredMethod("libCall")))
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.minification(minification)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
index c3e548e..92aa76e 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
@@ -10,7 +10,7 @@
@RunWith(Parameterized.class)
public class EnumClinitWithSideEffectsUnboxingTest extends EnumUnboxingTestBase {
- private final KeepRule enumKeepRule;
+ private final EnumKeepRules enumEnumKeepRules;
private final TestParameters parameters;
@Parameters(name = "{1}, enum keep rule: {0}")
@@ -19,8 +19,9 @@
getAllEnumKeepRules(), getTestParameters().withAllRuntimesAndApiLevels().build());
}
- public EnumClinitWithSideEffectsUnboxingTest(KeepRule enumKeepRule, TestParameters parameters) {
- this.enumKeepRule = enumKeepRule;
+ public EnumClinitWithSideEffectsUnboxingTest(
+ EnumKeepRules enumEnumKeepRules, TestParameters parameters) {
+ this.enumEnumKeepRules = enumEnumKeepRules;
this.parameters = parameters;
}
@@ -29,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumClinitWithSideEffectsUnboxingTest.class)
.addKeepMainRule(TestClass.class)
- .addKeepRules(enumKeepRule.getKeepRule())
+ .addKeepRules(enumEnumKeepRules.getKeepRules())
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
index b9445c2..c3967e5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
@@ -10,7 +10,7 @@
@RunWith(Parameterized.class)
public class EnumInitWithSideEffectsUnboxingTest extends EnumUnboxingTestBase {
- private final KeepRule enumKeepRule;
+ private final EnumKeepRules enumEnumKeepRules;
private final TestParameters parameters;
@Parameters(name = "{1}, enum keep rule: {0}")
@@ -19,8 +19,9 @@
getAllEnumKeepRules(), getTestParameters().withAllRuntimesAndApiLevels().build());
}
- public EnumInitWithSideEffectsUnboxingTest(KeepRule enumKeepRule, TestParameters parameters) {
- this.enumKeepRule = enumKeepRule;
+ public EnumInitWithSideEffectsUnboxingTest(
+ EnumKeepRules enumEnumKeepRules, TestParameters parameters) {
+ this.enumEnumKeepRules = enumEnumKeepRules;
this.parameters = parameters;
}
@@ -29,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumInitWithSideEffectsUnboxingTest.class)
.addKeepMainRule(TestClass.class)
- .addKeepRules(enumKeepRule.getKeepRule())
+ .addKeepRules(enumEnumKeepRules.getKeepRules())
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
index d9c9350..d4b73ff 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
@@ -28,7 +28,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -36,7 +36,7 @@
}
public EnumUnboxingArrayTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -50,7 +50,7 @@
.addKeepMainRules(SUCCESSES)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
index 6fb5fd1..4f724d3 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
@@ -24,7 +24,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameterized.Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -32,7 +32,7 @@
}
public EnumUnboxingClassStaticizerTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumUnboxingClassStaticizerTest.class)
.addKeepMainRule(TestClass.class)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.noMinification() // For assertions.
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
index 2a1be5f..a0173b5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
@@ -23,7 +23,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameterized.Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -31,7 +31,7 @@
}
public EnumUnboxingReturnNullTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -43,7 +43,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classToTest, ENUM_CLASS)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
index 5f05a31..128466c 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
@@ -17,7 +17,7 @@
private static final Class<?> ENUM_CLASS = MyEnum.class;
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -25,7 +25,7 @@
}
public EnumUnboxingSideEffectClInitTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -37,7 +37,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumUnboxingSideEffectClInitTest.class)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
@@ -47,7 +47,7 @@
m -> {
// The snap keep rule forces to keep the static MainEnum#e field, so the enum
// cannot be unboxed anymore.
- if (enumKeepRules.toString().equals("snap")) {
+ if (enumKeepRules.isSnap()) {
assertEnumIsBoxed(ENUM_CLASS, classToTest.getSimpleName(), m);
} else {
assertEnumIsUnboxed(ENUM_CLASS, classToTest.getSimpleName(), m);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
index 11ab1ae..1f82de1 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
@@ -13,44 +13,41 @@
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.StringUtils;
-import com.google.common.collect.ImmutableList;
import java.util.List;
public class EnumUnboxingTestBase extends TestBase {
+ // Default keep rule present in Android Studio.
private static final String KEEP_ENUM_STUDIO =
"-keepclassmembers enum * {\n"
+ " public static **[] values();\n"
+ " public static ** valueOf(java.lang.String);\n"
+ "}";
+ // Default keep rule present in Snap.
private static final String KEEP_ENUM_SNAP =
"-keepclassmembers enum * {\n"
+ "<fields>;\n"
+ " public static **[] values();\n"
+ " public static ** valueOf(java.lang.String);\n"
+ "}";
- private static final List<KeepRule> KEEP_ENUM =
- ImmutableList.of(
- new KeepRule("none", ""),
- new KeepRule("studio", KEEP_ENUM_STUDIO),
- new KeepRule("snap", KEEP_ENUM_SNAP));
- public static class KeepRule {
- private final String name;
- private final String keepRule;
+ public enum EnumKeepRules {
+ NONE(""),
+ STUDIO(KEEP_ENUM_STUDIO),
+ SNAP(KEEP_ENUM_SNAP);
- private KeepRule(String name, String keepRule) {
- this.name = name;
- this.keepRule = keepRule;
+ private final String keepRules;
+
+ public String getKeepRules() {
+ return keepRules;
}
- public String getKeepRule() {
- return keepRule;
+ public boolean isSnap() {
+ return this == SNAP;
}
- @Override
- public String toString() {
- return name;
+ EnumKeepRules(String keepRules) {
+ this.keepRules = keepRules;
}
}
@@ -96,10 +93,10 @@
return buildParameters(
getTestParameters().withDexRuntimes().withAllApiLevels().build(),
BooleanUtils.values(),
- KEEP_ENUM);
+ getAllEnumKeepRules());
}
- static List<KeepRule> getAllEnumKeepRules() {
- return KEEP_ENUM;
+ static EnumKeepRules[] getAllEnumKeepRules() {
+ return EnumKeepRules.values();
}
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
index de86bd7..2888ee4 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
@@ -18,7 +18,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -26,7 +26,7 @@
}
public EqualsCompareToEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
.addInnerClasses(EqualsCompareToEnumUnboxingTest.class)
.addKeepMainRule(EnumEqualscompareTo.class)
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FailingEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FailingEnumUnboxingTest.java
index f828413..08ec7bd 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FailingEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FailingEnumUnboxingTest.java
@@ -27,7 +27,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -35,7 +35,7 @@
}
public FailingEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -51,7 +51,7 @@
R8TestCompileResult compile =
r8FullTestBuilder
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
index 411a747..e42ac65 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
@@ -35,7 +35,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -43,7 +43,7 @@
}
public FailingMethodEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -55,7 +55,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(FailingMethodEnumUnboxingTest.class)
.addKeepMainRules(FAILURES)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.enableInliningAnnotations()
@@ -71,7 +71,7 @@
assertEnumIsBoxed(
failure.getDeclaredClasses()[0], failure.getSimpleName(), m))
.run(parameters.getRuntime(), failure);
- if (failure == EnumSetTest.class && enumKeepRules.getKeepRule().isEmpty()) {
+ if (failure == EnumSetTest.class && enumKeepRules.getKeepRules().isEmpty()) {
// EnumSet and EnumMap cannot be used without the enumKeepRules.
run.assertFailure();
} else {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
index 8ab4bcf..4d222d5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
@@ -25,7 +25,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -33,7 +33,7 @@
}
public FieldPutEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -45,7 +45,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(FieldPutEnumUnboxingTest.class)
.addKeepMainRules(INPUTS)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
index 5dcf75d..fba8006 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
@@ -33,7 +33,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -41,7 +41,7 @@
}
public InterfaceEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -58,7 +58,7 @@
.enableMergeAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java b/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
index 728a346..5d4501f 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
@@ -19,7 +19,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameterized.Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -27,7 +27,7 @@
}
public JavaCGeneratedMethodTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classToTest, ENUM_CLASS)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
index c65427a..8e15ad1 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
@@ -21,7 +21,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -29,7 +29,7 @@
}
public NullOutValueInvokeEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classToTest, ENUM_CLASS)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
index 8bd41c3..79f9176 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
@@ -20,7 +20,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -28,7 +28,7 @@
}
public OrdinalHashCodeEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -41,7 +41,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classToTest, ENUM_CLASS)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
index ba217f6..8aa2d5e 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
@@ -21,7 +21,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -29,7 +29,7 @@
}
public PhiEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classToTest, ENUM_CLASS)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
index fff500b..1c34891 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
@@ -20,7 +20,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -28,7 +28,7 @@
}
public PinnedEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -42,7 +42,7 @@
.addKeepMainRules(BOXED)
.addKeepClassRules(MainWithKeptEnum.MyEnum.class)
.addKeepMethodRules(MainWithKeptEnumArray.class, "keptMethod()")
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
index 0d01ffe..390fe18 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
@@ -19,7 +19,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -27,7 +27,7 @@
}
public StaticMethodsEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StaticMethodsEnumUnboxingTest.class)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
index dc2e217..76c06cb 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
@@ -21,7 +21,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -29,7 +29,7 @@
}
public SwitchEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SwitchEnumUnboxingTest.class)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
index b4f97ab..50a4d58 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
@@ -18,7 +18,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -26,7 +26,7 @@
}
public ToStringEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
.addInnerClasses(ToStringEnumUnboxingTest.class)
.addKeepMainRule(EnumNameToString.class)
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
index b7643a0..8b9b546 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
@@ -18,7 +18,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -26,7 +26,7 @@
}
public ToStringOverrideEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
.addInnerClasses(ToStringOverrideEnumUnboxingTest.class)
.addKeepMainRule(EnumNameToString.class)
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
index e2dcc4c..1da8c62 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
@@ -16,7 +16,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameterized.Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -24,7 +24,7 @@
}
public ValueOfEnumUnboxingFailureTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -37,7 +37,7 @@
.addInnerClasses(ValueOfEnumUnboxingFailureTest.class)
.addKeepMainRule(success)
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
index 37f31c9..23293f5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
@@ -23,7 +23,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -31,7 +31,7 @@
}
public ValueOfEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -44,7 +44,7 @@
.addInnerClasses(ValueOfEnumUnboxingTest.class)
.addKeepMainRules(SUCCESSES)
.enableNeverClassInliningAnnotations()
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticInfoMessages()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
index 6496c7a..6323e8b 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
@@ -19,7 +19,7 @@
private final TestParameters parameters;
private final boolean enumValueOptimization;
- private final KeepRule enumKeepRules;
+ private final EnumKeepRules enumKeepRules;
@Parameters(name = "{0} valueOpt: {1} keep: {2}")
public static List<Object[]> data() {
@@ -27,7 +27,7 @@
}
public VirtualMethodsEnumUnboxingTest(
- TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
this.parameters = parameters;
this.enumValueOptimization = enumValueOptimization;
this.enumKeepRules = enumKeepRules;
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(VirtualMethodsEnumUnboxingTest.class)
.addKeepMainRule(classToTest)
- .addKeepRules(enumKeepRules.getKeepRule())
+ .addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
