Nest desugaring and minification tests
- Ensure Nest attributes are written correctly
in the Cf back-end with minification on.
Bug:132147083
Change-Id: I03e12b8afdba0c8e63e2fe0ded6da6129c9156ba
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesUpdateTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesUpdateTest.java
index c250934..06f0a01 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesUpdateTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesUpdateTest.java
@@ -71,10 +71,17 @@
public void testNestAttributesCorrect(
String mainClassName, String outerNestName, String expectedResult) throws Exception {
+ testNestAttributesCorrect(mainClassName, outerNestName, expectedResult, true);
+ testNestAttributesCorrect(mainClassName, outerNestName, expectedResult, false);
+ }
+
+ public void testNestAttributesCorrect(
+ String mainClassName, String outerNestName, String expectedResult, boolean minification)
+ throws Exception {
String actualMainClassName = PACKAGE_NAME + mainClassName;
testForR8(parameters.getBackend())
- .noMinification()
.addKeepMainRule(actualMainClassName)
+ .minification(minification)
.setMinApi(parameters.getApiLevel())
.addProgramFiles(classesMatching(outerNestName))
.addOptionsModification(options -> options.enableNestBasedAccessDesugaring = true)
@@ -85,6 +92,7 @@
}
private void assertNestAttributesCorrect(CodeInspector inspector) {
+ assertTrue(inspector.allClasses().size() > 0);
for (FoundClassSubject classSubject : inspector.allClasses()) {
DexClass clazz = classSubject.getDexClass();
if (clazz.isInANest()) {