Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Do not reject commit upon connectivity problems
Change-Id: I5f72c9b38980c1979d92df3b3a7f17f42d4807f8
diff --git a/WORKSPACE b/WORKSPACE
index 60d9408..8308b76 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "c2227415d5044f8439bd47edffb0f052f8da2ac5",
+ commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
# local_path = "/home/<user>/projects/bazlets",
)
# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Release Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
# Load snapshot Plugin API
-#gerrit_api_maven_local()
+gerrit_api_maven_local()
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
index 6a5eda4..08f73c5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
@@ -17,10 +17,10 @@
import static java.util.stream.Collectors.toList;
import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.Project.NameKey;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
-import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsFacadeFactory.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsFacadeFactory.java
index 4e2f035..b4cad31 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsFacadeFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsFacadeFactory.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.its.base.its;
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
/* An interface to get server information from child its-plugin embedded in the ItsFacade implementation */
public interface ItsFacadeFactory {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/SingleItsServer.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/SingleItsServer.java
index 08bfe62..dc0a79f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/SingleItsServer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/SingleItsServer.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.its.base.its;
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
import com.google.inject.Inject;
/* An ItsServer implementation that should be bound
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/CommitMessageFetcher.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/CommitMessageFetcher.java
index 7049e51..b34bd55 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/CommitMessageFetcher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/CommitMessageFetcher.java
@@ -1,6 +1,6 @@
package com.googlesource.gerrit.plugins.its.base.util;
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import java.io.IOException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java
index cb577c5..44611fe 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java
@@ -5,12 +5,12 @@
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.RevisionInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.inject.ImplementedBy;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.its.base.its.ItsConfig;
@@ -47,7 +47,7 @@
try {
ChangeInfo info =
gApi.changes()
- .id(patchSetId.getParentKey().get())
+ .id(patchSetId.changeId().get())
.get(EnumSet.of(ListChangesOption.ALL_REVISIONS));
for (Map.Entry<String, RevisionInfo> e : info.revisions.entrySet()) {
if (e.getValue()._number == patchSetId.get()) {
@@ -235,8 +235,7 @@
if (patchSetId != null) {
Map<String, Set<String>> previous = Maps.newHashMap();
if (patchSetId.get() != 1) {
- PatchSet.Id previousPatchSetId =
- new PatchSet.Id(patchSetId.getParentKey(), patchSetId.get() - 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(patchSetId.changeId(), patchSetId.get() - 1);
String previousPatchSet = db.getRevision(previousPatchSetId);
if (previousPatchSet != null) {
previous = getIssueIds(projectName, previousPatchSet);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractor.java
index 734582a..df7c3d9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractor.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.its.base.util;
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.its.base.its.ItsConfig;
import java.util.Optional;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
index f1b2c0d..d05e541 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
@@ -15,7 +15,7 @@
package com.googlesource.gerrit.plugins.its.base.util;
import com.google.common.collect.ImmutableMap;
-import com.google.gerrit.reviewdb.client.RefNames;
+import com.google.gerrit.entities.RefNames;
import com.google.gerrit.server.data.AccountAttribute;
import com.google.gerrit.server.data.ApprovalAttribute;
import com.google.gerrit.server.data.ChangeAttribute;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
index 0a1bfd1..926db56 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
@@ -14,9 +14,9 @@
package com.googlesource.gerrit.plugins.its.base.util;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.data.ApprovalAttribute;
import com.google.gerrit.server.data.ChangeAttribute;
import com.google.gerrit.server.data.PatchSetAttribute;
@@ -70,7 +70,7 @@
*/
private PatchSet.Id newPatchSetId(String changeId, String patchId) {
try {
- return new PatchSet.Id(new Change.Id(Integer.parseInt(changeId)), Integer.parseInt(patchId));
+ return PatchSet.id(Change.id(Integer.parseInt(changeId)), Integer.parseInt(patchId));
} catch (NumberFormatException e) {
return null;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateComment.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateComment.java
index b0c9e39..def8f4f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateComment.java
@@ -15,8 +15,8 @@
package com.googlesource.gerrit.plugins.its.base.validation;
import com.google.common.collect.Lists;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.events.CommitReceivedEvent;
import com.google.gerrit.server.git.validators.CommitValidationException;
import com.google.gerrit.server.git.validators.CommitValidationListener;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutor.java
index 33e82ae..b8682ad 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutor.java
@@ -14,9 +14,9 @@
package com.googlesource.gerrit.plugins.its.base.workflow;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.registration.PluginName;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
import com.googlesource.gerrit.plugins.its.base.its.ItsFacadeFactory;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheImpl.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheImpl.java
index 14307a0..72fe43f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheImpl.java
@@ -17,9 +17,9 @@
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.cache.CacheModule;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheRefresher.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheRefresher.java
index 4cbd3d2..6d19849 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheRefresher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheRefresher.java
@@ -1,10 +1,10 @@
package com.googlesource.gerrit.plugins.its.base.workflow;
+import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.reviewdb.client.RefNames;
import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/templates/Documentation/build.md b/src/main/templates/Documentation/build.md
index 6dd56fa..9e12cb5 100644
--- a/src/main/templates/Documentation/build.md
+++ b/src/main/templates/Documentation/build.md
@@ -16,7 +16,7 @@
The output is created in
```
- bazel-genfiles/its-base.jar
+ bazel-bin/its-base.jar
```
To execute the tests run:
@@ -52,7 +52,7 @@
The output is created in
```
- bazel-genfiles/plugins/its-base/its-base.jar
+ bazel-bin/plugins/its-base/its-base.jar
```
This project can be imported into the Eclipse IDE:
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
index 1a147c7..92eb61f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
@@ -18,9 +18,9 @@
import static org.easymock.EasyMock.expect;
import com.google.common.base.Suppliers;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
@@ -53,10 +53,8 @@
String enabled, String itsProject, String parentEnabled, String[] branches) {
ProjectState projectState = createMock(ProjectState.class);
- expect(projectCache.get(new Project.NameKey("testProject"))).andReturn(projectState).anyTimes();
- expect(projectCache.get(new Project.NameKey("parentProject")))
- .andReturn(projectState)
- .anyTimes();
+ expect(projectCache.get(Project.nameKey("testProject"))).andReturn(projectState).anyTimes();
+ expect(projectCache.get(Project.nameKey("parentProject"))).andReturn(projectState).anyTimes();
Iterable<ProjectState> parents;
if (parentEnabled == null) {
@@ -114,7 +112,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -126,7 +124,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -138,7 +136,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -150,7 +148,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -162,7 +160,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -174,7 +172,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -186,7 +184,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -198,7 +196,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -210,7 +208,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -222,7 +220,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -234,7 +232,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -246,7 +244,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -258,7 +256,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -270,7 +268,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertFalse(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -282,7 +280,7 @@
replayMocks();
- Project.NameKey projectNK = new Project.NameKey("testProject");
+ Project.NameKey projectNK = Project.nameKey("testProject");
assertTrue(itsConfig.isEnabled(projectNK, "refs/heads/testBranch"));
}
@@ -491,7 +489,7 @@
replayMocks();
- assertFalse(itsConfig.getItsProjectName(new Project.NameKey("testProject")).isPresent());
+ assertFalse(itsConfig.getItsProjectName(Project.nameKey("testProject")).isPresent());
}
public void testGetItsProjectConfigured() {
@@ -502,8 +500,7 @@
replayMocks();
- Optional<String> itsProjectName =
- itsConfig.getItsProjectName(new Project.NameKey("testProject"));
+ Optional<String> itsProjectName = itsConfig.getItsProjectName(Project.nameKey("testProject"));
assertTrue(itsProjectName.isPresent());
assertEquals("itsProject", itsProjectName.get());
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
index b1d98e2..8256873 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
@@ -15,10 +15,10 @@
package com.googlesource.gerrit.plugins.its.base.testutil;
import com.google.common.collect.Lists;
-import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.Project;
import com.googlesource.gerrit.plugins.its.base.testutil.log.LogUtil;
import java.sql.Timestamp;
import java.util.Iterator;
@@ -29,9 +29,9 @@
public abstract class LoggingMockingTestCase extends MockingTestCase {
protected final Change.Key testChangeKey =
- new Change.Key("Ic19f7bf6c8b4685c363a8204c32d827ffda52ec0");
- protected final Change.Id testChangeId = new Change.Id(1);
- protected final Account.Id testAccountId = new Account.Id(1);
+ Change.key("Ic19f7bf6c8b4685c363a8204c32d827ffda52ec0");
+ protected final Change.Id testChangeId = Change.id(1);
+ protected final Account.Id testAccountId = Account.id(1);
private java.util.Collection<LoggingEvent> loggedEvents;
@@ -115,7 +115,7 @@
testChangeKey,
testChangeId,
testAccountId,
- new Branch.NameKey(new Project.NameKey(project), branch),
+ BranchNameKey.create(Project.nameKey(project), branch),
new Timestamp(System.currentTimeMillis()));
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractorTest.java
index 80cbfd3..ff5d165 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractorTest.java
@@ -17,10 +17,9 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.client.RevId;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.googlesource.gerrit.plugins.its.base.its.ItsConfig;
@@ -36,7 +35,7 @@
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({PatchSet.class, RevId.class})
+@PrepareForTest({PatchSet.class})
public class IssueExtractorTest extends LoggingMockingTestCase {
private Injector injector;
private ItsConfig itsConfig;
@@ -754,7 +753,7 @@
replayMocks();
- PatchSet.Id patchSetId = new PatchSet.Id(new Change.Id(4), 1);
+ PatchSet.Id patchSetId = PatchSet.id(Change.id(4), 1);
IssueExtractor issueExtractor = injector.getInstance(IssueExtractor.class);
Map<String, Set<String>> actual =
issueExtractor.getIssueIds(
@@ -781,7 +780,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(1).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -814,7 +813,7 @@
.andReturn("bug#42\n" + "\n" + "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(db.getRevision(previousPatchSetId))
.andReturn("9876543211987654321298765432139876543214");
@@ -825,7 +824,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -863,7 +862,7 @@
.andReturn("bug#42\n" + "\n" + "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(
commitMessageFetcher.fetchGuarded(
"testProject", "9876543211987654321298765432139876543214"))
@@ -874,7 +873,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -912,7 +911,7 @@
.andReturn("bug#42\n" + "\n" + "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(
commitMessageFetcher.fetchGuarded(
"testProject", "9876543211987654321298765432139876543214"))
@@ -927,7 +926,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -969,7 +968,7 @@
+ "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(
commitMessageFetcher.fetchGuarded(
"testProject", "9876543211987654321298765432139876543214"))
@@ -980,7 +979,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -1027,7 +1026,7 @@
+ "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(
commitMessageFetcher.fetchGuarded(
"testProject", "9876543211987654321298765432139876543214"))
@@ -1042,7 +1041,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
@@ -1097,7 +1096,7 @@
+ "Change-Id: I1234567891123456789212345678931234567894");
// Call for previous patch set
- PatchSet.Id previousPatchSetId = new PatchSet.Id(changeId, 1);
+ PatchSet.Id previousPatchSetId = PatchSet.id(changeId, 1);
expect(
commitMessageFetcher.fetchGuarded(
"testProject", "9876543211987654321298765432139876543214"))
@@ -1113,7 +1112,7 @@
PatchSet.Id currentPatchSetId = createMock(PatchSet.Id.class);
expect(currentPatchSetId.get()).andReturn(2).anyTimes();
- expect(currentPatchSetId.getParentKey()).andReturn(changeId).anyTimes();
+ expect(currentPatchSetId.changeId()).andReturn(changeId).anyTimes();
replayMocks();
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractorTest.java
index 0aecd05..48bac21 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/ItsProjectExtractorTest.java
@@ -16,8 +16,8 @@
import static org.easymock.EasyMock.expect;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.googlesource.gerrit.plugins.its.base.its.ItsConfig;
@@ -35,7 +35,7 @@
public void test() {
ItsProjectExtractor projectExtractor = injector.getInstance(ItsProjectExtractor.class);
- expect(itsConfig.getItsProjectName(new Project.NameKey(PROJECT)))
+ expect(itsConfig.getItsProjectName(Project.nameKey(PROJECT)))
.andReturn(Optional.of(ITS_PROJECT))
.once();
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java
index df88c2f..1180118 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java
@@ -17,9 +17,9 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.Change.Status;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.Change.Status;
import com.google.gerrit.server.data.AccountAttribute;
import com.google.gerrit.server.data.ApprovalAttribute;
import com.google.gerrit.server.data.ChangeAttribute;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
index 33e8aa6..09e7fc4 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
@@ -19,12 +19,12 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.PatchSet;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.Project.NameKey;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
import com.google.gerrit.server.data.AccountAttribute;
import com.google.gerrit.server.data.ApprovalAttribute;
import com.google.gerrit.server.data.ChangeAttribute;
@@ -368,7 +368,7 @@
issueMap.put("4711", Sets.newHashSet("body", "anywhere"));
issueMap.put("42", Sets.newHashSet("footer", "anywhere"));
if (withRevision) {
- PatchSet.Id patchSetId = new PatchSet.Id(new Change.Id(176), 3);
+ PatchSet.Id patchSetId = PatchSet.id(Change.id(176), 3);
expect(issueExtractor.getIssueIds("testProject", "testRevision", patchSetId))
.andReturn(issueMap);
} else {
@@ -438,7 +438,7 @@
@Override
public NameKey getProjectNameKey() {
- return new Project.NameKey("testProject");
+ return Project.nameKey("testProject");
}
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateCommentTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateCommentTest.java
index 666d463..e03b69f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateCommentTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/validation/ItsValidateCommentTest.java
@@ -13,11 +13,13 @@
// limitations under the License.
package com.googlesource.gerrit.plugins.its.base.validation;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.easymock.EasyMock.expect;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.events.CommitReceivedEvent;
import com.google.gerrit.server.git.validators.CommitValidationException;
@@ -48,7 +50,7 @@
private ItsConfig itsConfig;
private ItsFacadeFactory itsFacadeFactory;
- private Project project = new Project(new Project.NameKey("myProject"));
+ private Project project = new Project(Project.nameKey("myProject"));
public void testOptional() throws CommitValidationException {
List<CommitValidationMessage> ret;
@@ -111,14 +113,9 @@
replayMocks();
- try {
- ivc.onCommitReceived(event);
- fail("onCommitReceived did not throw any exception");
- } catch (CommitValidationException e) {
- assertTrue(
- "Message of thrown CommitValidationException does not " + "contain 'Missing issue'",
- e.getMessage().contains("Missing issue"));
- }
+ CommitValidationException thrown =
+ assertThrows(CommitValidationException.class, () -> ivc.onCommitReceived(event));
+ assertThat(thrown).hasMessageThat().contains("Missing issue");
}
public void testOnlySkipMatching() throws CommitValidationException {
@@ -242,14 +239,9 @@
replayMocks();
- try {
- ivc.onCommitReceived(event);
- fail("onCommitReceived did not throw any exception");
- } catch (CommitValidationException e) {
- assertTrue(
- "Message of thrown CommitValidationException does not " + "contain 'Non-existing'",
- e.getMessage().contains("Non-existing"));
- }
+ CommitValidationException thrown =
+ assertThrows(CommitValidationException.class, () -> ivc.onCommitReceived(event));
+ assertThat(thrown).hasMessageThat().contains("Non-existing");
}
public void testSuggestedMatchingMultiple() throws CommitValidationException, IOException {
@@ -363,14 +355,9 @@
replayMocks();
- try {
- ivc.onCommitReceived(event);
- fail("onCommitReceived did not throw any exception");
- } catch (CommitValidationException e) {
- assertTrue(
- "Message of thrown CommitValidationException does not " + "contain 'Non-existing'",
- e.getMessage().contains("Non-existing"));
- }
+ CommitValidationException thrown =
+ assertThrows(CommitValidationException.class, () -> ivc.onCommitReceived(event));
+ assertThat(thrown).hasMessageThat().contains("Non-existing");
}
public void testSuggestedMatchingMultipleSomeNonExsting()
@@ -431,14 +418,9 @@
replayMocks();
- try {
- ivc.onCommitReceived(event);
- fail("onCommitReceived did not throw any exception");
- } catch (CommitValidationException e) {
- assertTrue(
- "Message of thrown CommitValidationException does not " + "contain 'Non-existing'",
- e.getMessage().contains("Non-existing"));
- }
+ CommitValidationException thrown =
+ assertThrows(CommitValidationException.class, () -> ivc.onCommitReceived(event));
+ assertThat(thrown).hasMessageThat().contains("Non-existing");
}
public void testSuggestedMatchingMultipleIOExceptionIsNonExsting()
@@ -612,7 +594,7 @@
private void setupCommonMocks() {
expect(itsConfig.getIssuePattern()).andReturn(Pattern.compile("bug#(\\d+)")).anyTimes();
- Project.NameKey projectNK = new Project.NameKey("myProject");
+ Project.NameKey projectNK = Project.nameKey("myProject");
expect(itsConfig.isEnabled(projectNK, null)).andReturn(true).anyTimes();
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutorTest.java
index e82ffd1..c5e6333 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ActionExecutorTest.java
@@ -18,10 +18,10 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicMap;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
@@ -60,8 +60,7 @@
ActionRequest actionRequest = createMock(ActionRequest.class);
expect(actionRequest.getName()).andReturn("unparsed");
expect(actionRequest.getUnparsed()).andReturn("unparsed action 1");
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
Set<ActionRequest> actionRequests = ImmutableSet.of(actionRequest);
@@ -77,8 +76,7 @@
ActionRequest actionRequest = createMock(ActionRequest.class);
expect(actionRequest.getName()).andReturn("unparsed");
expect(actionRequest.getUnparsed()).andReturn("unparsed action 1");
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
Set<ActionRequest> actionRequests = ImmutableSet.of(actionRequest);
@@ -101,7 +99,7 @@
ActionRequest actionRequest2 = createMock(ActionRequest.class);
expect(actionRequest2.getName()).andReturn("unparsed");
expect(actionRequest2.getUnparsed()).andReturn("unparsed action 2");
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project"))))
.andReturn(its)
.anyTimes();
@@ -128,7 +126,7 @@
ActionRequest actionRequest3 = createMock(ActionRequest.class);
expect(actionRequest3.getName()).andReturn("unparsed");
expect(actionRequest3.getUnparsed()).andReturn("unparsed action 3");
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project"))))
.andReturn(its)
.anyTimes();
@@ -158,8 +156,7 @@
AddComment addComment = createMock(AddComment.class);
expect(addCommentFactory.create()).andReturn(addComment);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
addComment.execute(its, "4711", actionRequest, properties);
@@ -177,8 +174,7 @@
AddSoyComment addSoyComment = createMock(AddSoyComment.class);
expect(addSoyCommentFactory.create()).andReturn(addSoyComment);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
addSoyComment.execute(its, "4711", actionRequest, properties);
@@ -196,8 +192,7 @@
AddStandardComment addStandardComment = createMock(AddStandardComment.class);
expect(addStandardCommentFactory.create()).andReturn(addStandardComment);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
addStandardComment.execute(its, "4711", actionRequest, properties);
@@ -215,8 +210,7 @@
LogEvent logEvent = createMock(LogEvent.class);
expect(logEventFactory.create()).andReturn(logEvent);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
logEvent.execute(its, "4711", actionRequest, properties);
@@ -233,8 +227,7 @@
CreateVersionFromProperty createVersionFromProperty =
createMock(CreateVersionFromProperty.class);
expect(createVersionFromPropertyFactory.create()).andReturn(createVersionFromProperty);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
createVersionFromProperty.execute(its, "itsTestProject", actionRequest, projectProperties);
@@ -252,8 +245,7 @@
AddPropertyToField addPropertyToField = createMock(AddPropertyToField.class);
expect(addPropertyToFieldFactory.create()).andReturn(addPropertyToField);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
addPropertyToField.execute(its, "4711", actionRequest, properties);
@@ -268,8 +260,7 @@
ActionRequest actionRequest = createMock(ActionRequest.class);
expect(actionRequest.getName()).andReturn(CUSTOM_ACTION_NAME);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
Set<ActionRequest> actionRequests = ImmutableSet.of(actionRequest);
@@ -286,8 +277,7 @@
ActionRequest actionRequest = createMock(ActionRequest.class);
expect(actionRequest.getName()).andReturn(CUSTOM_ACTION_NAME);
- expect(itsFacadeFactory.getFacade(new Project.NameKey(properties.get("project"))))
- .andReturn(its);
+ expect(itsFacadeFactory.getFacade(Project.nameKey(properties.get("project")))).andReturn(its);
Set<ActionRequest> actionRequests = ImmutableSet.of(actionRequest);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/AddPropertyToFieldParametersExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/AddPropertyToFieldParametersExtractorTest.java
index fb047f7..b95f5ef 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/AddPropertyToFieldParametersExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/AddPropertyToFieldParametersExtractorTest.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.its.base.workflow;
+import static com.google.common.truth.Truth8.assertThat;
import static org.easymock.EasyMock.expect;
import com.google.gerrit.extensions.config.FactoryModule;
@@ -96,9 +97,7 @@
Optional<AddPropertyToFieldParameters> extractedParameters =
extractor.extract(actionRequest, Collections.singletonMap(PROPERTY_ID, PROPERTY_VALUE));
- if (!extractedParameters.isPresent()) {
- fail();
- }
+ assertThat(extractedParameters).isPresent();
assertEquals(PROPERTY_VALUE, extractedParameters.get().getPropertyValue());
assertEquals(FIELD_ID, extractedParameters.get().getFieldId());
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyParametersExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyParametersExtractorTest.java
index 82b33e7..d153109 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyParametersExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyParametersExtractorTest.java
@@ -1,5 +1,6 @@
package com.googlesource.gerrit.plugins.its.base.workflow;
+import static com.google.common.truth.Truth8.assertThat;
import static org.easymock.EasyMock.expect;
import com.google.gerrit.extensions.config.FactoryModule;
@@ -11,7 +12,6 @@
public class CreateVersionFromPropertyParametersExtractorTest extends MockingTestCase {
- private static final String ITS_PROJECT = "test-project";
private static final String PROPERTY_ID = "propertyId";
private static final String PROPERTY_VALUE = "propertyValue";
@@ -75,9 +75,7 @@
Optional<CreateVersionFromPropertyParameters> extractedParameters =
extractor.extract(actionRequest, Collections.singletonMap(PROPERTY_ID, PROPERTY_VALUE));
- if (!extractedParameters.isPresent()) {
- fail();
- }
+ assertThat(extractedParameters).isPresent();
assertEquals(PROPERTY_VALUE, extractedParameters.get().getPropertyValue());
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyTest.java
index a89509c..19735be 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/CreateVersionFromPropertyTest.java
@@ -30,7 +30,6 @@
public class CreateVersionFromPropertyTest extends MockingTestCase {
private static final String ITS_PROJECT = "test-project";
- private static final String PROPERTY_ID = "propertyId";
private static final String PROPERTY_VALUE = "propertyValue";
private Injector injector;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheTest.java
index 3b33b41..2da7258 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/ItsRulesProjectCacheTest.java
@@ -21,8 +21,8 @@
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.config.FactoryModule;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectLevelConfig;
import com.google.gerrit.server.project.ProjectState;
@@ -90,7 +90,7 @@
ProjectLevelConfig projectLevelConfigPlugin = createMock(ProjectLevelConfig.class);
expect(projectLevelConfigPlugin.get()).andReturn(new Config());
expect(projectState.getConfig(RuleBaseKind.ITS.fileName)).andReturn(projectLevelConfigPlugin);
- expect(projectCache.checkedGet(new Project.NameKey(TEST_PROJECT))).andReturn(projectState);
+ expect(projectCache.checkedGet(Project.nameKey(TEST_PROJECT))).andReturn(projectState);
expect(rulesConfigReader.getRulesFromConfig(isA(Config.class)))
.andReturn(ImmutableList.of(rule1))
.andReturn(ImmutableList.of());
@@ -134,7 +134,7 @@
expect(parentProjectState.getConfig(RuleBaseKind.ITS.fileName))
.andReturn(parentProjectConfigPlugin);
expect(projectState.parents()).andReturn(FluentIterable.of(parentProjectState));
- expect(projectCache.checkedGet(new Project.NameKey(TEST_PROJECT))).andReturn(projectState);
+ expect(projectCache.checkedGet(Project.nameKey(TEST_PROJECT))).andReturn(projectState);
expect(rulesConfigReader.getRulesFromConfig(isA(Config.class)))
.andReturn(ImmutableList.of())
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index d5764f7..c921d01 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,4 +1,6 @@
load(
"@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
- "classpath_collector",
+ _classpath_collector = "classpath_collector",
)
+
+classpath_collector = _classpath_collector
diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl
index 3af7e58..97307bd 100644
--- a/tools/bzl/junit.bzl
+++ b/tools/bzl/junit.bzl
@@ -1,4 +1,6 @@
load(
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
- "junit_tests",
+ _junit_tests = "junit_tests",
)
+
+junit_tests = _junit_tests
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
deleted file mode 100644
index 2eabedb..0000000
--- a/tools/bzl/maven_jar.bzl
+++ /dev/null
@@ -1 +0,0 @@
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "maven_jar")
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 0b25d23..4d2dbdd 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,10 @@
load(
"@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
- "PLUGIN_DEPS",
- "PLUGIN_TEST_DEPS",
- "gerrit_plugin",
+ _gerrit_plugin = "gerrit_plugin",
+ _plugin_deps = "PLUGIN_DEPS",
+ _plugin_test_deps = "PLUGIN_TEST_DEPS",
)
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
+PLUGIN_TEST_DEPS = _plugin_test_deps
