diff options
Diffstat (limited to 'javatests/com/google/gerrit/acceptance/api')
5 files changed, 15 insertions, 61 deletions
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 83c180956c..775bfcf0a0 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -912,10 +912,7 @@ public class AccountIT extends AbstractDaemonTest { gApi.accounts().id(foo.id.hashCode()).addEmail(input); assertThat( - gApi.accounts() - .id(foo.id.get()) - .getEmails() - .stream() + gApi.accounts().id(foo.id.get()).getEmails().stream() .map(e -> e.email) .collect(toSet())) .containsExactly(email, secondaryEmail); @@ -2494,10 +2491,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(bgCounterA1.get()).isEqualTo(0); assertThat(bgCounterA2.get()).isEqualTo(0); assertThat( - gApi.accounts() - .id(accountId.get()) - .getExternalIds() - .stream() + gApi.accounts().id(accountId.get()).getExternalIds().stream() .map(i -> i.identity) .collect(toSet())) .containsExactly(extIdA1.key().get()); @@ -2527,10 +2521,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(updatedAccount.get().getExternalIds()).containsExactly(extIdB2); assertThat(accounts.get(accountId).get().getExternalIds()).containsExactly(extIdB2); assertThat( - gApi.accounts() - .id(accountId.get()) - .getExternalIds() - .stream() + gApi.accounts().id(accountId.get()).getExternalIds().stream() .map(i -> i.identity) .collect(toSet())) .containsExactly(extIdB2.key().get()); @@ -2757,11 +2748,7 @@ public class AccountIT extends AbstractDaemonTest { setApiUser(testAccount); for (ChangeInfo changeInfo : gApi.changes().query("has:draft").get()) { for (CommentInfo c : - gApi.changes() - .id(changeInfo.id) - .drafts() - .values() - .stream() + gApi.changes().id(changeInfo.id).drafts().values().stream() .flatMap(List::stream) .collect(toImmutableList())) { gApi.changes().id(changeInfo.id).revision(c.patchSet).draft(c.id).delete(); @@ -2849,9 +2836,7 @@ public class AccountIT extends AbstractDaemonTest { Iterable<String> expectedFps = expected.transform(k -> BaseEncoding.base16().encode(k.getPublicKey().getFingerprint())); Iterable<String> actualFps = - externalIds - .byAccount(currAccountId, SCHEME_GPGKEY) - .stream() + externalIds.byAccount(currAccountId, SCHEME_GPGKEY).stream() .map(e -> e.key().id()) .collect(toSet()); assertThat(actualFps).named("external IDs in database").containsExactlyElementsIn(expectedFps); diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index da513e90ba..be4b2e147d 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -3872,9 +3872,7 @@ public class ChangeIT extends AbstractDaemonTest { throws Exception { ChangeInfo c = gApi.changes().id(changeId).get(DETAILED_LABELS); Set<ReviewerState> states = - c.reviewers - .entrySet() - .stream() + c.reviewers.entrySet().stream() .filter(e -> e.getValue().stream().anyMatch(a -> a._accountId == accountId.get())) .map(Map.Entry::getKey) .collect(toSet()); diff --git a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java index 6c6ad3d23c..3b2df797c9 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java @@ -78,10 +78,7 @@ public class CheckProjectIT extends AbstractDaemonTest { CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(checkProjectInputForAutoCloseableCheck(branch)); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toList())) .containsExactly(change._number); @@ -106,10 +103,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.fix = true; CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(change._number); @@ -132,10 +126,7 @@ public class CheckProjectIT extends AbstractDaemonTest { CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(checkProjectInputForAutoCloseableCheck(branch)); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -159,10 +150,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.fix = true; CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -196,10 +184,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.maxCommits = 2; checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -233,10 +218,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.skipCommits = 1; checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java index 86908cbb97..b058d5e7bf 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -225,11 +225,7 @@ public class RevisionIT extends AbstractDaemonTest { setApiUser(admin); gApi.changes().id(changeId).reviewer(user.username).deleteVote("Code-Review"); Optional<ApprovalInfo> crUser = - get(changeId, DETAILED_LABELS) - .labels - .get("Code-Review") - .all - .stream() + get(changeId, DETAILED_LABELS).labels.get("Code-Review").all.stream() .filter(a -> a._accountId == user.id.get()) .findFirst(); assertThat(crUser).isPresent(); @@ -244,13 +240,7 @@ public class RevisionIT extends AbstractDaemonTest { revision(r).review(in); ApprovalInfo cr = - gApi.changes() - .id(changeId) - .get(DETAILED_LABELS) - .labels - .get("Code-Review") - .all - .stream() + gApi.changes().id(changeId).get(DETAILED_LABELS).labels.get("Code-Review").all.stream() .filter(a -> a._accountId == user.getId().get()) .findFirst() .get(); diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java index cd20765940..dfd25e25cb 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java @@ -1140,8 +1140,7 @@ public class RobotCommentsIT extends AbstractDaemonTest { private static List<String> getFixIds(List<RobotCommentInfo> robotComments) { assertThatList(robotComments).isNotNull(); - return robotComments - .stream() + return robotComments.stream() .map(robotCommentInfo -> robotCommentInfo.fixSuggestions) .filter(Objects::nonNull) .flatMap(List::stream) |