Merge branch 'stable-3.1'
* stable-3.1:
Upgrade bazlets to latest stable-2.16 to build with 2.16.18 API
Bump Bazel version to 3.1.0
Change-Id: I7e86337e7a381279c0578c5ef4195113cb8c44bc
diff --git a/WORKSPACE b/WORKSPACE
index db55f33..067d6c4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "fc1bfdf008c4b07e7cc4214fdacf25560276f9c4",
+ commit = "5c26af9e0374ede4cd67939be972adf6c4cda791",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
index 6d31562..592f9ca 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
@@ -23,21 +23,23 @@
import static com.googlesource.gerrit.plugins.reviewers.ReviewersConfig.SECTION_FILTER;
import static java.util.stream.Collectors.toSet;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.acceptance.TestPlugin;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.common.AccountInfo;
+import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.inject.Inject;
import java.util.Collection;
+import java.util.List;
+import java.util.Set;
import org.eclipse.jgit.lib.Config;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.junit.Before;
import org.junit.Test;
@NoHttpd
@@ -45,65 +47,62 @@
public class ReviewersIT extends LightweightPluginDaemonTest {
@Inject private ProjectOperations projectOperations;
- @Before
- public void setUp() throws Exception {
- fetch(testRepo, RefNames.REFS_CONFIG + ":refs/heads/config");
- testRepo.reset("refs/heads/config");
- }
-
@Test
public void addReviewers() throws Exception {
- RevCommit oldHead = projectOperations.project(project).getHead("master");
TestAccount user2 = accountCreator.user2();
-
- Config cfg = new Config();
- cfg.setStringList(
- SECTION_FILTER, "*", KEY_REVIEWER, ImmutableList.of(user.email(), user2.email()));
-
- pushFactory
- .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
- .to(RefNames.REFS_CONFIG)
- .assertOkStatus();
-
- testRepo.reset(oldHead);
+ setReviewerFilters(filter("*").reviewer(user).reviewer(user2));
String changeId = createChange().getChangeId();
-
- Collection<AccountInfo> reviewers;
- // Wait for 100 ms until the create patch set event
- // is processed by the reviewers plugin
- long wait = 0;
- do {
- reviewers = gApi.changes().id(changeId).get().reviewers.get(REVIEWER);
- if (reviewers == null) {
- Thread.sleep(10);
- wait += 10;
- if (wait > 100) {
- assertWithMessage("Timeout of 100 ms exceeded").fail();
- }
- }
- } while (reviewers == null);
-
- assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(user.id().get(), user2.id().get()));
+ assertThat(reviewersFor(changeId))
+ .containsExactlyElementsIn(ImmutableSet.of(user.id(), user2.id()));
}
@Test
public void addReviewersMatchMultipleSections() throws Exception {
- RevCommit oldHead = projectOperations.project(project).getHead("master");
TestAccount user2 = accountCreator.user2();
+ setReviewerFilters(filter("*").reviewer(user), filter("\"^a.txt\"").reviewer(user2));
+ String changeId = createChange().getChangeId();
+ assertThat(reviewersFor(changeId))
+ .containsExactlyElementsIn(ImmutableSet.of(user.id(), user2.id()));
+ }
+ @Test
+ public void doNotAddReviewersFromNonMatchingFilters() throws Exception {
+ setReviewerFilters(filter("branch:master").reviewer(user));
+ createBranch(BranchNameKey.create(project, "other-branch"));
+ // Create a change that matches the filter section.
+ createChange("refs/for/master");
+ // The actual change we want to test
+ String changeId = createChange("refs/for/other-branch").getChangeId();
+ assertNoReviewersAddedFor(changeId);
+ }
+
+ @Test
+ public void addReviewersFromMatchingFilters() throws Exception {
+ setReviewerFilters(filter("branch:other-branch").reviewer(user));
+ // Create a change that doesn't match the filter section.
+ createChange("refs/for/master");
+ // The actual change we want to test
+ createBranch(BranchNameKey.create(project, "other-branch"));
+ String changeId = createChange("refs/for/other-branch").getChangeId();
+ assertThat(reviewersFor(changeId)).containsExactlyElementsIn(ImmutableSet.of(user.id()));
+ }
+
+ private void setReviewerFilters(Filter... filters) throws Exception {
+ fetch(testRepo, RefNames.REFS_CONFIG + ":refs/heads/config");
+ testRepo.reset("refs/heads/config");
Config cfg = new Config();
- cfg.setStringList(SECTION_FILTER, "*", KEY_REVIEWER, ImmutableList.of(user.email()));
- cfg.setStringList(SECTION_FILTER, "^a.txt", KEY_REVIEWER, ImmutableList.of(user2.email()));
-
+ for (Filter f : filters) {
+ cfg.setStringList(SECTION_FILTER, f.filter, KEY_REVIEWER, f.reviewers);
+ }
pushFactory
.create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
+ testRepo.reset(projectOperations.project(project).getHead("master"));
+ }
- testRepo.reset(oldHead);
- String changeId = createChange().getChangeId();
-
+ private Set<Account.Id> reviewersFor(String changeId)
+ throws RestApiException, InterruptedException {
Collection<AccountInfo> reviewers;
// Wait for 100 ms until the create patch set event
// is processed by the reviewers plugin
@@ -118,33 +117,11 @@
}
}
} while (reviewers == null);
-
- assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(user.id().get(), user2.id().get()));
+ return reviewers.stream().map(a -> Account.id(a._accountId)).collect(toSet());
}
- @Test
- public void doNotAddReviewersFromNonMatchingFilters() throws Exception {
- RevCommit oldHead = projectOperations.project(project).getHead("master");
-
- Config cfg = new Config();
- cfg.setString(SECTION_FILTER, "branch:master", KEY_REVIEWER, user.email());
-
- pushFactory
- .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
- .to(RefNames.REFS_CONFIG)
- .assertOkStatus();
-
- testRepo.reset(oldHead);
-
- createBranch(BranchNameKey.create(project, "other-branch"));
-
- // Create a change that matches the filter section.
- createChange("refs/for/master");
-
- // The actual change we want to test
- String changeId = createChange("refs/for/other-branch").getChangeId();
-
+ private void assertNoReviewersAddedFor(String changeId)
+ throws InterruptedException, RestApiException {
Collection<AccountInfo> reviewers;
long wait = 0;
do {
@@ -156,37 +133,22 @@
assertThat(reviewers).isNull();
}
- @Test
- public void addReviewersFromMatchingFilters() throws Exception {
- RevCommit oldHead = projectOperations.project(project).getHead("master");
+ private Filter filter(String filter) {
+ return new Filter(filter);
+ }
- Config cfg = new Config();
- cfg.setString(SECTION_FILTER, "branch:other-branch", KEY_REVIEWER, user.email());
+ private class Filter {
+ List<String> reviewers;
+ String filter;
- pushFactory
- .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
- .to(RefNames.REFS_CONFIG)
- .assertOkStatus();
+ Filter(String filter) {
+ this.filter = filter;
+ this.reviewers = Lists.newArrayList();
+ }
- testRepo.reset(oldHead);
-
- createBranch(BranchNameKey.create(project, "other-branch"));
-
- // Create a change that doesn't match the filter section.
- createChange("refs/for/master");
-
- // The actual change we want to test
- String changeId = createChange("refs/for/other-branch").getChangeId();
-
- Collection<AccountInfo> reviewers;
- long wait = 0;
- do {
- Thread.sleep(10);
- wait += 10;
- reviewers = gApi.changes().id(changeId).get().reviewers.get(REVIEWER);
- } while (reviewers == null && wait < 100);
-
- assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(user.id().get()));
+ Filter reviewer(TestAccount reviewer) {
+ reviewers.add(reviewer.email());
+ return this;
+ }
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
index 38f367d..afb520c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
@@ -87,6 +87,6 @@
private TestAccount createTestAccount(String name, String group) throws Exception {
name = name(name);
- return accountCreator.create(name, name + "@example.com", name + " full name", group);
+ return accountCreator.create(name, name + "@example.com", name + " full name", null, group);
}
}
