Skip to content

Commit 470ac95

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Revert UriMatcher hamcrest changes.
They require a new external hamcrest release. PiperOrigin-RevId: 698144828
1 parent 5f79d35 commit 470ac95

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public static Matcher<Uri> hasParamWithValue(
182182
checkNotNull(paramName);
183183
checkNotNull(paramVal);
184184
final Matcher<QueryParamEntry> qpe = queryParamEntry(paramName, paramVal);
185-
final Matcher<Iterable<? extends QueryParamEntry>> matcherImpl = hasItem(qpe);
185+
final Matcher<Iterable<? super QueryParamEntry>> matcherImpl = hasItem(qpe);
186186

187187
return new TypeSafeMatcher<Uri>() {
188188

@@ -207,7 +207,7 @@ public void describeTo(Description description) {
207207

208208
private static Matcher<QueryParamEntry> queryParamEntry(
209209
final Matcher<String> paramName, final Matcher<String> paramVal) {
210-
final Matcher<Iterable<? extends String>> valMatcher = hasItem(paramVal);
210+
final Matcher<Iterable<? super String>> valMatcher = hasItem(paramVal);
211211

212212
return new TypeSafeMatcher<QueryParamEntry>(QueryParamEntry.class) {
213213

0 commit comments

Comments
 (0)