mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
16.49.2015 6c5c0af35aabc59a56c71e9c9296a7398a3e9176
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
@@ -115,7 +115,6 @@
        "--provider-name", "Multimaster Synchronization",
        "--set", "replication-db-directory:" + "replicationServerTestConfigureDb",
        "--set", "replication-port:" + replicationServerPort,
        "--set", "replication-db-implementation:" + replicationDbImplementation,
        "--set", "replication-server-id:71");
    for (SynchronizationProvider<?> provider : DirectoryServer
@@ -668,7 +667,7 @@
          "localhost:" + ((i == 0) ? changelogPorts[1] : changelogPorts[0]));
        ReplServerFakeConfiguration conf =
          new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestChangelogChainingDb"+i,
              replicationDbImplementation, 0, changelogIds[i], 0, 100, servers);
              0, changelogIds[i], 0, 100, servers);
        changelogs[i] = new ReplicationServer(conf);
      }
@@ -761,7 +760,7 @@
        SortedSet<String> servers = new TreeSet<>();
        servers.add("localhost:" + changelogPorts[1]);
        ReplServerFakeConfiguration conf =
          new ReplServerFakeConfiguration(changelogPorts[0], "replicationServerTestChangelogChainingDb"+0, replicationDbImplementation,
            new ReplServerFakeConfiguration(changelogPorts[0], "replicationServerTestChangelogChainingDb" + 0,
                                         0, changelogIds[0], 0, 100, servers);
        changelogs[0] = new ReplicationServer(conf);
      }
@@ -813,7 +812,7 @@
        SortedSet<String> servers = new TreeSet<>();
        servers.add("localhost:"+changelogPorts[0]);
        ReplServerFakeConfiguration conf = new ReplServerFakeConfiguration(
            changelogPorts[1], null, replicationDbImplementation, 0, changelogIds[1], 0, 100, null);
            changelogPorts[1], null, 0, changelogIds[1], 0, 100, null);
        changelogs[1] = new ReplicationServer(conf);
        // Connect broker 2 to changelog2
@@ -1140,7 +1139,7 @@
           servers.add("localhost:" + changelogPorts[1]);
         }
         ReplServerFakeConfiguration conf =
           new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestReplicationServerConnectedDb"+i, replicationDbImplementation,
          new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestReplicationServerConnectedDb" + i,
                                          0, changelogIds[i], 0, 100, servers);
         changelogs[i] = new ReplicationServer(conf);
       }
@@ -1184,8 +1183,7 @@
         SortedSet<String> servers = new TreeSet<>();
         // Configure replicationServer[0] to be disconnected from ReplicationServer[1]
         ReplServerFakeConfiguration conf =
           new ReplServerFakeConfiguration(changelogPorts[0], "changelogDb0", replicationDbImplementation,
                                          0, changelogIds[0], 0, 100, servers);
          new ReplServerFakeConfiguration(changelogPorts[0], "changelogDb0", 0, changelogIds[0], 0, 100, servers);
         changelogs[0].applyConfigurationChange(conf) ;
         // The link between RS[0] & RS[1] should be destroyed by the new configuration.