From cbf6bfd149ce305652be0aac68d210778b5cbba6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Oct 2013 11:59:25 +0000
Subject: [PATCH] ReplicationTestCase.java: Change entryList and configEntryList from LinkedList to Set and renamed them to entriesToCleanup and configEntriesToCleanup. Extracted method connect() and waitForSpecificMsg() + Changed the return type of the existing waitForSpecificMsg() methods. In configureReplication(), added 2 String parameters + extracted method addSynchroServerEntry() and addConfigEntry(). Simplified code a lot.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index 770cde0..b52c9cb 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -35,7 +35,6 @@
import org.opends.messages.Message;
import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
@@ -204,14 +203,9 @@
+ "ds-cfg-receive-status: true\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE;
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
- "Unable to add the synchronized server");
- configEntryList.add(synchroServerEntry.getDN());
+ addSynchroServerEntry(synchroServerLdif);
replDomain = LDAPReplicationDomain.retrievesReplicationDomain(baseDN);
-
if (replDomain != null)
{
debugInfo("ReplicationDomain: Import/Export is running ? " +
@@ -233,7 +227,7 @@
DN synchroServerDN = DN.decode(synchroServerStringDN);
deleteEntry(synchroServerDN);
synchroServerEntry = null;
- configEntryList.remove(configEntryList.indexOf(synchroServerDN));
+ configEntriesToCleanup.remove(synchroServerDN);
}
private int getChangelogPort(int changelogID) throws Exception
--
Gitblit v1.10.0