From 35af51f9683f5ef8cec66baca7b89aa1e1cbc44e Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 11 May 2007 23:27:30 +0000
Subject: [PATCH] Issue 1532: Remove ConfigEntry from Backend API. (DS-1532)
---
opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index f621287..ad41d50 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -30,29 +30,23 @@
import java.io.File;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.server.SchemaBackendCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.LDAPModify;
-import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DITContentRule;
import org.opends.server.types.DN;
@@ -62,10 +56,7 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.MatchingRuleUse;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ModificationType;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.RDN;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
@@ -86,7 +77,6 @@
private SchemaBackend schemaBackend;
-
/**
* Ensures that the Directory Server is running and gets a reference to the
* schema backend.
@@ -117,7 +107,7 @@
throws Exception
{
SchemaBackend schemaBackend = new SchemaBackend();
- schemaBackend.initializeBackend(null, new DN[0]);
+ schemaBackend.configureBackend(null);
}
@@ -5346,20 +5336,13 @@
public void testExportLDIF()
throws Exception
{
- DN configEntryDN =
- DN.decode("ds-cfg-backend-id=schema,cn=Backends,cn=config");
- DN[] baseDNs = { DN.decode("cn=schema") };
-
- ConfigEntry configEntry =
- DirectoryServer.getConfigHandler().getConfigEntry(configEntryDN);
-
File tempFile = File.createTempFile("schema", "testExportLDIF");
tempFile.deleteOnExit();
LDIFExportConfig exportConfig =
new LDIFExportConfig(tempFile.getAbsolutePath(),
ExistingFileBehavior.OVERWRITE);
- schemaBackend.exportLDIF(configEntry, baseDNs, exportConfig);
+ schemaBackend.exportLDIF(exportConfig);
assertTrue(tempFile.exists());
assertTrue(tempFile.length() > 0);
@@ -5376,20 +5359,13 @@
public void testImportLDIF()
throws Exception
{
- DN configEntryDN =
- DN.decode("cn=schema,cn=Backends,cn=config");
- DN[] baseDNs = { DN.decode("cn=schema") };
-
- ConfigEntry configEntry =
- DirectoryServer.getConfigHandler().getConfigEntry(configEntryDN);
-
File tempFile = File.createTempFile("schema", "testImportLDIF");
tempFile.deleteOnExit();
LDIFImportConfig importConfig =
new LDIFImportConfig(tempFile.getAbsolutePath());
- schemaBackend.importLDIF(configEntry, baseDNs, importConfig);
+ schemaBackend.importLDIF(importConfig);
}
--
Gitblit v1.10.0