Skip to content

Commit

Permalink
Import hamcrest/JavaHamcrest from GitHub.
Browse files Browse the repository at this point in the history
The changes from `Iterable<? super Foo>` to `Iterable<? extends Foo>` are due to hamcrest/JavaHamcrest@242604a

#MIGRATION_3P_JAVA_HAMCREST__DEFAULT

  - 3fa841d91fb61beec6565c5deff3a1854c46301c Revert version to 3.0-SNAPSHOT by Joe Schmetzer <joe@exubero.com>
  - 4e2b71c59c0df5d6e21c7fed5ff78a07c11676b1 Add instructions for releasing to Maven Central by Joe Schmetzer <joe@exubero.com>
  - 1adc3517d51b8a4691a69412778bde125ec04365 Fix javadoc title by Joe Schmetzer <joe@exubero.com>
  - 68984b85e869df6a888fffcad87e4b676a8fc0ac Version 3.0 by Joe Schmetzer <joe@exubero.com>
  - ca4dcfb28f04233f0e5747179e4572a62b980c4f Update CHANGES.md for v3.0 by Joe Schmetzer <joe@exubero.com>
  - e4c5bdd4b5faef05c2e4fa17971b18302be55a30 Version 3.1-SNAPSHOT by Joe Schmetzer <joe@exubero.com>
  - 21a05292a873c87424d7a3aca94a40babc899bc7 Javadoc cleanup (#420) by Joe Schmetzer <joe@exubero.com>
  - 6bb90de5c5e114f58d862ed2ad336671c7f50fc1 Regenerate javadoc in documentation by Joe Schmetzer <joe@exubero.com>
  - 3019f1bee22f9666f89ce286a1a1facc3c8eba7f Optional matchers (#421) by Sergey Chernov <serega.morph@gmail.com>
  - 01c776cc62189c26764e73f1a7c9ae813420a53f Fill in missing javadoc for Optional matchers by Joe Schmetzer <joe@exubero.com>
  - b943810ea32c72d4ae94488e76be8318eaa3239d Derive version from git (#419) by Joe Schmetzer <joe@exubero.com>
  - d11ad94270f0ecba4f5cdd3f84d084109e1eac58 Update CHANGES.md by Joe Schmetzer <joe@exubero.com>
  - 242604acb03f0a5f70d2181e21aa59800676e976 Allow matching against polymorphic collections (#422) by Joe Schmetzer <joe@exubero.com>
  - 246967c4c9b5f2de07a306bb63a803c2cb7eb4df Upgrade gradle version 8.9 -> 8.10.1 by Joe Schmetzer <joe@exubero.com>
  - 581d6ba465a4505f35bbfd45424961f1da979e3a Migrate all tests to JUnit Jupiter (#424) by Joe Schmetzer <joe@exubero.com>
  - 1bed2f5ff82cee0760c9dc508230c0d5ac7ce295 Bump org.junit.jupiter:junit-jupiter from 5.11.2 to 5.11.... by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  - 1e4230f1424a85cbc5e64cce1dbf08acb7fa0aa8 Add matcher for thrown exceptions in `Runnable` (#423) by Guillermo Gutiérrez <ggalmazor@gmail.com>
  - ff2c25bbfca623b2ffe27965cbe2d2ad00c36a04 Matchers.throwsException will return interface by Joe Schmetzer <joe@exubero.com>
  - 544a4cf4cf98e9080c13722ea0c664d4ac5d6f29 Update changes with thrown exceptions by Joe Schmetzer <joe@exubero.com>
  - f0545a5189513ff2abdf226c061d18ac40e7510a Add throwsException matcher for throwable instance by Joe Schmetzer <joe@exubero.com>
  - 5dc01127c073923824c2202db1f1c85ea502a074 Restore public constructors for compatibility (#428) by Joe Schmetzer <joe@exubero.com>

PiperOrigin-RevId: 698081489
  • Loading branch information
cushon authored and copybara-androidxtest committed Nov 19, 2024
1 parent 9bb3ee6 commit 5f79d35
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ package androidx.test.espresso.intent {
method public static org.hamcrest.Matcher<android.content.Intent!>! anyPermission();
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermission(String!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<java.lang.String!>!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<? extends java.lang.String!>!>!);
field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
}

Expand Down Expand Up @@ -129,7 +129,7 @@ package androidx.test.espresso.intent.matcher {
method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String!>!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? extends java.lang.String!>!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static Matcher<Intent> hasCategories(Set<String> categories) {
}

public static Matcher<Intent> hasCategories(
final Matcher<? extends Iterable<? super String>> categoriesMatcher) {
final Matcher<? extends Iterable<? extends String>> categoriesMatcher) {
checkNotNull(categoriesMatcher);
return new TypeSafeMatcher<Intent>() {
@Override
Expand Down
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<? super QueryParamEntry>> matcherImpl = hasItem(qpe);
final Matcher<Iterable<? extends 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<? super String>> valMatcher = hasItem(paramVal);
final Matcher<Iterable<? extends String>> valMatcher = hasItem(paramVal);

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

Expand Down

0 comments on commit 5f79d35

Please sign in to comment.