From a130a3a5d4a652bdaf44e3c565159ca783b63601 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.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 38 +++----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java | 5 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java | 11 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 11 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java | 12 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 5 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 7 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 8 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 10 ++
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 12 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 9 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java | 6 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 49 ++++++++-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java | 5 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java | 38 +++++++
opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif | 15 ++-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 13 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java | 3
24 files changed, 237 insertions(+), 43 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 437c634..6607e14 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -2035,4 +2035,16 @@
shutdown();
}
+ /**
+ * Get the replication server DB directory.
+ * This is useful for tests to be able to do some cleanup. Might even be
+ * useful for the server some day.
+ *
+ * @return the Database directory name
+ */
+ public String getDbDirName()
+ {
+ return dbDirname;
+ }
+
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif b/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
index 71a8818..b55d406 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
+++ b/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
@@ -417,7 +417,7 @@
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-local-db-backend
-ds-cfg-enabled: true
+ds-cfg-enabled: false
ds-cfg-java-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: unindexedRoot
ds-cfg-writability-mode: enabled
@@ -428,6 +428,7 @@
ds-cfg-preload-time-limit: 0 seconds
ds-cfg-entries-compressed: false
ds-cfg-db-cache-percent: 2
+ds-cfg-db-run-cleaner: false
dn: ds-cfg-attribute=oncRpcNumber,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
changetype: add
@@ -647,7 +648,7 @@
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-local-db-backend
-ds-cfg-enabled: true
+ds-cfg-enabled: false
ds-cfg-java-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: rebuildRoot
ds-cfg-writability-mode: enabled
@@ -658,6 +659,7 @@
ds-cfg-preload-time-limit: 0 seconds
ds-cfg-entries-compressed: false
ds-cfg-db-cache-percent: 2
+ds-cfg-db-run-cleaner: false
dn: cn=VLV Index,ds-cfg-backend-id=rebuildRoot,cn=Backends,cn=config
changetype: add
@@ -816,7 +818,7 @@
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-local-db-backend
-ds-cfg-enabled: true
+ds-cfg-enabled: false
ds-cfg-java-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: importRoot
ds-cfg-writability-mode: enabled
@@ -828,6 +830,7 @@
ds-cfg-preload-time-limit: 0 seconds
ds-cfg-entries-compressed: false
ds-cfg-db-cache-percent: 2
+ds-cfg-db-run-cleaner: false
dn: cn=VLV Index,ds-cfg-backend-id=importRoot,cn=Backends,cn=config
changetype: add
@@ -982,7 +985,7 @@
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-local-db-backend
-ds-cfg-enabled: true
+ds-cfg-enabled: false
ds-cfg-java-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: verifyRoot
ds-cfg-writability-mode: enabled
@@ -993,6 +996,7 @@
ds-cfg-preload-time-limit: 0 seconds
ds-cfg-entries-compressed: false
ds-cfg-db-cache-percent: 2
+ds-cfg-db-run-cleaner: false
dn: cn=VLV Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
changetype: add
@@ -1179,7 +1183,7 @@
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-local-db-backend
-ds-cfg-enabled: true
+ds-cfg-enabled: false
ds-cfg-java-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: indexRoot
ds-cfg-writability-mode: enabled
@@ -1192,6 +1196,7 @@
ds-cfg-preload-time-limit: 0 seconds
ds-cfg-entries-compressed: false
ds-cfg-db-cache-percent: 2
+ds-cfg-db-run-cleaner: false
dn: cn=VLV Index,ds-cfg-backend-id=indexRoot,cn=Backends,cn=config
changetype: add
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index ed41bf4..c1c5a4e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server;
@@ -1947,4 +1948,16 @@
return buffer.toString();
}
+
+ public static void enableBackend(String backendID)
+ {
+ dsconfig("set-backend-prop", "--backend-name", backendID,
+ "--set", "enabled:true");
+ }
+
+ public static void disableBackend(String backendID)
+ {
+ dsconfig("set-backend-prop", "--backend-name", backendID,
+ "--set", "enabled:false");
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 4c1256c..2b142ad 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -76,6 +77,7 @@
// This test suite depends on having the schema available, so we'll make
// sure the server is started.
TestCaseUtils.startServer();
+ TestCaseUtils.enableBackend("indexRoot");
homeDirName = "db_index_test";
@@ -534,6 +536,7 @@
@AfterClass
public void cleanUp() throws Exception {
+ TestCaseUtils.disableBackend("importRoot");
}
@Test(expectedExceptions = DirectoryException.class)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
index a71ee93..a1afb4a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -239,6 +240,8 @@
// This test suite depends on having the schema available, so we'll make
// sure the server is started.
TestCaseUtils.startServer();
+ // Enable the backend
+ TestCaseUtils.enableBackend(beID);
tempDir = TestCaseUtils.createTemporaryDirectory("jebimporttest");
homeDirName = tempDir.getAbsolutePath();
@@ -287,6 +290,7 @@
@AfterClass
public void cleanUp() throws Exception
{
+ TestCaseUtils.disableBackend(beID);
TestCaseUtils.deleteDirectory(tempDir);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
index 8c3107e..9080ad5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -128,6 +129,7 @@
@BeforeClass
public void setup() throws Exception {
TestCaseUtils.startServer();
+ TestCaseUtils.enableBackend(beID);
baseDNs = new DN[] {
DN.decode(suffix)
};
@@ -136,6 +138,7 @@
@AfterClass
public void cleanUp() throws Exception {
TestCaseUtils.clearJEBackend(false, beID, suffix);
+ TestCaseUtils.disableBackend(beID);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index 66531b4..6101888 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -91,6 +92,7 @@
@BeforeClass
public void setUp() throws Exception {
TestCaseUtils.startServer();
+ TestCaseUtils.enableBackend(beID);
SortKey[] sortKeys = new SortKey[3];
sortKeys[0] = new SortKey(DirectoryServer.getAttributeType("givenname"), true);
@@ -214,6 +216,7 @@
@AfterClass
public void cleanUp() throws Exception {
+ TestCaseUtils.disableBackend(beID);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index eda63a3..41be068 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -130,6 +131,7 @@
@BeforeClass
public void setup() throws Exception {
TestCaseUtils.startServer();
+ TestCaseUtils.enableBackend(beID);
baseDNs = new DN[] {
DN.decode(suffix)
};
@@ -138,6 +140,7 @@
@AfterClass
public void cleanUp() throws Exception {
TestCaseUtils.clearJEBackend(false, beID, suffix);
+ TestCaseUtils.disableBackend(beID);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 64798c9..b2717c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -189,8 +190,9 @@
",dc=example,dc=com"), 0 },
// new Object[] { DN.decode("cn=monitor"),
// DirectoryServer.getMonitorProviders().size() },
- new Object[] { DN.decode("cn=Backends,cn=config"),
- DirectoryServer.getBackends().size() },
+// Disable test on # of backends. Some might be disabled, falsing count.
+// new Object[] { DN.decode("cn=Backends,cn=config"),
+// DirectoryServer.getBackends().size() },
new Object[] { DN.decode("cn=Work Queue,cn=config"), 0 },
new Object[] { DN.decode("cn=tasks"), 2 },
new Object[] { DN.decode("cn=Recurring Tasks,cn=tasks"), 0 },
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index 7f3bf87..4fc8526 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
@@ -103,7 +104,7 @@
{
super.setUp();
-
+ TestCaseUtils.enableBackend("unindexedRoot");
TestCaseUtils.initializeTestBackend(true);
TestCaseUtils.addEntries(
"dn: cn=Unprivileged Root,cn=Root DNs,cn=config",
@@ -349,6 +350,7 @@
connections[i].finalize();
connections[i] = null;
}
+ TestCaseUtils.disableBackend("unindexedRoot");
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index dbcca20..56084eb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/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;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 46b30bb..6299768 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -23,9 +23,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication;
+import java.io.File;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_COMPLETION_TIME;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_INITIALIZE_DONE;
import static org.opends.server.config.ConfigConstants.ATTR_TASK_INITIALIZE_LEFT;
@@ -83,6 +85,7 @@
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
import org.opends.server.util.Base64;
+import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -1682,6 +1685,8 @@
{
changelog1.clearDb();
changelog1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ changelog1.getDbDirName()));
changelog1 = null;
}
@@ -1689,6 +1694,8 @@
{
changelog2.clearDb();
changelog2.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ changelog2.getDbDirName()));
changelog2 = null;
}
@@ -1696,6 +1703,8 @@
{
changelog3.clearDb();
changelog3.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ changelog3.getDbDirName()));
changelog3 = null;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 9e46222..5607e71 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication;
@@ -88,6 +89,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.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -483,6 +485,8 @@
// Clean RS databases
cleanUpReplicationServersDB();
+ removeReplicationServerDB();
+
cleanConfigEntries();
configEntryList = new LinkedList<DN>();
@@ -493,29 +497,6 @@
// (in case our test created some emtries in it)
TestCaseUtils.initializeTestBackend(true);
- // Clean the default DB dir for replication server
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String rsDbDirPath = buildRoot + File.separator + "build" +
- File.separator + "unit-tests" + File.separator +
- "package-instance"+ File.separator + "changelogDb";
-
- File rsDbDir = new File(rsDbDirPath);
- if (rsDbDir != null)
- {
- File[] dbFiles = rsDbDir.listFiles();
- if (dbFiles != null)
- {
- for (File dbFile : dbFiles)
- {
- if (dbFile != null)
- TRACER.debugInfo("ReplicationTestCase: classCleanUp: deleting " + dbFile);
- dbFile.delete();
- }
- }
- TRACER.debugInfo("ReplicationTestCase: classCleanUp: deleting " + rsDbDir);
- rsDbDir.delete();
- }
-
// Check for unexpected replication config/objects left
if (callParanoiaCheck)
paranoiaCheck();
@@ -571,6 +552,17 @@
}
/**
+ * Remove trailing directories and databases of the currently instantiated
+ * replication servers.
+ */
+ protected void removeReplicationServerDB() {
+ for (ReplicationServer rs : ReplicationServer.getAllInstances()) {
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs.getDbDirName()));
+ }
+ }
+
+ /**
* Performs a search on the config backend with the specified filter.
* Fails if a config entry is found.
* @param filter The filter to apply for the search
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
index e978e05..6af1251 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -518,6 +521,8 @@
{
replicationServer.clearDb();
replicationServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replicationServer.getDbDirName()));
replicationServer = null;
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
index f622eaf..a0b31c9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
@@ -23,9 +23,13 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import org.opends.server.util.StaticUtils;
+import org.opends.server.core.DirectoryServer;
+import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.SortedSet;
@@ -127,6 +131,8 @@
{
rs1.clearDb();
rs1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs1.getDbDirName()));
rs1 = null;
}
@@ -134,12 +140,16 @@
{
rs2.clearDb();
rs2.remove();
- rs2 = null;
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs2.getDbDirName()));
+ rs2 = null;
}
if (rs3 != null)
{
rs3.clearDb();
rs3.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs3.getDbDirName()));
rs3 = null;
}
rs1Port = -1;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 8382623..df3d396 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -23,9 +23,11 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import java.io.File;
import static org.opends.server.TestCaseUtils.TEST_ROOT_DN_STRING;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -64,6 +66,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
+import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
import org.testng.annotations.Test;
@@ -231,6 +234,8 @@
{
MultimasterReplication.deleteDomain(baseDn);
rs.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs.getDbDirName()));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 3d46d40..dd1b9ed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -23,9 +23,13 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import java.io.IOException;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.ErrorLogger.logError;
@@ -118,6 +122,9 @@
{
rs1.clearDb();
rs1.remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ rs1.getDbDirName()));
rs1 = null;
}
@@ -125,6 +132,9 @@
{
rs2.clearDb();
rs2.remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ rs2.getDbDirName()));
rs2 = null;
}
rs1Port = -1;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
index 7cb1467..71b3bdf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import java.io.File;
+import org.opends.server.util.StaticUtils;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.Iterator;
@@ -44,6 +47,7 @@
import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.ReplicationServerCfg;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
@@ -152,6 +156,8 @@
{
rs[i].clearDb();
rs[i].remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs[i].getDbDirName()));
rs[i] = null;
}
rsPort[i] = -1;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
index 74cb1b2..b50ebcb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.plugin;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.SocketException;
@@ -157,6 +160,8 @@
{
rs1.clearDb();
rs1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs1.getDbDirName()));
rs1 = null;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
index 9fe2b57..31added 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -27,6 +27,9 @@
*/
package org.opends.server.replication.server;
+import org.opends.server.util.StaticUtils;
+import org.opends.server.core.DirectoryServer;
+import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
@@ -342,6 +345,8 @@
{
rs1.clearDb();
rs1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs1.getDbDirName()));
rs1 = null;
}
@@ -349,18 +354,24 @@
{
rs2.clearDb();
rs2.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs2.getDbDirName()));
rs2 = null;
}
if (rs3 != null)
{
rs3.clearDb();
rs3.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs3.getDbDirName()));
rs3 = null;
}
if (rs4 != null)
{
rs4.clearDb();
rs4.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ rs4.getDbDirName()));
rs4 = null;
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index 9eb01bf..32556b1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.server;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
@@ -483,19 +486,25 @@
{
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();
- replServer3 = null;
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer3.getDbDirName()));
+ replServer3 = null;
}
super.cleanRealEntries();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 0791e51..656000d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -27,6 +27,7 @@
*/
package org.opends.server.replication.server;
+import org.opends.server.util.StaticUtils;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.replication.protocol.OperationContext.SYNCHROCONTEXT;
@@ -122,7 +123,8 @@
private ChangeNumber unknownChangeNumberServer1;
-
+ private static final String exportLDIFAllFile = "exportLDIF.ldif";
+ private String exportLDIFDomainFile = null;
/**
* Set up the environment for performing the tests in this Class.
* Replication
@@ -958,9 +960,19 @@
finally
{
if (changelogs[0] != null)
+ {
changelogs[0].remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ changelogs[0].getDbDirName()));
+ }
if (changelogs[1] != null)
+ {
changelogs[1].remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ changelogs[1].getDbDirName()));
+ }
if (broker1 != null)
broker1.stop();
if (broker2 != null)
@@ -1114,9 +1126,13 @@
{
callParanoiaCheck = false;
super.classCleanUp();
-
+ String dirName = replicationServer.getDbDirName();
+
shutdown();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ dirName));
+
paranoiaCheck();
}
@@ -1314,11 +1330,21 @@
Entry exportTask = createExportAllTask();
addTask(exportTask, ResultCode.SUCCESS, null);
waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
-
+ // Not doing anything with the export file, let's delete it
+ File f = new File(DirectoryServer.getInstanceRoot(),exportLDIFAllFile);
+ f.delete();
+
debugInfo("Export domain");
exportTask = createExportDomainTask("dc=domain2,dc=com");
addTask(exportTask, ResultCode.SUCCESS, null);
waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
+ // Not doing anything with the export file, let's delete it
+ if (exportLDIFDomainFile != null)
+ {
+ File aFile = new File(DirectoryServer.getInstanceRoot(),
+ exportLDIFDomainFile);
+ aFile.delete();
+ }
} finally {
if (server1 != null)
server1.stop();
@@ -1360,14 +1386,13 @@
private Entry createExportAllTask()
throws Exception
{
- String path = "exportLDIF.ldif";
return TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-export",
"ds-task-class-name: org.opends.server.tasks.ExportTask",
- "ds-task-export-ldif-file: " + path,
+ "ds-task-export-ldif-file: " + exportLDIFAllFile,
"ds-task-export-backend-id: replicationChanges",
"ds-task-export-include-branch: dc=replicationChanges");
}
@@ -1376,14 +1401,14 @@
throws Exception
{
String root = suffix.substring(suffix.indexOf('=')+1, suffix.indexOf(','));
- String path = "exportLDIF" + root +".ldif";
+ exportLDIFDomainFile = "exportLDIF" + root +".ldif";
return TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-export",
"ds-task-class-name: org.opends.server.tasks.ExportTask",
- "ds-task-export-ldif-file: " + path,
+ "ds-task-export-ldif-file: " + exportLDIFDomainFile,
"ds-task-export-backend-id: replicationChanges",
"ds-task-export-include-branch: "+suffix+",dc=replicationChanges");
}
@@ -1951,9 +1976,19 @@
finally
{
if (changelogs[0] != null)
+ {
changelogs[0].remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ changelogs[0].getDbDirName()));
+ }
if (changelogs[1] != null)
+ {
changelogs[1].remove();
+ StaticUtils.recursiveDelete
+ (new File(DirectoryServer.getInstanceRoot(),
+ changelogs[1].getDbDirName()));
+ }
if (broker1 != null)
broker1.stop();
if (broker2 != null)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
index a331d2d..301d242 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -23,9 +23,11 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.service;
+import java.io.File;
import static org.testng.Assert.*;
import java.util.List;
@@ -39,6 +41,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import org.opends.server.TestCaseUtils;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.DSInfo;
import org.opends.server.replication.common.RSInfo;
@@ -47,6 +50,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.util.StaticUtils;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -233,10 +237,17 @@
domain2.stopDomain();
if (replServer1 != null)
+ {
replServer1.remove();
-
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer1.getDbDirName()));
+ }
if (replServer2 != null)
+ {
replServer2.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer2.getDbDirName()));
+ }
}
}
@@ -317,7 +328,11 @@
domain1.disableService();
if (replServer1 != null)
+ {
replServer1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer1.getDbDirName()));
+ }
}
}
@@ -410,7 +425,11 @@
domain2.disableService();
if (replServer != null)
+ {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
}
}
@@ -505,10 +524,17 @@
domain2.disableService();
if (replServer1 != null)
+ {
replServer1.remove();
-
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer1.getDbDirName()));
+ }
if (replServer2 != null)
+ {
replServer2.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer2.getDbDirName()));
+ }
}
}
@@ -569,7 +595,11 @@
domain1.disableService();
if (replServer != null)
+ {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
}
}
@@ -631,7 +661,11 @@
domain1.disableService();
if (replServer != null)
+ {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index 0921a0c..88e6186 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.types;
@@ -113,7 +114,8 @@
throws Exception
{
TestCaseUtils.startServer();
-
+ TestCaseUtils.enableBackend("unindexedRoot");
+
TestCaseUtils.dsconfig(
"set-sasl-mechanism-handler-prop",
"--handler-name", "DIGEST-MD5",
@@ -362,6 +364,9 @@
deleteOperation = conn.processDelete(DN
.decode("dc=unindexed,dc=jeb"));
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
+
+ TestCaseUtils.disableBackend("unindexedRoot");
+
}
--
Gitblit v1.10.0