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/LDIFBackendTestCase.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
index e4d25ad..67763a9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
@@ -40,8 +40,8 @@
import org.opends.server.protocols.internal.SearchRequest;
import org.opends.server.tasks.LdifFileWriter;
import org.opends.server.tasks.TasksTestCase;
-import org.opends.server.tools.LDAPModify;
-import org.opends.server.tools.LDAPSearch;
+import com.forgerock.opendj.ldap.tools.LDAPModify;
+import com.forgerock.opendj.ldap.tools.LDAPSearch;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -177,7 +177,7 @@
"-w", "password",
"-f", subtreeDeletePath
};
- resultCode = LDAPModify.mainModify(args, false, System.out, System.err);
+ resultCode = LDAPModify.run(System.out, System.err, args);
assertEquals(resultCode, ResultCode.NOT_ALLOWED_ON_NONLEAF.intValue());
@@ -192,7 +192,7 @@
"-J", "subtreeDelete",
"-f", subtreeDeletePath
};
- resultCode = LDAPModify.mainModify(args, false, System.out, System.err);
+ resultCode = LDAPModify.run(System.out, System.err, args);
assertEquals(resultCode, 0);
}
@@ -270,7 +270,7 @@
"-J", "subtreeDelete",
"-f", path
};
- assertEquals(LDAPModify.mainModify(args, false, System.out, System.err), 0);
+ assertEquals(LDAPModify.run(System.out, System.err, args), 0);
assertFalse(DirectoryServer.entryExists(DN.valueOf("o=ldif")));
assertFalse(DirectoryServer.entryExists(
DN.valueOf("uid=user.1,ou=People,o=ldif")));
@@ -312,7 +312,7 @@
"(objectClass=*)"
};
- assertEquals(LDAPSearch.mainSearch(args, false, System.out, System.err), 0);
+ assertEquals(LDAPSearch.run(System.out, System.err, args), 0);
}
@@ -356,7 +356,7 @@
"-w", "password",
"-f", path
};
- assertEquals(LDAPModify.mainModify(args, false, System.out, System.err), 0);
+ assertEquals(LDAPModify.run(System.out, System.err, args), 0);
}
--
Gitblit v1.10.0