diff options
Diffstat (limited to 'gerrit-acceptance-tests/src/test/java/com/google/gerrit')
12 files changed, 16 insertions, 62 deletions
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 47ed515e38..e66257e33b 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -1946,9 +1946,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/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 1ee3582b7c..ce79a7c259 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -3643,9 +3643,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(e -> e.getKey()) .collect(toSet()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java index 41f6a671f1..99f4fef2b0 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -218,11 +218,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(); @@ -237,13 +233,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/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java index c440d9099c..27f8a2fac5 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/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) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 02d3802d84..420fc044a4 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -1756,9 +1756,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(getLastMessage(r.getChangeId())).isEqualTo("Uploaded patch set 3.\n\n(3 comments)"); List<String> messages = - sender - .getMessages() - .stream() + sender.getMessages().stream() .map(m -> m.body()) .sorted(Comparator.comparingInt(m -> m.contains("reexamine") ? 0 : 1)) .collect(toList()); @@ -1979,11 +1977,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { } private Collection<CommentInfo> getPublishedComments(String changeId) throws Exception { - return gApi.changes() - .id(changeId) - .comments() - .values() - .stream() + return gApi.changes().id(changeId).comments().values().stream() .flatMap(cs -> cs.stream()) .collect(toList()); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java index 6dad2c6da1..e5496c0a6d 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java @@ -71,11 +71,7 @@ public abstract class AbstractReindexTests extends StandaloneSiteTest { .containsExactly(adminId.get()); // Query group index assertThat( - gApi.groups() - .query("Group") - .withOption(MEMBERS) - .get() - .stream() + gApi.groups().query("Group").withOption(MEMBERS).get().stream() .flatMap(g -> g.members.stream()) .map(a -> a._accountId)) .containsExactly(adminId.get()); @@ -166,10 +162,7 @@ public abstract class AbstractReindexTests extends StandaloneSiteTest { private void assertWriteVersions(ServerContext ctx, Integer... expected) { assertThat( - ctx.getInjector() - .getInstance(ChangeIndexCollection.class) - .getWriteIndexes() - .stream() + ctx.getInjector().getInstance(ChangeIndexCollection.class).getWriteIndexes().stream() .map(i -> i.getSchema().getVersion())) .named("write versions") .containsExactlyElementsIn(ImmutableSet.copyOf(expected)); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java index cb0d768ef2..c5c864db82 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -464,8 +464,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest { List<TestAccount> expectedUsers, List<InternalGroup> expectedGroups) { List<Integer> actualAccountIds = - actual - .stream() + actual.stream() .filter(i -> i.account != null) .map(i -> i.account._accountId) .collect(toList()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java index 7cd9584a5a..86f375e119 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java @@ -36,8 +36,7 @@ public class KillTaskIT extends AbstractDaemonTest { r.consume(); Optional<String> id = - result - .stream() + result.stream() .filter(t -> "Log File Compressor".equals(t.command)) .map(t -> t.id) .findFirst(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java index 6fc9929ee1..620b448daa 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -959,9 +959,7 @@ public class CommentsIT extends AbstractDaemonTest { } private List<CommentInfo> getRevisionComments(String changeId, String revId) throws Exception { - return getPublishedComments(changeId, revId) - .values() - .stream() + return getPublishedComments(changeId, revId).values().stream() .flatMap(List::stream) .collect(toList()); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 79536a7633..6eaa16d288 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -1416,11 +1416,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest { CommentInfo draftInfo = putDraft(user, id, 1, "draft comment", null, Side.PARENT); putComment(user, id, 1, "published comment", null, Side.PARENT); CommentInfo commentInfo = - gApi.changes() - .id(id.get()) - .comments() - .values() - .stream() + gApi.changes().id(id.get()).comments().values().stream() .flatMap(List::stream) .findFirst() .get(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index f7204f3db8..6291447068 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -295,11 +295,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest { } private List<String> getMessages(Change.Id id) throws Exception { - return gApi.changes() - .id(id.get()) - .get(MESSAGES) - .messages - .stream() + return gApi.changes().id(id.get()).get(MESSAGES).messages.stream() .map(m -> m.message) .collect(toList()); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java index d81bf6b87c..01f3d19cc8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java @@ -270,8 +270,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { assert_().fail("expected read-only exception"); } catch (RestApiException e) { Optional<Throwable> oe = - Throwables.getCausalChain(e) - .stream() + Throwables.getCausalChain(e).stream() .filter(x -> x instanceof OrmRuntimeException) .findFirst(); assertThat(oe).named("OrmRuntimeException in causal chain of " + e).isPresent(); @@ -523,12 +522,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { } private List<Account.Id> getReviewers(Change.Id id) throws Exception { - return gApi.changes() - .id(id.get()) - .get() - .reviewers - .values() - .stream() + return gApi.changes().id(id.get()).get().reviewers.values().stream() .flatMap(Collection::stream) .map(a -> new Account.Id(a._accountId)) .collect(toList()); |