Revert changes to missing interface tests.
These changes are reverts of https://r8-review.googlesource.com/c/r8/+/62738
The interface desugaring should never warn on the virtual invoke
which was fixed with https://r8-review.googlesource.com/c/r8/+/62921
Bug: 199815247
Change-Id: I69d8586969f6b250fae90dd9bb5b749f753aabec
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
index a0838e8..1269b34 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.desugar;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.D8TestBuilder;
@@ -79,10 +78,8 @@
InterfaceDesugarMissingTypeDiagnostic desugarWarning = (InterfaceDesugarMissingTypeDiagnostic) diagnostic;
assertEquals(
Reference.classFromClass(MissingInterface.class), desugarWarning.getMissingType());
- // The type is both missing from the interface referenced invoke and from the implements.
- // The diagnostics should likely include all contexts akin to the R8 missing types.
- assertEquals(Reference.classFromClass(TestClass.class), desugarWarning.getContextType());
- assertNotEquals(Position.UNKNOWN, desugarWarning.getPosition());
+ assertEquals(Reference.classFromClass(MyClass.class), desugarWarning.getContextType());
+ assertEquals(Position.UNKNOWN, desugarWarning.getPosition());
}
}
}
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
index bd50527..875ead2 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
@@ -3,10 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.desugar;
-import static com.android.tools.r8.references.Reference.classFromClass;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.D8TestBuilder;
@@ -19,6 +16,7 @@
import com.android.tools.r8.errors.DesugarDiagnostic;
import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
import com.android.tools.r8.position.Position;
+import com.android.tools.r8.references.Reference;
import com.android.tools.r8.synthesis.SyntheticItemsTestUtils;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.StringUtils;
@@ -77,12 +75,12 @@
assertTrue(diagnostic instanceof DesugarDiagnostic);
assertTrue(diagnostic instanceof InterfaceDesugarMissingTypeDiagnostic);
InterfaceDesugarMissingTypeDiagnostic desugarWarning = (InterfaceDesugarMissingTypeDiagnostic) diagnostic;
- assertEquals(classFromClass(MissingInterface.class), desugarWarning.getMissingType());
- // TODO(b/132671303): The diagnostics should also contain the lambda context, but it should
- // not be the synthesized lambda class.
- assertFalse(SyntheticItemsTestUtils.isInternalLambda(desugarWarning.getContextType()));
- assertEquals(classFromClass(TestClass.class), desugarWarning.getContextType());
- assertNotEquals(Position.UNKNOWN, desugarWarning.getPosition());
+ assertEquals(
+ Reference.classFromClass(MissingInterface.class), desugarWarning.getMissingType());
+ // TODO(b/132671303): The context class should not be the synthesized lambda class.
+ assertTrue(SyntheticItemsTestUtils.isInternalLambda(desugarWarning.getContextType()));
+ // TODO(b/132671303): The position info should be the method context.
+ assertEquals(Position.UNKNOWN, desugarWarning.getPosition());
}
}
}
