From a5f828cdb6549933c9f49783f99be1de1085a75e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 27 Aug 2013 09:57:22 +0000
Subject: [PATCH] Made code more encapsulated and more explicit. Removed parameters obscuring the code.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 47976f4..df6b068 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -48,6 +48,7 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.replication.server.ReplicationServerDomain;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.*;
@@ -1072,34 +1073,21 @@
broker3 = openReplicationSession(DN.decode(EXAMPLE_DN),
server3ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
- // Check that the list of connected LDAP servers is correct
- // in each replication servers
- Set<Integer> l1 = changelog1.getReplicationServerDomain(
- baseDn.toNormalizedString(), false).getConnectedDSs().keySet();
- Assertions.assertThat(l1).containsExactly(server1ID);
-
- Set<Integer> l2 = changelog2.getReplicationServerDomain(
- baseDn.toNormalizedString(), false).getConnectedDSs().keySet();
- Assertions.assertThat(l2).containsExactly(server2ID, server3ID);
-
- Set<Integer> l3 = changelog3.getReplicationServerDomain(
- baseDn.toNormalizedString(), false).getConnectedDSs().keySet();
- Assertions.assertThat(l3).isEmpty();
+ // Check that the list of connected LDAP servers is correct in each replication servers
+ Assertions.assertThat(getConnectedDSServerIds(changelog1)).containsExactly(server1ID);
+ Assertions.assertThat(getConnectedDSServerIds(changelog2)).containsExactly(server2ID, server3ID);
+ Assertions.assertThat(getConnectedDSServerIds(changelog3)).isEmpty();
// Test updates
broker3.stop();
Thread.sleep(1000);
- l2 = changelog2.getReplicationServerDomain(
- baseDn.toNormalizedString(), false).getConnectedDSs().keySet();
- Assertions.assertThat(l2).containsExactly(server2ID);
+ Assertions.assertThat(getConnectedDSServerIds(changelog2)).containsExactly(server2ID);
broker3 = openReplicationSession(DN.decode(EXAMPLE_DN),
server3ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
broker2.stop();
Thread.sleep(1000);
- l2 = changelog2.getReplicationServerDomain(
- baseDn.toNormalizedString(), false).getConnectedDSs().keySet();
- Assertions.assertThat(l2).containsExactly(server3ID);
+ Assertions.assertThat(getConnectedDSServerIds(changelog2)).containsExactly(server3ID);
// TODO Test ReplicationServerDomain.getDestinationServers method.
@@ -1115,6 +1103,12 @@
}
}
+ private Set<Integer> getConnectedDSServerIds(ReplicationServer changelog)
+ {
+ ReplicationServerDomain domain = changelog.getReplicationServerDomain(baseDn.toNormalizedString());
+ return domain.getConnectedDSs().keySet();
+ }
+
@Test(enabled=true, groups="slow")
public void initializeTargetExportMultiSS() throws Exception
{
--
Gitblit v1.10.0