ReplicationFanoutIT: Rename setReplicationDestination Distinguish the methods that set the per-remote config files vs the methods that set the global replication.config. This helps lead up to ReplicationFanoutIT inheriting from ReplicationDaemon. Change-Id: I6139d2dbde15c0b0449d7d7801c169253bc7449d
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 30c3a2b..5908c37 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
@@ -78,7 +78,7 @@ setAutoReload(); config.save(); - setReplicationDestination("remote1", "suffix1", Optional.of("not-used-project")); + setReplicationDestinationRemoteConfig("remote1", "suffix1", Optional.of("not-used-project")); super.setUpTestPlugin(); @@ -98,7 +98,7 @@ @Test public void shouldReplicateNewBranch() throws Exception { - setReplicationDestination("foo", "replica", ALL_PROJECTS); + setReplicationDestinationRemoteConfig("foo", "replica", ALL_PROJECTS); reloadConfig(); Project.NameKey targetProject = createTestProject(project + "replica"); @@ -126,8 +126,8 @@ Project.NameKey targetProject1 = createTestProject(project + "replica1"); Project.NameKey targetProject2 = createTestProject(project + "replica2"); - setReplicationDestination("foo1", "replica1", ALL_PROJECTS); - setReplicationDestination("foo2", "replica2", ALL_PROJECTS); + setReplicationDestinationRemoteConfig("foo1", "replica1", ALL_PROJECTS); + setReplicationDestinationRemoteConfig("foo2", "replica2", ALL_PROJECTS); reloadConfig(); Result pushResult = createChange(); @@ -156,8 +156,10 @@ public void shouldCreateIndividualReplicationTasksForEveryRemoteUrlPair() throws Exception { List<String> replicaSuffixes = Arrays.asList("replica1", "replica2"); - FileBasedConfig dest1 = setReplicationDestination("foo1", replicaSuffixes, ALL_PROJECTS); - FileBasedConfig dest2 = setReplicationDestination("foo2", replicaSuffixes, ALL_PROJECTS); + 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(); @@ -182,12 +184,12 @@ } } - private void setReplicationDestination( + private void setReplicationDestinationRemoteConfig( String remoteName, String replicaSuffix, Optional<String> project) throws IOException { - setReplicationDestination(remoteName, Arrays.asList(replicaSuffix), project); + setReplicationDestinationRemoteConfig(remoteName, Arrays.asList(replicaSuffix), project); } - private FileBasedConfig setReplicationDestination( + private FileBasedConfig setReplicationDestinationRemoteConfig( String remoteName, List<String> replicaSuffixes, Optional<String> allProjects) throws IOException { FileBasedConfig remoteConfig =