Move NewCollectorTest to java 10 package
Bug: b/344503104
Change-Id: I696b7f7e105eb35cc4caebc3e81b1420d32b3ab6
diff --git a/src/test/examplesJava10/collectors/Main.java b/src/test/examplesJava10/collectors/Main.java
deleted file mode 100644
index a1b3d71..0000000
--- a/src/test/examplesJava10/collectors/Main.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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 collectors;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class Main {
-
- public static void main(String[] args) {
- Collector<Object, ?, List<Object>> filtering =
- Collectors.filtering(Objects::nonNull, Collectors.toList());
- System.out.println(Stream.of(null, 1).collect(filtering).get(0));
-
- Collector<List<?>, ?, List<Object>> collector =
- Collectors.flatMapping(Collection::stream, Collectors.toList());
- System.out.println(Stream.of(List.of(1)).collect(collector).get(0));
-
- Collector<Object, ?, List<Object>> toList = Collectors.toUnmodifiableList();
- System.out.println(Stream.of(1).collect(toList).get(0));
- Collector<Object, ?, Set<Object>> toSet = Collectors.toUnmodifiableSet();
- System.out.println(Stream.of(1).collect(toSet).iterator().next());
- Collector<Object, ?, Map<String, Integer>> toMap1 =
- Collectors.toUnmodifiableMap(Object::toString, Object::hashCode);
- System.out.println(Stream.of(1).collect(toMap1).keySet().iterator().next());
- Collector<Object, ?, Map<String, Integer>> toMap2 =
- Collectors.toUnmodifiableMap(Object::toString, Object::hashCode, (x, y) -> x);
- System.out.println(Stream.of(1).collect(toMap2).keySet().iterator().next());
- }
-}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/NewCollectorsTest.java b/src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.java
similarity index 73%
rename from src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/NewCollectorsTest.java
rename to src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.java
index 84e5f4b..b36cbd0 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/NewCollectorsTest.java
+++ b/src/test/examplesJava10/desugaredlibrary/NewCollectorsTest.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 com.android.tools.r8.desugar.desugaredlibrary.jdk11;
+package desugaredlibrary;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
@@ -13,7 +13,6 @@
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryTestBase;
import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
@@ -22,9 +21,14 @@
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.android.tools.r8.utils.codeinspector.MethodSubject;
import com.google.common.collect.ImmutableList;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -39,10 +43,7 @@
private final LibraryDesugaringSpecification libraryDesugaringSpecification;
private final CompilationSpecification compilationSpecification;
- private static final Path INPUT_JAR =
- Paths.get(ToolHelper.EXAMPLES_JAVA10_BUILD_DIR + "collectors.jar");
private static final String EXPECTED_OUTPUT = StringUtils.lines("1", "1", "1", "1", "1", "1");
- private static final String MAIN_CLASS = "collectors.Main";
@Parameters(name = "{0}, spec: {1}, {2}")
public static List<Object[]> data() {
@@ -64,16 +65,16 @@
@Test
public void test() throws Throwable {
testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
- .addProgramFiles(INPUT_JAR)
- .addKeepMainRule(MAIN_CLASS)
+ .addInnerClassesAndStrippedOuter(getClass())
+ .addKeepMainRule(Main.class)
.compile()
.inspect(this::assertCollectors)
- .run(parameters.getRuntime(), MAIN_CLASS)
+ .run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
private void assertCollectors(CodeInspector inspector) {
- MethodSubject methodSubject = inspector.clazz(MAIN_CLASS).mainMethod();
+ MethodSubject methodSubject = inspector.clazz(Main.class).mainMethod();
assertTrue(methodSubject.isPresent());
if (libraryDesugaringSpecification.hasEmulatedInterfaceDesugaring(parameters)) {
// Collectors is not present, all calls to the j$ version.
@@ -105,4 +106,28 @@
.anyMatch(
i -> i.isInvokeStatic() && i.getMethod().getHolderType().toString().equals(holder));
}
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ Collector<Object, ?, List<Object>> filtering =
+ Collectors.filtering(Objects::nonNull, Collectors.toList());
+ System.out.println(Stream.of(null, 1).collect(filtering).get(0));
+
+ Collector<List<?>, ?, List<Object>> collector =
+ Collectors.flatMapping(Collection::stream, Collectors.toList());
+ System.out.println(Stream.of(List.of(1)).collect(collector).get(0));
+
+ Collector<Object, ?, List<Object>> toList = Collectors.toUnmodifiableList();
+ System.out.println(Stream.of(1).collect(toList).get(0));
+ Collector<Object, ?, Set<Object>> toSet = Collectors.toUnmodifiableSet();
+ System.out.println(Stream.of(1).collect(toSet).iterator().next());
+ Collector<Object, ?, Map<String, Integer>> toMap1 =
+ Collectors.toUnmodifiableMap(Object::toString, Object::hashCode);
+ System.out.println(Stream.of(1).collect(toMap1).keySet().iterator().next());
+ Collector<Object, ?, Map<String, Integer>> toMap2 =
+ Collectors.toUnmodifiableMap(Object::toString, Object::hashCode, (x, y) -> x);
+ System.out.println(Stream.of(1).collect(toMap2).keySet().iterator().next());
+ }
+ }
}
