From 08a8540072a370b4e7e9604eb97818dcfd4d74c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2773 Remove duplicated server tools
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
index 0619d92..131b9e0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
@@ -24,6 +24,7 @@
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.types.ExistingFileBehavior.*;
+import static org.opends.server.types.NullOutputStream.nullPrintStream;
import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
@@ -62,7 +63,7 @@
import org.opends.server.schema.SchemaConstants;
import org.opends.server.schema.SchemaHandler;
import org.opends.server.schema.SchemaHandler.SchemaUpdater;
-import org.opends.server.tools.LDAPModify;
+import com.forgerock.opendj.ldap.tools.LDAPModify;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFExportConfig;
@@ -4284,7 +4285,7 @@
private void runModify(String[] args, String ldifContent, ResultCode expectedRC)
{
- runModify(args, ldifContent, null, expectedRC);
+ runModify(args, ldifContent, nullPrintStream(), expectedRC);
}
private void runModify(String[] args, String ldifContent, PrintStream stderr, ResultCode expectedRC)
@@ -4300,7 +4301,7 @@
try
{
System.setIn(new ByteArrayInputStream(ldifContent.getBytes()));
- return LDAPModify.mainModify(args, false, stdout, stderr);
+ return LDAPModify.run(stdout, stderr, args);
}
finally
{
--
Gitblit v1.10.0