From 9aa1482c49865483f798f91ef7d16f03cc3ec811 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Nov 2015 15:09:53 +0000
Subject: [PATCH] TestCaseUtils.java: clearJEBackend() => clearBackend()
---
opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java | 6 +-
opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java | 14 +---
opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java | 6 +-
opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java | 30 +++++-----
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 12 ++--
opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java | 12 +--
opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 2
28 files changed, 69 insertions(+), 75 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index ba89694..8b2f89f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -557,7 +557,7 @@
{
for (Backend<?> backend : DirectoryServer.getBackends().values()) {
if (backend instanceof BackendImpl) {
- clearJEBackend(backend.getBackendID());
+ clearBackend(backend.getBackendID());
}
}
}
@@ -830,23 +830,23 @@
}
/**
- * Clears all the entries from the JE backend determined by the backend id passed into the method.
+ * Clears all the entries from the backend determined by the backend id passed into the method.
*
* @throws Exception If an unexpected problem occurs.
*/
- public static void clearJEBackend(String backendId) throws Exception
+ public static void clearBackend(String backendId) throws Exception
{
- clearJEBackend(backendId, null);
+ clearBackend(backendId, null);
}
/**
- * Clears all the entries from the JE backend determined by the backend id passed into the method.
+ * Clears all the entries from the backend determined by the backend id passed into the method.
*
* @param backendId The backend id to clear
* @param baseDN If not null, the suffix of the backend to create
* @throws Exception If an unexpected problem occurs.
*/
- public static void clearJEBackend(String backendId, String baseDN) throws Exception
+ public static void clearBackend(String backendId, String baseDN) throws Exception
{
Backend<?> b = DirectoryServer.getBackend(backendId);
if (clearBackend(b) && baseDN != null)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
index 675d984..4d6bc19 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
@@ -74,7 +74,7 @@
Reporter.log("Running aciTestCaseSetup");
TestCaseUtils.startServer();
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.initializeTestBackend(true);
// Save Global ACI.
@@ -96,7 +96,7 @@
{
Reporter.log("Running aciTestCaseTearDown");
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
TestCaseUtils.initializeTestBackend(true);
// Restore Global ACI.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
index 661f888..75bd8d6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
@@ -123,7 +123,7 @@
*/
private void populateDB() throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
index 8047a8b..3a37213 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
@@ -123,7 +123,7 @@
private void populateDB()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
index f9f5757..5b2f240 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
@@ -1723,7 +1723,7 @@
@Test
public void testSimpleBindReferral() throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntry(
"dn: ou=people,dc=example,dc=com",
@@ -1890,7 +1890,7 @@
throws Exception
{
TestCaseUtils.restartServer();
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: ou=people,dc=example,dc=com",
"objectClass: organizationalUnit",
@@ -1948,8 +1948,7 @@
s.close();
- // Cleanup.
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
@@ -1966,7 +1965,7 @@
throws Exception
{
TestCaseUtils.restartServer();
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: ou=people,dc=example,dc=com",
"objectClass: organizationalUnit",
@@ -2034,8 +2033,7 @@
s.close();
- // Cleanup.
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
index 31232c3..05de01c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.core;
-
-
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -2145,7 +2143,7 @@
throws Exception
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
GroupManager groupManager = DirectoryServer.getGroupManager();
groupManager.deregisterAllGroups();
@@ -2244,7 +2242,7 @@
*/
@Test
public void testSubtreeDelete() throws Exception {
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
GroupManager groupManager = DirectoryServer.getGroupManager();
groupManager.deregisterAllGroups();
addSubtreeGroupTestEntries();
@@ -2292,8 +2290,7 @@
DN.valueOf("cn=group2,ou=groups,dc=example,dc=com"));
assertNull(group3);
- // Cleanup.
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
/**
@@ -2303,7 +2300,7 @@
*/
@Test
public void testSubtreeModify() throws Exception {
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
GroupManager groupManager = DirectoryServer.getGroupManager();
groupManager.deregisterAllGroups();
addSubtreeGroupTestEntries();
@@ -2363,8 +2360,7 @@
assertNotNull(newGroup3);
assertTrue(conn.isMemberOf(newGroup3, null));
- // Cleanup.
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
index 724a151..d53421a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
@@ -3683,7 +3683,7 @@
public void testCompressedSchemaRefresh() throws Exception
{
String baseDN = "dc=example,dc=com";
- TestCaseUtils.clearJEBackend("userRoot", baseDN);
+ TestCaseUtils.clearBackend("userRoot", baseDN);
TestCaseUtils.addEntry("dn: cn=Test User," + baseDN,
"objectClass: top", "objectClass: person",
"objectClass: organizationalPerson", "sn: User", "cn: Test User");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
index 12f08a0..a355a37 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
@@ -72,7 +72,7 @@
public void setUp() throws Exception
{
TestCaseUtils.startServer();
- TestCaseUtils.clearJEBackend("userRoot","dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot","dc=example,dc=com");
DN suffixDN = DN.valueOf(SUFFIX);
if (!DirectoryServer.entryExists(suffixDN))
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
index 91b37f9..2ef5d34 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
@@ -82,7 +82,7 @@
public void setUp() throws Exception
{
TestCaseUtils.startServer();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
addTestEntries();
}
@@ -100,7 +100,7 @@
subentryList = manager.getCollectiveSubentries(testEntry.getName());
assertThat(subentryList).isEmpty();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
@BeforeMethod
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
index a4f66f0..1941faf 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
@@ -61,7 +61,7 @@
public void setUp() throws Exception
{
TestCaseUtils.startServer();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
// Add suffix entry.
DN suffixDN = DN.valueOf(SUFFIX);
@@ -104,7 +104,7 @@
@AfterClass
public void cleanUp() throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
index 4b66948..2de167e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
@@ -86,7 +86,7 @@
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
// Add the example.com entry
TestCaseUtils.addEntry(
@@ -926,7 +926,7 @@
try
{
InvocationCounterPlugin.resetAllCounters();
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: ou=People,dc=example,dc=com",
@@ -992,7 +992,7 @@
try
{
InvocationCounterPlugin.resetAllCounters();
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: ou=Org 1,dc=example,dc=com",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index 5cfe481..6d5c1e5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -74,7 +74,7 @@
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
entryDNType = DirectoryServer.getAttributeTypeOrNull("entrydn");
assertNotNull(entryDNType);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index de46683..417a51f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -149,7 +149,7 @@
String uuidString =
UUID.nameUUIDFromBytes(getBytes("dc=example,dc=com")).toString();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
Entry e = TestCaseUtils.addEntry(
"dn: dc=example,dc=com",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 778de1b..d87761f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -78,7 +78,7 @@
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
governingStructureRuleType = DirectoryServer.getAttributeTypeOrNull("governingstructurerule");
assertNotNull(governingStructureRuleType);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index a26a098..c096f7d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -166,7 +166,7 @@
"postalAddress: Aarika Atpco$59208 Elm Street$Youngstown, HI 57377",
"description: This is the description for Aarika Atpco.");
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
TestCaseUtils.addEntries(entries);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index edea02f..ec63963 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -162,7 +162,7 @@
"postalAddress: Aarika Atpco$59208 Elm Street$Youngstown, HI 57377",
"description: This is the description for Aarika Atpco.");
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
TestCaseUtils.addEntries(entries);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 7eb3811..01f32d3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -75,7 +75,7 @@
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
structuralObjectClassType = DirectoryServer.getAttributeTypeOrNull("structuralobjectclass");
assertNotNull(structuralObjectClassType);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index 452539f..346b865 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -74,7 +74,7 @@
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
subschemaSubentryType = DirectoryServer.getAttributeTypeOrNull("subschemasubentry");
assertNotNull(subschemaSubentryType);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index a6ce17e..400c131 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -829,7 +829,7 @@
replaceAttrEntry(configDN, dsConfigUpdateInterval,"0 seconds");
TestCaseUtils.initializeTestBackend(true);
addTestEntries("o=test");
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
addTestEntries("dc=example,dc=com");
}
@@ -849,7 +849,7 @@
//unit tests.
replaceAttrEntry(configDN, dsConfigAttrType,"seeAlso");
replaceAttrEntry(configDN, dsConfigUpdateInterval,"0 seconds");
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index b22b130..f83cd1b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -73,7 +73,7 @@
//Add entries to two backends to test public naming context.
addTestEntries("o=test", 't');
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
addTestEntries("dc=example,dc=com", 'x');
uidConfigDN=DN.valueOf("cn=UID Unique Attribute ,cn=Plugins,cn=config");
testConfigDN=DN.valueOf("cn=Test Unique Attribute,cn=Plugins,cn=config");
@@ -104,7 +104,7 @@
@AfterClass
public void tearDown() throws Exception {
clearConfigEntries();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
clearAcis("o=test");
TestCaseUtils.clearMemoryBackend(TestCaseUtils.TEST_BACKEND_ID);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
index 05709ae..3f78da8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
@@ -137,7 +137,7 @@
// (like the test backend we use in every tests): backend is disabled then
// re-enabled and this clears the backend reference and thus the underlying
// data. So for this particular test, we use a classical backend.
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
// For most tests, a limited number of entries is enough
updatedEntries = newLDIFEntries(2);
@@ -515,7 +515,7 @@
+ "ds-cfg-receive-status: true\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE;
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
addSynchroServerEntry(synchroServerLdif);
@@ -1345,7 +1345,7 @@
callParanoiaCheck = false;
super.classCleanUp();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
paranoiaCheck();
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
index 89b72b0..09fc68c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
@@ -79,7 +79,7 @@
// re-enabled and this clears the backend reference and thus the underlying
// data. So for this particular test, we use a classical backend. Let's
// clear it and create the root entry
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
addEntry("dn: dc=example,dc=com\n" + "objectClass: top\n"
+ "objectClass: domain\n");
@@ -233,7 +233,7 @@
entriesToCleanup.remove(DN.valueOf(EXAMPLE_DN));
super.classCleanUp();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
TestCaseUtils.deleteDirectory(reSyncTempDir);
paranoiaCheck();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
index 11fa1dc..d279a51 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -865,7 +865,7 @@
// We need a backend with a real configuration in cn=config as at import time
// the real domain will check for backend existence in cn=config. So we use
// dc=example,dc=com for this particular test.
- clearJEBackend("userRoot");
+ clearBackend("userRoot");
try
{
@@ -1103,7 +1103,7 @@
// We need a backend with a real configuration in cn=config as at import time
// the real domain will check for backend existence in cn=config. So we use
// dc=example,dc=com for this particular test.
- clearJEBackend("userRoot");
+ clearBackend("userRoot");
try
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
index 1173dc6..1a845d8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
@@ -652,7 +652,7 @@
// going into degraded status, we need to send a lot of updates. This makes
// the memory test backend crash with OutOfMemoryError. So we prefer here
// a backend backed up with a file
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
/**
@@ -667,7 +667,7 @@
callParanoiaCheck = false;
super.classCleanUp();
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
paranoiaCheck();
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
index 9e403ee..e8e4c11 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -347,7 +347,7 @@
}
finally
{
- TestCaseUtils.clearJEBackend("userRoot");
+ TestCaseUtils.clearBackend("userRoot");
}
}
@@ -364,7 +364,7 @@
private void populateEntriesForControl() throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: cn=user1,dc=example,dc=com",
"objectclass: inetorgperson",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
index bd5751e..f5c467a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
@@ -63,7 +63,7 @@
/** Adds an entry for test. */
private void addEntry() throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: cn=Jos\u00E9,dc=example, dc=com",
"objectClass: person",
@@ -95,7 +95,7 @@
}
finally
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
}
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java
index 8e011c6..53bffcd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java
@@ -1510,7 +1510,7 @@
public void testSimplePagedResults()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: cn=device 1,dc=example,dc=com",
@@ -1567,7 +1567,7 @@
public void testSortWithPagedResults()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -1707,7 +1707,7 @@
public void testSortValidGivenNameAscending()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -1768,7 +1768,7 @@
public void testSortValidGivenNameDescending()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -1829,7 +1829,7 @@
public void testSortValidGivenNameAscendingCaseExactOrderingMatch()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -1890,7 +1890,7 @@
public void testSortValidSnAscendingGivenNameAscending()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -1951,7 +1951,7 @@
public void testSortValidSnAscendingGivenNameDescending()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
@@ -2012,7 +2012,7 @@
public void testSortEmptySortOrder()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2042,7 +2042,7 @@
public void testSortSortOrderMissingType()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2072,7 +2072,7 @@
public void testSortSortOrderMissingMatchingRule()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2101,7 +2101,7 @@
public void testSortUndefinedAttribute()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2131,7 +2131,7 @@
public void testSortUndefinedOrderingRule()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2192,7 +2192,7 @@
{
// Test is supposed to fail in parsing arguments. But we do not
// want it to fail because there no backend to search in.
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2222,7 +2222,7 @@
public void testSortWithVLVAndPagedResults()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
String[] args =
{
@@ -2341,7 +2341,7 @@
public void testSortWithVLV()
throws Exception
{
- TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
+ TestCaseUtils.clearBackend("userRoot", "dc=example,dc=com");
TestCaseUtils.addEntries(
"dn: uid=albert.zimmerman,dc=example,dc=com",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java b/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
index 4782f75..b91aa84 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
@@ -82,7 +82,7 @@
String backendBaseDNName = "ds-cfg-base-dn";
// Initialize a backend with a base entry.
- TestCaseUtils.clearJEBackend("userRoot", suffix);
+ TestCaseUtils.clearBackend("userRoot", suffix);
// Check that suffix is accessible while suffix2 is not.
searchEntry(suffix, ResultCode.SUCCESS);
--
Gitblit v1.10.0