From ddf7385f6d72164c9e66aff00b3a4f076ec69c78 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 21 Apr 2016 16:03:20 +0000
Subject: [PATCH] Consolidated InternalClientConnection.processModifyDN() methods
---
opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 4cdd024..e4d25ad 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
@@ -16,6 +16,7 @@
*/
package org.opends.server.backends;
+import static org.forgerock.opendj.ldap.requests.Requests.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.testng.Assert.*;
@@ -381,15 +382,13 @@
assertTrue(DirectoryServer.entryExists(beforeDN));
assertFalse(DirectoryServer.entryExists(afterDN));
- InternalClientConnection conn = getRootConnection();
- ModifyDNOperation modifyDNOperation =
- conn.processModifyDN("ou=leaf before,o=ldif", "ou=leaf after", true);
+ ModifyDNOperation modifyDNOperation = processModifyDN("ou=leaf before,o=ldif", "ou=leaf after", true);
assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);
assertFalse(DirectoryServer.entryExists(beforeDN));
assertTrue(DirectoryServer.entryExists(afterDN));
- DeleteOperation deleteOperation = conn.processDelete(afterDN);
+ DeleteOperation deleteOperation = getRootConnection().processDelete(afterDN);
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertFalse(DirectoryServer.entryExists(afterDN));
}
@@ -411,14 +410,11 @@
"objectClass: organizationalUnit",
"ou: new entry");
- InternalClientConnection conn = getRootConnection();
- ModifyDNOperation modifyDNOperation =
- conn.processModifyDN("ou=new entry,o=ldif", "ou=People", true);
- assertEquals(modifyDNOperation.getResultCode(),
- ResultCode.ENTRY_ALREADY_EXISTS);
+ ModifyDNOperation modifyDNOperation = processModifyDN("ou=new entry,o=ldif", "ou=People", true);
+ assertEquals(modifyDNOperation.getResultCode(), ResultCode.ENTRY_ALREADY_EXISTS);
assertTrue(DirectoryServer.entryExists(DN.valueOf("ou=new entry,o=ldif")));
- DeleteOperation deleteOperation = conn.processDelete("ou=new entry,o=ldif");
+ DeleteOperation deleteOperation = getRootConnection().processDelete("ou=new entry,o=ldif");
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertFalse(DirectoryServer.entryExists(DN.valueOf("ou=new entry,o=ldif")));
}
@@ -483,9 +479,7 @@
assertTrue(DirectoryServer.entryExists(childBeforeDN));
assertFalse(DirectoryServer.entryExists(childAfterDN));
- InternalClientConnection conn = getRootConnection();
- ModifyDNOperation modifyDNOperation =
- conn.processModifyDN("ou=People,o=ldif", "ou=Users", true);
+ ModifyDNOperation modifyDNOperation = processModifyDN("ou=People,o=ldif", "ou=Users", true);
assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);
assertFalse(DirectoryServer.entryExists(beforeDN));
@@ -494,8 +488,7 @@
assertFalse(DirectoryServer.entryExists(childBeforeDN));
assertTrue(DirectoryServer.entryExists(childAfterDN));
- modifyDNOperation =
- conn.processModifyDN("ou=Users,o=ldif", "ou=People", true);
+ modifyDNOperation = processModifyDN("ou=Users,o=ldif", "ou=People", true);
assertTrue(DirectoryServer.entryExists(beforeDN));
assertFalse(DirectoryServer.entryExists(afterDN));
@@ -504,7 +497,10 @@
assertFalse(DirectoryServer.entryExists(childAfterDN));
}
-
+ private ModifyDNOperation processModifyDN(String name, String newRDN, boolean deleteOldRDN)
+ {
+ return getRootConnection().processModifyDN(newModifyDNRequest(name, newRDN).setDeleteOldRDN(deleteOldRDN));
+ }
/**
* Tests to ensure that a base-level search works as expected.
--
Gitblit v1.10.0