Remove JDK11 flag uses
Bug: b:231287675
Change-Id: I52dd67cc89a18ba824bfaa7434bb8f1170629a0c
diff --git a/src/test/java/com/android/tools/r8/D8TestBuilder.java b/src/test/java/com/android/tools/r8/D8TestBuilder.java
index 1ec4d18..d14b01f 100644
--- a/src/test/java/com/android/tools/r8/D8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/D8TestBuilder.java
@@ -6,9 +6,7 @@
import com.android.tools.r8.D8Command.Builder;
import com.android.tools.r8.TestBase.Backend;
import com.android.tools.r8.benchmarks.BenchmarkResults;
-import com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryTestBase.KeepRuleConsumer;
import com.android.tools.r8.origin.Origin;
-import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.InternalOptions;
import java.nio.file.Path;
@@ -90,15 +88,6 @@
return self();
}
- @Override
- public D8TestBuilder enableCoreLibraryDesugaring(
- AndroidApiLevel minApiLevel,
- KeepRuleConsumer keepRuleConsumer,
- StringResource desugaredLibrarySpecification) {
- super.enableCoreLibraryDesugaring(minApiLevel, keepRuleConsumer, desugaredLibrarySpecification);
- return self();
- }
-
public D8TestBuilder addMainDexRulesFiles(Path... mainDexRuleFiles) {
builder.addMainDexRulesFiles(mainDexRuleFiles);
return self();
diff --git a/src/test/java/com/android/tools/r8/R8TestBuilder.java b/src/test/java/com/android/tools/r8/R8TestBuilder.java
index 10bc820..ff90c43 100644
--- a/src/test/java/com/android/tools/r8/R8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/R8TestBuilder.java
@@ -696,15 +696,6 @@
return enableProguardTestOptions();
}
- @Override
- public T enableCoreLibraryDesugaring(
- AndroidApiLevel minApiLevel,
- KeepRuleConsumer keepRuleConsumer,
- StringResource desugaredLibrarySpecification) {
- super.enableCoreLibraryDesugaring(minApiLevel, keepRuleConsumer, desugaredLibrarySpecification);
- return self();
- }
-
public T addFeatureSplitRuntime() {
addProgramClasses(SplitRunner.class, RunInterface.class);
addKeepClassAndMembersRules(SplitRunner.class, RunInterface.class);
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index cc47c89..d7a6cc2 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -499,19 +499,6 @@
return self();
}
- public T enableCoreLibraryDesugaring(
- AndroidApiLevel minApiLevel,
- KeepRuleConsumer keepRuleConsumer,
- StringResource desugaredLibrarySpecification) {
- return enableCoreLibraryDesugaring(
- LibraryDesugaringTestConfiguration.builder()
- .setMinApi(minApiLevel)
- .setKeepRuleConsumer(keepRuleConsumer)
- .addDesugaredLibraryConfiguration(desugaredLibrarySpecification)
- .dontAddRunClasspath()
- .build());
- }
-
@Override
public T addRunClasspathFiles(Collection<Path> files) {
additionalRunClassPath.addAll(files);
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 38845cc..5a9accd 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
@@ -9,17 +9,12 @@
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK8;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
-import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
-import com.android.tools.r8.D8TestBuilder;
-import com.android.tools.r8.LibraryDesugaringTestConfiguration;
-import com.android.tools.r8.StringResource;
-import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
@@ -65,39 +60,6 @@
}
@Test
- public void testInvalidLibrary() {
- Assume.assumeTrue(requiresAnyCoreLibDesugaring(parameters));
- // This is handwritten since this is really a special case: library desugaring with an
- // invalid library file passed.
- D8TestBuilder testBuilder =
- testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClasses(GuineaPig.class)
- .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.L))
- .enableCoreLibraryDesugaring(
- LibraryDesugaringTestConfiguration.builder()
- .setMinApi(parameters.getApiLevel())
- .addDesugaredLibraryConfiguration(
- StringResource.fromFile(libraryDesugaringSpecification.getSpecification()))
- .dontAddRunClasspath()
- .build());
- try {
- testBuilder.compile();
- } catch (Throwable t) {
- // Expected since we are compiling with an invalid set-up.
- }
- TestDiagnosticMessages diagnosticMessages = testBuilder.getState().getDiagnosticsMessages();
- assertTrue(
- diagnosticMessages
- .getWarnings()
- .get(0)
- .getDiagnosticMessage()
- .contains(
- "Desugared library requires to be compiled with a library file of API greater or"
- + " equal to"));
- }
-
- @Test
public void testDesugaredLibraryContent() throws Exception {
Assume.assumeTrue(requiresAnyCoreLibDesugaring(parameters));
testForL8(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvalidTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvalidTest.java
new file mode 100644
index 0000000..254e8df
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvalidTest.java
@@ -0,0 +1,92 @@
+// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.desugar.desugaredlibrary;
+
+import static com.android.tools.r8.ToolHelper.DESUGARED_JDK_8_LIB_JAR;
+import static com.android.tools.r8.ToolHelper.UNDESUGARED_JDK_11_LIB_JAR;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.D8_L8DEBUG;
+import static junit.framework.TestCase.assertTrue;
+
+import com.android.tools.r8.TestDiagnosticMessages;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
+import com.android.tools.r8.desugar.desugaredlibrary.test.DesugaredLibraryTestBuilder;
+import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import java.util.List;
+import org.junit.Assume;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class DesugaredLibraryInvalidTest extends DesugaredLibraryTestBase {
+
+ private final TestParameters parameters;
+ private final CompilationSpecification compilationSpecification;
+ private final LibraryDesugaringSpecification libraryDesugaringSpecification;
+
+ @Parameters(name = "{0}, spec: {1}, {2}")
+ public static List<Object[]> data() {
+ LibraryDesugaringSpecification jdk8InvalidLib =
+ new LibraryDesugaringSpecification(
+ "JDK8_INVALID_LIB",
+ DESUGARED_JDK_8_LIB_JAR,
+ "desugar_jdk_libs.json",
+ AndroidApiLevel.L);
+ LibraryDesugaringSpecification jdk11InvalidLib =
+ new LibraryDesugaringSpecification(
+ "JDK11_INVALID_LIB",
+ UNDESUGARED_JDK_11_LIB_JAR,
+ "jdk11/desugar_jdk_libs.json",
+ AndroidApiLevel.L);
+ return buildParameters(
+ getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build(),
+ ImmutableList.of(jdk8InvalidLib, jdk11InvalidLib),
+ ImmutableList.of(D8_L8DEBUG));
+ }
+
+ public DesugaredLibraryInvalidTest(
+ TestParameters parameters,
+ LibraryDesugaringSpecification libraryDesugaringSpecification,
+ CompilationSpecification compilationSpecification) {
+ this.parameters = parameters;
+ this.compilationSpecification = compilationSpecification;
+ this.libraryDesugaringSpecification = libraryDesugaringSpecification;
+ }
+
+ @Test
+ public void testInvalidLibrary() throws IOException {
+ Assume.assumeTrue(requiresAnyCoreLibDesugaring(parameters));
+ DesugaredLibraryTestBuilder<?> testBuilder =
+ testForDesugaredLibrary(
+ parameters, libraryDesugaringSpecification, compilationSpecification)
+ .addProgramClasses(GuineaPig.class);
+ try {
+ testBuilder.compile();
+ } catch (Throwable t) {
+ // Expected since we are compiling with an invalid set-up.
+ }
+ testBuilder.applyOnBuilder(
+ b -> {
+ TestDiagnosticMessages diagnosticsMessages = b.getState().getDiagnosticsMessages();
+ assertTrue(
+ diagnosticsMessages
+ .getWarnings()
+ .get(0)
+ .getDiagnosticMessage()
+ .contains(
+ "Desugared library requires to be compiled with a library file of API greater"
+ + " or equal to"));
+ });
+ }
+
+ static class GuineaPig {
+ public static void main(String[] args) {}
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1620Test.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1620Test.java
index fc4fba0..c412e9f 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1620Test.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1620Test.java
@@ -16,6 +16,7 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.L8TestCompileResult;
+import com.android.tools.r8.LibraryDesugaringTestConfiguration;
import com.android.tools.r8.LibraryDesugaringTestConfiguration.PresentKeepRuleConsumer;
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.R8TestCompileResult;
@@ -119,9 +120,13 @@
.apply(configuration)
.setMinApi(getApiLevel())
.enableCoreLibraryDesugaring(
- getApiLevel(),
- keepRuleConsumer,
- StringResource.fromFile(getDesugaredLibraryConfiguration()))
+ LibraryDesugaringTestConfiguration.builder()
+ .setMinApi(getApiLevel())
+ .setKeepRuleConsumer(keepRuleConsumer)
+ .addDesugaredLibraryConfiguration(
+ StringResource.fromFile(getDesugaredLibraryConfiguration()))
+ .dontAddRunClasspath()
+ .build())
.compile()
.assertAllInfoMessagesMatch(
anyOf(
