From 5d650a123e46c0c86fe3e440fc9dbf04cd831fc9 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 15 Jun 2011 15:51:32 +0000
Subject: [PATCH] Tidy up unit-tests so that not all backends are always enabled, and replication related databases are deleted after tests.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index dbcca20..56084eb 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2011 ForgeRock AS
  */
 package org.opends.server.replication;
 
@@ -82,6 +83,7 @@
 import org.opends.server.types.SearchFilter;
 import org.opends.server.types.SearchResultEntry;
 import org.opends.server.types.SearchScope;
+import org.opends.server.util.StaticUtils;
 import org.opends.server.util.TimeThread;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -1369,18 +1371,24 @@
     {
       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;
     }
 

--
Gitblit v1.10.0