Fix desugared library tests
- fix red bots
Change-Id: I47920c8b9d7c0857d41052448057a0af9bec6e76
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
index e3caced..744e127 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
@@ -11,7 +11,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
-import com.android.tools.r8.D8TestCompileResult;
+import com.android.tools.r8.D8TestBuilder;
import com.android.tools.r8.L8Command;
import com.android.tools.r8.LibraryDesugaringTestConfiguration;
import com.android.tools.r8.OutputMode;
@@ -48,16 +48,21 @@
}
@Test
- public void testInvalidLibrary() throws Exception {
+ public void testInvalidLibrary() {
Assume.assumeTrue(requiresAnyCoreLibDesugaring(parameters));
- D8TestCompileResult compile =
+ D8TestBuilder testBuilder =
testForD8()
+ .setMinApi(parameters.getApiLevel())
.addProgramClasses(GuineaPig.class)
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.L))
.enableCoreLibraryDesugaring(
- LibraryDesugaringTestConfiguration.forApiLevel(parameters.getApiLevel()))
- .compile();
- TestDiagnosticMessages diagnosticMessages = compile.getDiagnosticMessages();
+ LibraryDesugaringTestConfiguration.forApiLevel(parameters.getApiLevel()));
+ try {
+ testBuilder.compile();
+ } catch (Throwable t) {
+ // Expected since we are compiling with an invalid set-up.
+ }
+ TestDiagnosticMessages diagnosticMessages = testBuilder.getState().getDiagnosticsMessages();
diagnosticMessages.assertOnlyWarnings();
assertTrue(
diagnosticMessages
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LegacyDesugaredLibraryConfigurationParsingTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LegacyDesugaredLibraryConfigurationParsingTest.java
index 7bf2046..83316eb 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LegacyDesugaredLibraryConfigurationParsingTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LegacyDesugaredLibraryConfigurationParsingTest.java
@@ -180,7 +180,7 @@
@Test
public void testUnsupportedAbove() {
LinkedHashMap<String, Object> data = template();
- data.put("configuration_format_version", 100000);
+ data.put("configuration_format_version", 99);
runFailing(
toJson(data),
diagnostics ->
