From 0cea62907aa1c9179e359bacccf0b2692ca01d46 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 01 Oct 2013 10:44:56 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 793773b..4304f01 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
@@ -464,7 +464,7 @@
assertEquals(DirectoryServer.getBackend("replicationChanges"), null, "Replication changes backend object has been left");
}
- protected void clearChangelogDB(ReplicationServer rs)
+ protected void clearChangelogDB(ReplicationServer rs) throws Exception
{
((JEChangelogDB) rs.getChangelogDB()).clearDB();
}
@@ -473,8 +473,10 @@
* Cleanup databases of the currently instantiated replication servers in the
* VM
*/
- protected void cleanUpReplicationServersDB() {
- for (ReplicationServer rs : ReplicationServer.getAllInstances()) {
+ protected void cleanUpReplicationServersDB() throws Exception
+ {
+ for (ReplicationServer rs : ReplicationServer.getAllInstances())
+ {
clearChangelogDB(rs);
}
}
@@ -483,21 +485,23 @@
* Remove trailing directories and databases of the currently instantiated
* replication servers.
*/
- protected void removeReplicationServerDB() {
- for (ReplicationServer rs : ReplicationServer.getAllInstances()) {
+ protected void removeReplicationServerDB() throws Exception
+ {
+ for (ReplicationServer rs : ReplicationServer.getAllInstances())
+ {
clearChangelogDB(rs);
- rs.removeDb();
+ rs.getChangelogDB().removeDB();
}
}
- protected void remove(ReplicationServer... replicationServers)
+ protected void remove(ReplicationServer... replicationServers) throws Exception
{
for (ReplicationServer rs : replicationServers)
{
if (rs != null)
{
rs.remove();
- rs.removeDb();
+ rs.getChangelogDB().removeDB();
}
}
}
--
Gitblit v1.10.0