From f47f2dbdc7fb006ad9ce601025e49a0904b5c4b0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 20 Dec 2013 14:30:48 +0000
Subject: [PATCH] Tests cleanup.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 10b857d..52fa8cf 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -191,11 +191,10 @@
* does not exist, take the 'empty backend' generationID.
*/
protected ReplicationBroker openReplicationSession(final DN baseDN,
- int serverId, int windowSize, int port, int timeout,
- boolean emptyOldChanges) throws Exception
+ int serverId, int windowSize, int port, int timeout) throws Exception
{
return openReplicationSession(baseDN, serverId, windowSize,
- port, timeout, emptyOldChanges, getGenerationId(baseDN));
+ port, timeout, getGenerationId(baseDN));
}
/**
@@ -204,23 +203,19 @@
*/
protected ReplicationBroker openReplicationSession(final DN baseDN,
int serverId, int windowSize, int port, int timeout,
- boolean emptyOldChanges, long generationId) throws Exception
+ long generationId) throws Exception
{
DomainFakeCfg config = newFakeCfg(baseDN, serverId, port);
config.setWindowSize(windowSize);
- return openReplicationSession(config, port, timeout, emptyOldChanges, generationId);
+ return openReplicationSession(config, port, timeout, generationId);
}
protected ReplicationBroker openReplicationSession(ReplicationDomainCfg config,
- int port, int timeout, boolean emptyOldChanges, long generationId) throws Exception
+ int port, int timeout, long generationId) throws Exception
{
- ServerState state = new ServerState();
-
- if (emptyOldChanges)
- new PersistentServerState(config.getBaseDN(), config.getServerId(), new ServerState());
-
final ReplicationBroker broker = new ReplicationBroker(
- new DummyReplicationDomain(generationId), state, config, generationId, getReplSessionSecurity());
+ new DummyReplicationDomain(generationId), new ServerState(),
+ config, generationId, getReplSessionSecurity());
connect(broker, port, timeout);
return broker;
}
--
Gitblit v1.10.0