Skip to content

Revert UriMatcher hamcrest changes. #2312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Nov 19, 2024
Merged

Revert UriMatcher hamcrest changes. #2312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static Matcher<Uri> hasParamWithValue(
checkNotNull(paramName);
checkNotNull(paramVal);
final Matcher<QueryParamEntry> qpe = queryParamEntry(paramName, paramVal);
final Matcher<Iterable<? extends QueryParamEntry>> matcherImpl = hasItem(qpe);
final Matcher<Iterable<? super QueryParamEntry>> matcherImpl = hasItem(qpe);

return new TypeSafeMatcher<Uri>() {

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

private static Matcher<QueryParamEntry> queryParamEntry(
final Matcher<String> paramName, final Matcher<String> paramVal) {
final Matcher<Iterable<? extends String>> valMatcher = hasItem(paramVal);
final Matcher<Iterable<? super String>> valMatcher = hasItem(paramVal);

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

Expand Down
Loading