Fix AndroidResourcesDumpTest
This test only passed before because of an unrelated compilation error.
It should have started failing after
r8-review.git.corp.google.com/c/r8/+/116241
Change-Id: I6eda8158fedfadb63f2febf11b93e4a3d89e4a29
diff --git a/src/test/java/com/android/tools/r8/androidresources/AndroidResourcesDumpTest.java b/src/test/java/com/android/tools/r8/androidresources/AndroidResourcesDumpTest.java
index 7543d81..036c18a 100644
--- a/src/test/java/com/android/tools/r8/androidresources/AndroidResourcesDumpTest.java
+++ b/src/test/java/com/android/tools/r8/androidresources/AndroidResourcesDumpTest.java
@@ -8,9 +8,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
@@ -73,19 +71,22 @@
TemporaryFolder featureSplitTemp = ToolHelper.getTemporaryFolderForTest();
featureSplitTemp.create();
AndroidTestResource featureTestResources = getFeatureTestResources(featureSplitTemp);
- try {
- testForR8(parameters.getBackend())
- .addProgramClasses(Main.class)
- .addKeepMainRule(Main.class)
- .addAndroidResources(testResources)
- .addFeatureSplitAndroidResources(featureTestResources, "thefeature")
- .addOptionsModification(
- options -> options.setDumpInputFlags(DumpInputFlags.dumpToFile(dump)))
- .setMinApi(parameters)
- .compile();
- fail("Expected to fail compilation");
- } catch (CompilationFailedException ignored) {
- }
+ testForR8(parameters.getBackend())
+ .addProgramClasses(Main.class)
+ .addKeepMainRule(Main.class)
+ .addAndroidResources(testResources)
+ .addFeatureSplitAndroidResources(featureTestResources, "thefeature")
+ .addOptionsModification(
+ options -> options.setDumpInputFlags(DumpInputFlags.dumpToFile(dump)))
+ .setMinApi(parameters)
+ .allowDiagnosticInfoMessages()
+ .compileWithExpectedDiagnostics(
+ diagnostics ->
+ diagnostics
+ .assertInfosMatch(
+ diagnosticMessage(startsWith("Dumped compilation inputs to:")))
+ .assertNoWarnings()
+ .assertNoErrors());
CompilerDump compilerDump = CompilerDump.fromArchive(dump, temp.newFolder().toPath());
validateResourceEquality(
testResources,