Skip to content

Commit

Permalink
Change assertThat(Iterable<T>) to assertThat(Iterable<?>).
Browse files Browse the repository at this point in the history
Change assertThat(Multiset<E>) to assertThat(Multiset<?>).

See google#192
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=110310085
  • Loading branch information
kluever authored and cpovirk committed Dec 16, 2015
1 parent 5fa1f3c commit 77b825b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions core/src/main/java/com/google/common/truth/TestVerb.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ public StringSubject that(@Nullable String target) {
return new StringSubject(getFailureStrategy(), target);
}

// TODO(b/26080262): Remove the <T> type param
public <T> IterableSubject that(@Nullable Iterable<T> target) {
public IterableSubject that(@Nullable Iterable<?> target) {
return new IterableSubject(getFailureStrategy(), target);
}

Expand Down Expand Up @@ -169,8 +168,7 @@ public SetMultimapSubject that(@Nullable SetMultimap<?, ?> target) {
return new SetMultimapSubject(getFailureStrategy(), target);
}

// TODO(b/26080262): Remove the <E> type param
public <E> MultisetSubject that(@Nullable Multiset<E> target) {
public MultisetSubject that(@Nullable Multiset<?> target) {
return new MultisetSubject(getFailureStrategy(), target);
}

Expand Down
6 changes: 2 additions & 4 deletions core/src/main/java/com/google/common/truth/Truth.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ public static StringSubject assertThat(@Nullable String target) {
return assert_().that(target);
}

// TODO(b/26080262): Remove the <T> type param
public static <T> IterableSubject assertThat(@Nullable Iterable<T> target) {
public static IterableSubject assertThat(@Nullable Iterable<?> target) {
return assert_().that(target);
}

Expand Down Expand Up @@ -223,8 +222,7 @@ public static SetMultimapSubject assertThat(@Nullable SetMultimap<?, ?> target)
return assert_().that(target);
}

// TODO(b/26080262): Remove the <E> type param
public static <E> MultisetSubject assertThat(@Nullable Multiset<E> target) {
public static MultisetSubject assertThat(@Nullable Multiset<?> target) {
return assert_().that(target);
}

Expand Down

0 comments on commit 77b825b

Please sign in to comment.