From f2081ed7fa0035da4567342a9510fb0112c02ccf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:23 +0000
Subject: [PATCH] OPENDJ-3089 Remove simple references to SchemaConfigManager
---
opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index a8fc1d5..0888784 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -32,7 +32,6 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.SchemaTestMatchingRuleImpl;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.SchemaConfigManager;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -107,7 +106,7 @@
registerNewMatchingRule("testAddValidSchemaFileMatch", "1.3.6.1.4.1.26027.1.999.23");
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
+ String schemaDirectory = getSchemaDirectory();
String[] fileLines =
{
@@ -197,7 +196,7 @@
"APPLIES testAddMultipleValidSchemaFiles1AT )"
};
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
+ String schemaDirectory = getSchemaDirectory();
File validFile1 = new File(schemaDirectory, "05-multiple-valid-1.ldif");
writeLines(validFile1, fileLines1);
@@ -332,7 +331,7 @@
Thread.sleep(2);
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
+ String schemaDirectory = getSchemaDirectory();
File emptyFile = new File(schemaDirectory, "05-empty.ldif");
emptyFile.createNewFile();
@@ -364,7 +363,7 @@
public void testAddInvalidSchemaFile()
throws Exception
{
- String schemaDirectory = SchemaConfigManager.getSchemaDirectoryPath();
+ String schemaDirectory = getSchemaDirectory();
File invalidFile = new File(schemaDirectory, "05-invalid.ldif");
try (BufferedWriter writer = new BufferedWriter(new FileWriter(invalidFile)))
@@ -386,4 +385,9 @@
assertFalse(resultCode == 0);
invalidFile.delete();
}
+
+ private String getSchemaDirectory()
+ {
+ return DirectoryServer.getEnvironmentConfig().getSchemaDirectory().getPath();
+ }
}
--
Gitblit v1.10.0