From aa79fd483daff0db9be274c33de109257f8a6804 Mon Sep 17 00:00:00 2001 From: kmb Date: Thu, 8 Feb 2018 18:11:29 -0800 Subject: Stub default methods as needed for core library desugaring RELNOTES: None PiperOrigin-RevId: 185082719 --- .../build/android/desugar/CoreLibrarySupportTest.java | 17 +++++++++++++++++ .../android/desugar/DefaultMethodClassFixerTest.java | 1 + 2 files changed, 18 insertions(+) (limited to 'src/test') diff --git a/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java b/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java index 089e23174c..d52ef7821e 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java +++ b/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java @@ -74,6 +74,23 @@ public class CoreLibrarySupportTest { assertThat(support.renameCoreLibrary("com/google/X")).isEqualTo("com/google/X"); } + @Test + public void testIsEmulatedCoreClassOrInterface() throws Exception { + CoreLibrarySupport support = + new CoreLibrarySupport( + new CoreLibraryRewriter(""), + Thread.currentThread().getContextClassLoader(), + ImmutableList.of("java/util/concurrent/"), + ImmutableList.of("java/util/Map")); + assertThat(support.isEmulatedCoreClassOrInterface("java/util/Map")).isTrue(); + assertThat(support.isEmulatedCoreClassOrInterface("java/util/Map$$Lambda$17")).isFalse(); + assertThat(support.isEmulatedCoreClassOrInterface("java/util/Map$$CC")).isFalse(); + assertThat(support.isEmulatedCoreClassOrInterface("java/util/HashMap")).isTrue(); + assertThat(support.isEmulatedCoreClassOrInterface("java/util/concurrent/ConcurrentMap")) + .isFalse(); // false for renamed prefixes + assertThat(support.isEmulatedCoreClassOrInterface("com/google/Map")).isFalse(); + } + @Test public void testIsEmulatedCoreLibraryInvocation() throws Exception { CoreLibrarySupport support = diff --git a/src/test/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixerTest.java b/src/test/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixerTest.java index c74febb184..27083dbfeb 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixerTest.java +++ b/src/test/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixerTest.java @@ -102,6 +102,7 @@ public class DefaultMethodClassFixerTest { writer, classpathReader, DependencyCollector.NoWriteCollectors.FAIL_ON_MISSING, + /*coreLibrarySupport=*/ null, bootclassPath, classLoader); reader.accept(fixer, 0); -- cgit v1.2.3