opendev/gerrit
Code Issues Proposed changes

Fix build failure with Bazel 0.5rc3.

Browse Source 
both method assertThat(Iterable<?>) in Truth and method <T>assertThat(T) in Truth match
  where T is a type-variable:
    T extends Comparable<?> declared in method <T>assertThat(T)

Change-Id: I8a938ace1917d867efd59c6e43ecaf8a7998dafc
(cherry picked from commit cb074f917f)
This commit is contained in:
Han-Wen Nienhuys 2017-05-09 13:42:13 +02:00 committed by Paladox none
parent 2c7ffa796c
commit 9fff29bdef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@ -872,9 +872,9 @@ public class AccountIT extends AbstractDaemonTest {
return new String(out.toByteArray(), UTF_8);
}
@SuppressWarnings({"unchecked", "rawtypes"})
private static void assertIteratorSize(int size, Iterator it) {
assertThat(ImmutableList.copyOf(it)).hasSize(size);
private static void assertIteratorSize(int size, Iterator<?> it) {
List<?> lst = ImmutableList.copyOf(it);
assertThat(lst).hasSize(size);
}
private static void assertKeyMapContains(TestKey expected, Map<String, GpgKeyInfo> actualMap) {