commit 24fcd009846cc4031ad60ed133c36e72c4d87aae
author Nasser Grainawi <nasser@codeaurora.org> Wed Oct 28 11:29:12 2020 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Wed Oct 28 14:42:27 2020 -0600
tree 8e9cb654f839d5758caad57a21c72aafc3e3e5e7
parent bfc3577bbe0a74329f8ca7b040db58503ea8b94a

ReplicationFanoutIT: Refactor setRemoteReplicationDestination

Simplify callers by providing a way to set the replicationDelay up
front.

Change-Id: I28cea83559aa1eb379ec2ff962a0beaf25fe4ca6

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

diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
index 5908c37..fe70126 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
@@ -156,14 +156,8 @@
   public void shouldCreateIndividualReplicationTasksForEveryRemoteUrlPair() throws Exception {
     List<String> replicaSuffixes = Arrays.asList("replica1", "replica2");
 
-    FileBasedConfig dest1 =
-        setReplicationDestinationRemoteConfig("foo1", replicaSuffixes, ALL_PROJECTS);
-    FileBasedConfig dest2 =
-        setReplicationDestinationRemoteConfig("foo2", replicaSuffixes, ALL_PROJECTS);
-    dest1.setInt("remote", null, "replicationDelay", Integer.MAX_VALUE);
-    dest2.setInt("remote", null, "replicationDelay", Integer.MAX_VALUE);
-    dest1.save();
-    dest2.save();
+    setReplicationDestinationRemoteConfig("foo1", replicaSuffixes, ALL_PROJECTS, Integer.MAX_VALUE);
+    setReplicationDestinationRemoteConfig("foo2", replicaSuffixes, ALL_PROJECTS, Integer.MAX_VALUE);
     reloadConfig();
 
     createChange();
@@ -186,18 +180,22 @@
 
   private void setReplicationDestinationRemoteConfig(
       String remoteName, String replicaSuffix, Optional<String> project) throws IOException {
-    setReplicationDestinationRemoteConfig(remoteName, Arrays.asList(replicaSuffix), project);
+    setReplicationDestinationRemoteConfig(
+        remoteName, Arrays.asList(replicaSuffix), project, TEST_REPLICATION_DELAY);
   }
 
   private FileBasedConfig setReplicationDestinationRemoteConfig(
-      String remoteName, List<String> replicaSuffixes, Optional<String> allProjects)
+      String remoteName,
+      List<String> replicaSuffixes,
+      Optional<String> allProjects,
+      int replicationDelay)
       throws IOException {
     FileBasedConfig remoteConfig =
         new FileBasedConfig(
             sitePaths.etc_dir.resolve("replication/" + remoteName + ".config").toFile(),
             FS.DETECTED);
 
-    setReplicationDestination(remoteConfig, replicaSuffixes, allProjects);
+    setReplicationDestination(remoteConfig, replicaSuffixes, allProjects, replicationDelay);
     return remoteConfig;
   }
 
@@ -207,7 +205,10 @@
   }
 
   private void setReplicationDestination(
-      FileBasedConfig config, List<String> replicaSuffixes, Optional<String> project)
+      FileBasedConfig config,
+      List<String> replicaSuffixes,
+      Optional<String> project,
+      int replicationDelay)
       throws IOException {
 
     List<String> replicaUrls =
@@ -215,7 +216,7 @@
             .map(suffix -> gitPath.resolve("${name}" + suffix + ".git").toString())
             .collect(toList());
     config.setStringList("remote", null, "url", replicaUrls);
-    config.setInt("remote", null, "replicationDelay", TEST_REPLICATION_DELAY);
+    config.setInt("remote", null, "replicationDelay", replicationDelay);
     project.ifPresent(prj -> config.setString("remote", null, "projects", prj));
 
     config.save();