From 3fa56f675fdf8c49c9cb2abcfd478172e5acfe53 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:24 +0000
Subject: [PATCH] OPENDJ-3089 Remove all remaining references to server Schema class
---
opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
index 302bd34..c186053 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
@@ -20,7 +20,9 @@
import java.io.File;
import org.forgerock.opendj.config.server.ServerManagementContext;
+import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.config.ConfigurationHandler;
+import org.opends.server.core.SchemaHandler;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.InitializationException;
@@ -60,10 +62,18 @@
return this;
}
- public ServerContextBuilder schema(org.opends.server.types.Schema schema)
+ public ServerContextBuilder schema(Schema schema)
{
when(serverContext.getSchema()).thenReturn(schema);
- when(serverContext.getSchemaNG()).thenReturn(schema.getSchemaNG());
+ when(serverContext.getSchemaNG()).thenReturn(schema);
+ return this;
+ }
+
+ public ServerContextBuilder schemaHandler(SchemaHandler handler)
+ {
+ when(serverContext.getSchemaHandler()).thenReturn(handler);
+ when(serverContext.getSchema()).thenReturn(handler.getSchema());
+ when(serverContext.getSchemaNG()).thenReturn(handler.getSchema());
return this;
}
--
Gitblit v1.10.0