Upgrade bazlets to latest master to build with 3.0.0-SNAPSHOT API
Also adapt to new TestAccount AutoValue class and newIdent method.
Change-Id: I860350a1aec3f2e9f566787e19d624567191911c
diff --git a/WORKSPACE b/WORKSPACE
index 3937170..a4f713e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "279d12d33bd17dd49951146186f3d17f50fdc919",
+ commit = "f3b3eecf061193e8909298bc9c35027df3bf9d44",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersConfigIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersConfigIT.java
index 45572ca..4356b90 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersConfigIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersConfigIT.java
@@ -57,7 +57,7 @@
cfg.setString(SECTION_FILTER, BRANCH_MAIN, KEY_REVIEWER, JANE_DOE);
pushFactory
- .create(admin.getIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
+ .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
@@ -77,7 +77,7 @@
pushFactory
.create(
- admin.getIdent(),
+ admin.newIdent(),
testRepo,
"Add reviewers parent project",
FILENAME,
@@ -96,7 +96,7 @@
pushFactory
.create(
- admin.getIdent(), childTestRepo, "Add reviewers child project", FILENAME, cfg.toText())
+ admin.newIdent(), childTestRepo, "Add reviewers child project", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
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 55bc67e..a08c412 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
@@ -53,10 +53,11 @@
TestAccount user2 = accountCreator.user2();
Config cfg = new Config();
- cfg.setStringList(SECTION_FILTER, "*", KEY_REVIEWER, ImmutableList.of(user.email, user2.email));
+ cfg.setStringList(
+ SECTION_FILTER, "*", KEY_REVIEWER, ImmutableList.of(user.email(), user2.email()));
pushFactory
- .create(admin.getIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
+ .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
@@ -79,7 +80,8 @@
} while (reviewers == null);
assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(admin.id.get(), user.id.get(), user2.id.get()));
+ .containsExactlyElementsIn(
+ ImmutableSet.of(admin.id().get(), user.id().get(), user2.id().get()));
}
@Test
@@ -88,11 +90,11 @@
TestAccount user2 = accountCreator.user2();
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));
+ cfg.setStringList(SECTION_FILTER, "*", KEY_REVIEWER, ImmutableList.of(user.email()));
+ cfg.setStringList(SECTION_FILTER, "^a.txt", KEY_REVIEWER, ImmutableList.of(user2.email()));
pushFactory
- .create(admin.getIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
+ .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
@@ -115,7 +117,8 @@
} while (reviewers == null);
assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(admin.id.get(), user.id.get(), user2.id.get()));
+ .containsExactlyElementsIn(
+ ImmutableSet.of(admin.id().get(), user.id().get(), user2.id().get()));
}
@Test
@@ -123,10 +126,10 @@
RevCommit oldHead = getRemoteHead();
Config cfg = new Config();
- cfg.setString(SECTION_FILTER, "branch:master", KEY_REVIEWER, user.email);
+ cfg.setString(SECTION_FILTER, "branch:master", KEY_REVIEWER, user.email());
pushFactory
- .create(admin.getIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
+ .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
@@ -156,10 +159,10 @@
RevCommit oldHead = getRemoteHead();
Config cfg = new Config();
- cfg.setString(SECTION_FILTER, "branch:other-branch", KEY_REVIEWER, user.email);
+ cfg.setString(SECTION_FILTER, "branch:other-branch", KEY_REVIEWER, user.email());
pushFactory
- .create(admin.getIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
+ .create(admin.newIdent(), testRepo, "Add reviewers", FILENAME, cfg.toText())
.to(RefNames.REFS_CONFIG)
.assertOkStatus();
@@ -182,6 +185,6 @@
} while (reviewers == null && wait < 100);
assertThat(reviewers.stream().map(a -> a._accountId).collect(toSet()))
- .containsExactlyElementsIn(ImmutableSet.of(admin.id.get(), user.id.get()));
+ .containsExactlyElementsIn(ImmutableSet.of(admin.id().get(), user.id().get()));
}
}
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 4784b2c..185e4cd 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
@@ -44,10 +44,10 @@
public void testUploaderSkippedAsReviewer() throws Exception {
Set<Account.Id> reviewers =
resolver.resolve(
- Collections.singleton(user.email),
+ Collections.singleton(user.email()),
project,
change,
- gApi.accounts().id(user.id.get()).get());
+ gApi.accounts().id(user.id().get()).get());
assertThat(reviewers).isEmpty();
}
@@ -55,11 +55,11 @@
public void testAccountResolve() throws Exception {
Set<Account.Id> reviewers =
resolver.resolve(
- ImmutableSet.of(user.email, admin.email),
+ ImmutableSet.of(user.email(), admin.email()),
project,
change,
- gApi.accounts().id(admin.id.get()).get());
- assertThat(reviewers).containsExactly(user.id);
+ gApi.accounts().id(admin.id().get()).get());
+ assertThat(reviewers).containsExactly(user.id());
}
@Test
@@ -78,11 +78,11 @@
Set<Account.Id> reviewers =
resolver.resolve(
- ImmutableSet.of(system.email, group1, group2),
+ ImmutableSet.of(system.email(), group1, group2),
project,
change,
- gApi.accounts().id(admin.id.get()).get());
- assertThat(reviewers).containsExactly(system.id, foo.id, bar.id, baz.id, qux.id);
+ gApi.accounts().id(admin.id().get()).get());
+ assertThat(reviewers).containsExactly(system.id(), foo.id(), bar.id(), baz.id(), qux.id());
}
private TestAccount createTestAccount(String name, String group) throws Exception {
