From d03a4043575eb981cae4124cf1dd6af74be498bd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Sep 2013 13:01:23 +0000
Subject: [PATCH] Replication tests cleanup and consolidation.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 a6d3d36..03fa0d8 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
@@ -64,7 +64,6 @@
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.schema.IntegerSyntax;
import org.opends.server.types.*;
-import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -510,8 +509,31 @@
*/
protected void removeReplicationServerDB() {
for (ReplicationServer rs : ReplicationServer.getAllInstances()) {
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- rs.getDbDirName()));
+ recursiveDelete(new File(DirectoryServer.getInstanceRoot(), rs.getDbDirName()));
+ }
+ }
+
+ protected void remove(ReplicationServer... replicationServers)
+ {
+ for (ReplicationServer rs : replicationServers)
+ {
+ if (rs != null)
+ {
+ rs.clearDb();
+ rs.remove();
+ recursiveDelete(new File(DirectoryServer.getInstanceRoot(), rs.getDbDirName()));
+ }
+ }
+ }
+
+ protected void stop(ReplicationBroker... brokers)
+ {
+ for (ReplicationBroker broker : brokers)
+ {
+ if (broker != null)
+ {
+ broker.stop();
+ }
}
}
--
Gitblit v1.10.0