Fix test expectation for custom converted type
Fix red bots
Change-Id: Iff4398325a10c78e98bab7c5eff336b5cd941d61
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ExtractWrapperTypesTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ExtractWrapperTypesTest.java
index 4602235..08bfb99 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ExtractWrapperTypesTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ExtractWrapperTypesTest.java
@@ -233,10 +233,13 @@
specification.getWrappers().keySet().stream()
.map(DexType::toString)
.collect(Collectors.toSet());
- Set<String> customConversionsInSpec =
+ Set<String> customConversionsOnly =
specification.getCustomConversions().keySet().stream()
.map(DexType::toString)
.collect(Collectors.toSet());
+ // Some types are present both as custom conversions and wrappers, so that the custom conversion
+ // can catch some specific cases on top of the wrapper. We are not interested in those.
+ customConversionsOnly.removeAll(wrappersInSpec);
Set<String> maintainTypeInSet =
specification.getMaintainType().stream().map(DexType::toString).collect(Collectors.toSet());
Map<String, boolean[]> genericConversionsInSpec = new HashMap<>();
@@ -251,9 +254,6 @@
genericConversionsInSpec.put(method.toString(), indexes);
});
- assertEquals(
- Collections.emptySet(), Sets.intersection(wrappersInSpec, customConversionsInSpec));
-
CodeInspector nonDesugaredJar = new CodeInspector(ToolHelper.getAndroidJar(targetApi));
Set<DexEncodedMethod> genericDependencies = new HashSet<>();
Map<ClassReference, Set<MethodReference>> directWrappers =
@@ -261,7 +261,7 @@
desugaredApiJar,
preDesugarTypes,
nonDesugaredJar,
- customConversionsInSpec,
+ customConversionsOnly,
maintainTypeInSet,
genericConversionsInSpec,
genericDependencies);
@@ -270,7 +270,7 @@
directWrappers,
preDesugarTypes,
nonDesugaredJar,
- customConversionsInSpec,
+ customConversionsOnly,
maintainTypeInSet,
specification.getWrappers(),
genericConversionsInSpec,
