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/server/MonitorTest.java | 58 +++++++++-------------------------------------------------
1 files changed, 9 insertions(+), 49 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 2314805..b746cc4 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
@@ -27,6 +27,10 @@
*/
package org.opends.server.replication.server;
+import java.io.ByteArrayOutputStream;
+import java.net.SocketException;
+import java.util.*;
+
import org.opends.messages.Category;
import org.opends.messages.Message;
import org.opends.messages.Severity;
@@ -44,18 +48,9 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.util.StaticUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -436,49 +431,14 @@
{
debugInfo("Post test cleaning.");
- // Clean brokers
- if (broker2 != null)
- broker2.stop();
- broker2 = null;
- if (broker3 != null)
- broker3.stop();
- broker3 = null;
- if (broker4 != null)
- broker4.stop();
- broker4 = null;
-
- if (replServer1 != null)
- {
- replServer1.clearDb();
- replServer1.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer1.getDbDirName()));
- replServer1 = null;
- }
- if (replServer2 != null)
- {
- replServer2.clearDb();
- replServer2.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer2.getDbDirName()));
- replServer2 = null;
- }
- if (replServer3 != null)
- {
- replServer3.clearDb();
- replServer3.remove();
- StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
- replServer3.getDbDirName()));
- replServer3 = null;
- }
+ stop(broker2, broker3, broker4);
+ broker2 = broker3 = broker4 = null;
+ remove(replServer1, replServer2, replServer3);
+ replServer1 = replServer2 = replServer3 = null;
super.cleanRealEntries();
- // Clean replication server ports
- for (int i = 0; i < replServerPort.length; i++)
- {
- replServerPort[i] = 0;
- }
+ Arrays.fill(replServerPort, 0);
try
{
--
Gitblit v1.10.0