Desugared lib Optional conversions
Bug: 137876068
Change-Id: I7624c83fc4ea5126011ffc93779efce09da03c4b
diff --git a/src/test/desugaredLibraryConversions/conversions/OptionalConversions.java b/src/test/desugaredLibraryConversions/conversions/OptionalConversions.java
index ef74784..390b123 100644
--- a/src/test/desugaredLibraryConversions/conversions/OptionalConversions.java
+++ b/src/test/desugaredLibraryConversions/conversions/OptionalConversions.java
@@ -2,7 +2,7 @@
// 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 java.time;
+package java.util;
public class OptionalConversions {
diff --git a/src/test/desugaredLibraryConversions/stubs/Optional.java b/src/test/desugaredLibraryConversions/stubs/optionalstubs/Optional.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/Optional.java
rename to src/test/desugaredLibraryConversions/stubs/optionalstubs/Optional.java
diff --git a/src/test/desugaredLibraryConversions/stubs/OptionalDouble.java b/src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalDouble.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/OptionalDouble.java
rename to src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalDouble.java
diff --git a/src/test/desugaredLibraryConversions/stubs/OptionalInt.java b/src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalInt.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/OptionalInt.java
rename to src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalInt.java
diff --git a/src/test/desugaredLibraryConversions/stubs/OptionalLong.java b/src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalLong.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/OptionalLong.java
rename to src/test/desugaredLibraryConversions/stubs/optionalstubs/OptionalLong.java
diff --git a/src/test/desugaredLibraryConversions/stubs/Duration.java b/src/test/desugaredLibraryConversions/stubs/timestubs/Duration.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/Duration.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/Duration.java
diff --git a/src/test/desugaredLibraryConversions/stubs/Instant.java b/src/test/desugaredLibraryConversions/stubs/timestubs/Instant.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/Instant.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/Instant.java
diff --git a/src/test/desugaredLibraryConversions/stubs/LocalDate.java b/src/test/desugaredLibraryConversions/stubs/timestubs/LocalDate.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/LocalDate.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/LocalDate.java
diff --git a/src/test/desugaredLibraryConversions/stubs/MonthDay.java b/src/test/desugaredLibraryConversions/stubs/timestubs/MonthDay.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/MonthDay.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/MonthDay.java
diff --git a/src/test/desugaredLibraryConversions/stubs/ZoneId.java b/src/test/desugaredLibraryConversions/stubs/timestubs/ZoneId.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/ZoneId.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/ZoneId.java
diff --git a/src/test/desugaredLibraryConversions/stubs/ZonedDateTime.java b/src/test/desugaredLibraryConversions/stubs/timestubs/ZonedDateTime.java
similarity index 100%
rename from src/test/desugaredLibraryConversions/stubs/ZonedDateTime.java
rename to src/test/desugaredLibraryConversions/stubs/timestubs/ZonedDateTime.java
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/APIConversionTestBase.java b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/APIConversionTestBase.java
index e97834f..0127ff7 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/APIConversionTestBase.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/APIConversionTestBase.java
@@ -20,7 +20,7 @@
private static final Path CONVERSION_FOLDER = Paths.get("src/test/desugaredLibraryConversions");
- public Path[] getTimeConversionClasses() throws IOException {
+ public Path[] getConversionClasses() throws IOException {
Assume.assumeTrue(
"JDK8 javac is required to avoid dealing with modules and JDK8 is not checked-in on"
+ " windows",
@@ -53,7 +53,7 @@
protected Path buildDesugaredLibraryWithConversionExtension(AndroidApiLevel apiLevel) {
Path[] timeConversionClasses;
try {
- timeConversionClasses = getTimeConversionClasses();
+ timeConversionClasses = getConversionClasses();
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/AllOptionalConversionTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/AllOptionalConversionTest.java
new file mode 100644
index 0000000..0b34b7f
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/AllOptionalConversionTest.java
@@ -0,0 +1,111 @@
+// Copyright (c) 2019, 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.corelib.conversionTests;
+
+import com.android.tools.r8.TestRuntime.DexRuntime;
+import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.StringUtils;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import org.junit.Test;
+
+public class AllOptionalConversionTest extends APIConversionTestBase {
+
+ @Test
+ public void testRewrittenAPICalls() throws Exception {
+ Path customLib = testForD8().addProgramClasses(CustomLibClass.class).compile().writeToZip();
+ testForD8()
+ .setMinApi(AndroidApiLevel.B)
+ .addProgramClasses(Executor.class)
+ .addLibraryClasses(CustomLibClass.class)
+ .enableCoreLibraryDesugaring(AndroidApiLevel.B)
+ .compile()
+ .addDesugaredCoreLibraryRunClassPath(
+ this::buildDesugaredLibraryWithConversionExtension, AndroidApiLevel.B)
+ .addRunClasspathFiles(customLib)
+ .run(new DexRuntime(DexVm.ART_9_0_0_HOST), Executor.class)
+ .assertSuccessWithOutput(
+ StringUtils.lines(
+ "Optional[value]",
+ "OptionalDouble[1.0]",
+ "OptionalInt[1]",
+ "OptionalLong[1]",
+ "Optional[value]",
+ "value"));
+ }
+
+ static class Executor {
+
+ public static void main(String[] args) {
+ returnValueUsed();
+ returnValueUnused();
+ virtualMethods();
+ }
+
+ @SuppressWarnings("all")
+ public static void returnValueUsed() {
+ System.out.println(CustomLibClass.mix(Optional.empty(), Optional.of("value")));
+ System.out.println(CustomLibClass.mix(OptionalDouble.empty(), OptionalDouble.of(1.0)));
+ System.out.println(CustomLibClass.mix(OptionalInt.empty(), OptionalInt.of(1)));
+ System.out.println(CustomLibClass.mix(OptionalLong.empty(), OptionalLong.of(1L)));
+ }
+
+ @SuppressWarnings("all")
+ public static void returnValueUnused() {
+ CustomLibClass.mix(Optional.empty(), Optional.of("value"));
+ CustomLibClass.mix(OptionalDouble.empty(), OptionalDouble.of(1.0));
+ CustomLibClass.mix(OptionalInt.empty(), OptionalInt.of(1));
+ CustomLibClass.mix(OptionalLong.empty(), OptionalLong.of(1L));
+ }
+
+ public static void virtualMethods() {
+ CustomLibClass customLibClass = new CustomLibClass();
+ Optional<String> optionalValue = Optional.of("value");
+ customLibClass.virtual(optionalValue);
+ customLibClass.virtualString(optionalValue);
+ System.out.println(customLibClass.virtual(optionalValue));
+ System.out.println(customLibClass.virtualString(optionalValue));
+ }
+ }
+
+ // This class will be put at compilation time as library and on the runtime class path.
+ // This class is convenient for easy testing. None of the methods make sense.
+ static class CustomLibClass {
+
+ @SuppressWarnings("all")
+ public static <T> Optional<T> mix(Optional<T> optional1, Optional<T> optional2) {
+ return optional1.isPresent() ? optional1 : optional2;
+ }
+
+ @SuppressWarnings("all")
+ public static OptionalDouble mix(OptionalDouble optional1, OptionalDouble optional2) {
+ return optional1.isPresent() ? optional1 : optional2;
+ }
+
+ @SuppressWarnings("all")
+ public static OptionalInt mix(OptionalInt optional1, OptionalInt optional2) {
+ return optional1.isPresent() ? optional1 : optional2;
+ }
+
+ @SuppressWarnings("all")
+ public static OptionalLong mix(OptionalLong optional1, OptionalLong optional2) {
+ return optional1.isPresent() ? optional1 : optional2;
+ }
+
+ @SuppressWarnings("all")
+ public Optional<String> virtual(Optional<String> optional) {
+ return optional;
+ }
+
+ @SuppressWarnings("all")
+ public String virtualString(Optional<String> optional) {
+ return optional.get();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/BasicTimeConversionTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/BasicTimeConversionTest.java
index e82ae21..0d67136 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/BasicTimeConversionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/conversionTests/BasicTimeConversionTest.java
@@ -34,7 +34,7 @@
L8Command.Builder l8Builder =
L8Command.builder(diagnosticsHandler)
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.P))
- .addProgramFiles(getTimeConversionClasses())
+ .addProgramFiles(getConversionClasses())
.addDesugaredLibraryConfiguration(
StringResource.fromFile(ToolHelper.DESUGAR_LIB_JSON_FOR_TESTING))
.setMinApiLevel(AndroidApiLevel.B.getLevel())
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json b/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
index 350767c..11179f5 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
@@ -20,6 +20,7 @@
{
"api_level_below_or_equal": 23,
"rewrite_prefix": {
+ "j$.util.Optional": "java.util.Optional",
"java.util.stream.": "j$.util.stream.",
"java.util.function.": "j$.util.function.",
"java.util.Comparators": "j$.util.Comparators",
@@ -79,11 +80,7 @@
"java.time.Duration": "j$.time.TimeConversions",
"java.time.ZoneId": "j$.time.TimeConversions",
"java.time.MonthDay": "j$.time.TimeConversions",
- "java.time.Instant": "j$.time.TimeConversions",
- "java.util.Optional": "j$.util.OptionalConversions",
- "java.util.OptionalDouble": "j$.util.OptionalConversions",
- "java.util.OptionalInt": "j$.util.OptionalConversions",
- "java.util.OptionalLong": "j$.util.OptionalConversions"
+ "java.time.Instant": "j$.time.TimeConversions"
}
},
{
@@ -132,6 +129,12 @@
"java.util.SortedSet": "j$.util.SortedSet",
"java.util.Set": "j$.util.Set",
"java.util.concurrent.ConcurrentMap": "j$.util.concurrent.ConcurrentMap"
+ },
+ "custom_conversion": {
+ "java.util.Optional": "j$.util.OptionalConversions",
+ "java.util.OptionalDouble": "j$.util.OptionalConversions",
+ "java.util.OptionalInt": "j$.util.OptionalConversions",
+ "java.util.OptionalLong": "j$.util.OptionalConversions"
}
}
]
