From 43ba6d721185f9a810761720fcb05103b31d17b7 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Wed, 29 Oct 2008 10:39:44 +0000
Subject: [PATCH] Fix 3534: Provide native Solaris packages (fix also 3533: upgrade fails starting server adding entry ds-cfg-key-id)

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 7cab354..19249d4 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
@@ -706,7 +706,7 @@
     String attrName = "testaddattributetypetoaltschemafile";
     assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-attrtype.ldif");
     assertFalse(schemaFile.exists());
 
@@ -802,7 +802,7 @@
     String attrName = "testreplaceattributetypeinaltschemafile";
     assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-replaceattrtype.ldif");
     assertFalse(schemaFile.exists());
 
@@ -1676,7 +1676,7 @@
     String ocName = "testaddobjectclasstoaltschemafile";
     assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-oc.ldif");
     assertFalse(schemaFile.exists());
 
@@ -2476,7 +2476,7 @@
     String nameFormName = "testaddnameformtoaltschemafile";
     assertFalse(DirectoryServer.getSchema().hasNameForm(nameFormName));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-nameform.ldif");
     assertFalse(schemaFile.exists());
 
@@ -3229,7 +3229,7 @@
     String ocName = "testadddcrtoaltschemafileoc";
     assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-dcr.ldif");
     assertFalse(schemaFile.exists());
 
@@ -4286,7 +4286,7 @@
     int ruleID = 999010;
     assertFalse(DirectoryServer.getSchema().hasDITStructureRule(ruleID));
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-dsr.ldif");
     assertFalse(schemaFile.exists());
 
@@ -4777,7 +4777,7 @@
       "-f", path
     };
 
-    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(),
+    File schemaFile = new File(SchemaConfigManager.getSchemaDirectoryPath(true),
                                "98-schema-test-mru.ldif");
     assertFalse(schemaFile.exists());
 

--
Gitblit v1.10.0