Remove checking of unknown origin in tests
Bug: 178172809
Change-Id: I5a33cf055a7d0e1ef05751910c7aebb92f829ba6
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
index af9f383..aede694 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
@@ -4,9 +4,6 @@
package com.android.tools.r8.desugar.constantdynamic;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
-import static com.android.tools.r8.DiagnosticsMatcher.diagnosticOrigin;
-import static com.android.tools.r8.OriginMatcher.hasParent;
-import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeTrue;
@@ -17,7 +14,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.cf.CfVersion;
-import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.StringUtils;
import java.io.IOException;
@@ -110,11 +106,9 @@
diagnostics -> {
diagnostics.assertOnlyErrors();
diagnostics.assertErrorsMatch(
- allOf(
- diagnosticMessage(
- containsString(
- "Unsupported dynamic constant (not desugaring)")),
- diagnosticOrigin(hasParent(Origin.unknown()))));
+ diagnosticMessage(
+ containsString(
+ "Unsupported dynamic constant (not desugaring)")));
}));
},
r ->
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
index 1f7b9d1..e1574f1 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
@@ -4,9 +4,6 @@
package com.android.tools.r8.desugar.constantdynamic;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
-import static com.android.tools.r8.DiagnosticsMatcher.diagnosticOrigin;
-import static com.android.tools.r8.OriginMatcher.hasParent;
-import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeTrue;
@@ -17,7 +14,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.cf.CfVersion;
-import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.StringUtils;
import java.io.IOException;
@@ -113,11 +109,9 @@
diagnostics -> {
diagnostics.assertOnlyErrors();
diagnostics.assertErrorsMatch(
- allOf(
- diagnosticMessage(
- containsString(
- "Unsupported dynamic constant (not desugaring)")),
- diagnosticOrigin(hasParent(Origin.unknown()))));
+ diagnosticMessage(
+ containsString(
+ "Unsupported dynamic constant (not desugaring)")));
}));
},
r ->
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
index 5ee0e8f..e0082a0 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
@@ -4,9 +4,6 @@
package com.android.tools.r8.desugar.constantdynamic;
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
-import static com.android.tools.r8.DiagnosticsMatcher.diagnosticOrigin;
-import static com.android.tools.r8.OriginMatcher.hasParent;
-import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeTrue;
@@ -17,7 +14,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestRuntime.CfVm;
import com.android.tools.r8.cf.CfVersion;
-import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.StringUtils;
import java.io.IOException;
@@ -112,11 +108,9 @@
diagnostics -> {
diagnostics.assertOnlyErrors();
diagnostics.assertErrorsMatch(
- allOf(
- diagnosticMessage(
- containsString(
- "Unsupported dynamic constant (not desugaring)")),
- diagnosticOrigin(hasParent(Origin.unknown()))));
+ diagnosticMessage(
+ containsString(
+ "Unsupported dynamic constant (not desugaring)")));
}));
},
r ->
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
index 2021777..355a5bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
@@ -70,10 +70,8 @@
diagnostics -> {
diagnostics.assertOnlyErrors();
diagnostics.assertErrorsMatch(
- allOf(
- diagnosticMessage(
- containsString("Unsupported dynamic constant (different owner)")),
- diagnosticOrigin(hasParent(Origin.unknown()))));
+ diagnosticMessage(
+ containsString("Unsupported dynamic constant (different owner)")));
}));
}
