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/DependencyTest.java | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index 8cc7a28..cb736d4 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -27,10 +27,6 @@
*/
package org.opends.server.replication;
-import static org.opends.server.TestCaseUtils.*;
-import static org.testng.Assert.*;
-
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.LinkedList;
@@ -52,9 +48,11 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.*;
-import org.opends.server.util.StaticUtils;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
+import static org.testng.Assert.*;
+
/**
* Test that the dependencies are computed correctly when replaying
* sequences of operations that requires to follow a given order
@@ -225,11 +223,7 @@
}
finally
{
- if (replServer != null) {
- replServer.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer.getDbDirName()));
- }
+ remove(replServer);
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
}
@@ -342,12 +336,7 @@
}
finally
{
- if (replServer != null) {
- replServer.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer.getDbDirName()));
- }
-
+ remove(replServer);
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
}
@@ -501,12 +490,7 @@
}
finally
{
- if (replServer != null) {
- replServer.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer.getDbDirName()));
- }
-
+ remove(replServer);
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
}
@@ -609,12 +593,7 @@
}
finally
{
- if (replServer != null) {
- replServer.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer.getDbDirName()));
- }
-
+ remove(replServer);
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
}
--
Gitblit v1.10.0