Fix test for library desugaring version mismatch
Bug: 190075882
Change-Id: I1ae181a0cbc4006d77a900e9756d4e9bb8d1c4bd
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
index 5f50a47..e705ca6 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
@@ -117,31 +117,12 @@
.compile()
.writeToZip();
- // Combine DEX input without library desugaring with dexing with library desugaring.
- try {
- testForD8()
- .addProgramFiles(desugaredLibraryDex)
- .addProgramClasses(TestRunner.class)
- .setMinApi(apiLevel)
- .enableCoreLibraryDesugaring(apiLevel)
- .compileWithExpectedDiagnostics(
- diagnostics -> {
- diagnostics.assertNoInfos();
- diagnostics.assertAllWarningsMatch(
- diagnosticMessage(
- containsString(
- "The compilation is slowed down due to a mix of class file and dex"
- + " file inputs in the context of desugared library.")));
- if (apiLevel.isLessThan(AndroidApiLevel.O)) {
- diagnostics.assertErrorsMatch(
- diagnosticType(DesugaredLibraryMismatchDiagnostic.class));
- } else {
- diagnostics.assertNoMessages();
- }
- });
-
- } catch (CompilationFailedException e) {
- }
+ testForD8()
+ .addProgramFiles(desugaredLibraryDex)
+ .addProgramClasses(TestRunner.class)
+ .setMinApi(apiLevel)
+ .enableCoreLibraryDesugaring(apiLevel)
+ .compile();
}
@Test
