commit 2310d1a8a000eb3fa53e5ddc3d41f55c3e4fa964
author David Pursehouse <dpursehouse@collab.net> Thu Sep 19 10:26:49 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Sep 19 06:37:32 2019 +0000
tree 832eebf1f106df7dae53db9f5e1f72797a53f3de
parent df3f763176dd4f692112d0c6cae029601c700dfb

Wrap calls to createProject in a utility method

The createProject method is removed in stable-3.0, and creating a test
project must be done with the ProjectOperations class. This means that
when a new test is added in stable-2.16 and uses createProject, there
is a conflict when merging it up to stable-3.0.

Wrap all the calls to createProject in a new utility method and call
that instead in the tests. This commit will conflict on the next merge
up to stable-3.0, but then there will be no more conflicts in future.

Change-Id: I271d0d55cd07c25eb4c6f8acc47d144b47600356

src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
index 078b196..61a53f3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
@@ -94,7 +94,7 @@
     setReplicationDestination("foo", "replica", ALL_PROJECTS);
     reloadConfig();
 
-    Project.NameKey sourceProject = createProject("foo");
+    Project.NameKey sourceProject = createTestProject("foo");
 
     assertThat(listReplicationTasks("refs/meta/config")).hasSize(1);
 
@@ -106,7 +106,7 @@
 
   @Test
   public void shouldReplicateNewChangeRef() throws Exception {
-    Project.NameKey targetProject = createProject("projectreplica");
+    Project.NameKey targetProject = createTestProject("projectreplica");
 
     setReplicationDestination("foo", "replica", ALL_PROJECTS);
     reloadConfig();
@@ -131,7 +131,7 @@
     setReplicationDestination("foo", "replica", ALL_PROJECTS);
     reloadConfig();
 
-    Project.NameKey targetProject = createProject("projectreplica");
+    Project.NameKey targetProject = createTestProject("projectreplica");
     String newBranch = "refs/heads/mybranch";
     String master = "refs/heads/master";
     BranchInput input = new BranchInput();
@@ -153,8 +153,8 @@
 
   @Test
   public void shouldReplicateNewBranchToTwoRemotes() throws Exception {
-    Project.NameKey targetProject1 = createProject("projectreplica1");
-    Project.NameKey targetProject2 = createProject("projectreplica2");
+    Project.NameKey targetProject1 = createTestProject("projectreplica1");
+    Project.NameKey targetProject2 = createTestProject("projectreplica2");
 
     setReplicationDestination("foo1", "replica1", ALL_PROJECTS);
     setReplicationDestination("foo2", "replica2", ALL_PROJECTS);
@@ -185,8 +185,8 @@
   @Test
   public void shouldCreateIndividualReplicationTasksForEveryRemoteUrlPair() throws Exception {
     List<String> replicaSuffixes = Arrays.asList("replica1", "replica2");
-    createProject("projectreplica1");
-    createProject("projectreplica2");
+    createTestProject("projectreplica1");
+    createTestProject("projectreplica2");
 
     setReplicationDestination("foo1", replicaSuffixes, ALL_PROJECTS);
     setReplicationDestination("foo2", replicaSuffixes, ALL_PROJECTS);
@@ -222,7 +222,7 @@
           void onAllRefsReplicatedToAllNodes(int totalPushTasksCount) {}
         };
 
-    createProject("projectreplica");
+    createTestProject("projectreplica");
 
     setReplicationDestination("foo", "replica", ALL_PROJECTS);
     reloadConfig();
@@ -240,7 +240,7 @@
     setReplicationDestination("foo", "replica", ALL_PROJECTS);
     reloadConfig();
 
-    Project.NameKey targetProject = createProject("projectreplica");
+    Project.NameKey targetProject = createTestProject("projectreplica");
     String newHead = "refs/heads/newhead";
     String master = "refs/heads/master";
     BranchInput input = new BranchInput();
@@ -260,7 +260,7 @@
   @Test
   public void shouldNotDrainTheQueueWhenReloading() throws Exception {
     // Setup repo to replicate
-    Project.NameKey targetProject = createProject("projectreplica");
+    Project.NameKey targetProject = createTestProject("projectreplica");
     String remoteName = "doNotDrainQueue";
     setReplicationDestination(remoteName, "replica", ALL_PROJECTS);
 
@@ -282,7 +282,7 @@
   @Test
   public void shouldDrainTheQueueWhenReloading() throws Exception {
     // Setup repo to replicate
-    Project.NameKey targetProject = createProject("projectreplica");
+    Project.NameKey targetProject = createTestProject("projectreplica");
     String remoteName = "drainQueue";
     setReplicationDestination(remoteName, "replica", ALL_PROJECTS);
 
@@ -304,6 +304,10 @@
     }
   }
 
+  private Project.NameKey createTestProject(String name) throws Exception {
+    return createProject(name);
+  }
+
   private Ref getRef(Repository repo, String branchName) throws IOException {
     return repo.getRefDatabase().exactRef(branchName);
   }