From 684830f9e78326aba7a0140444c0e41dcfaff809 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 25 Feb 2016 09:44:28 +0000
Subject: [PATCH] Code cleanup: - Replaced use of Socket by RemoteConnection - Replaced use of the various InternalClientConnection.processModify() methods by InternalClientConnection.processModify(ModifyRequest) everywhere it is not critical and perfs will be equivalent
---
opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java | 54 ++++++++++++++++--------------------------------------
1 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
index 6e8ab43..dabfd2b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
@@ -12,62 +12,44 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools;
-
+import static org.forgerock.opendj.ldap.ModificationType.*;
+import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.testng.Assert.*;
-import java.util.ArrayList;
-
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.requests.ModifyRequest;
+import org.forgerock.opendj.ldap.requests.Requests;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attributes;
-import org.opends.server.types.DN;
-import org.opends.server.types.Modification;
-import org.forgerock.opendj.ldap.ModificationType;
-import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
-
-
-/**
- * A set of test cases for the verify-index tool (see issue #1897).
- */
+/** A set of test cases for the verify-index tool (see issue #1897). */
+@SuppressWarnings("javadoc")
public class VerifyIndexTestCase
extends ToolsTestCase
{
private String configFilePath ;
- /**
- * Ensures that the Directory Server is running and performs other necessary
- * setup.
- *
- * @throws Exception If an unexpected problem occurs.
- */
+ /** Ensures that the Directory Server is running and performs other necessary setup. */
@BeforeClass
- public void setup()
- throws Exception
+ public void setup() throws Exception
{
TestCaseUtils.startServer();
configFilePath = DirectoryServer.getConfigFile();
// Add the airius.com suffix to userRoot
- InternalClientConnection rootConnection =
- InternalClientConnection.getRootConnection();
- ArrayList<Modification> mods = new ArrayList<>();
- mods.add(new Modification(ModificationType.ADD,
- Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
- ModifyOperation modifyOperation =
- rootConnection.processModify(DN.valueOf(userRootDN), mods);
+ ModifyRequest modifyRequest = Requests.newModifyRequest(userRootDN)
+ .addModification(ADD, "ds-cfg-base-dn", "o=airius.com");
+ ModifyOperation modifyOperation = getRootConnection().processModify(modifyRequest);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -82,14 +64,10 @@
throws Exception
{
// remove the airius.com suffix to userRoot
- InternalClientConnection rootConnection =
- InternalClientConnection.getRootConnection();
- ArrayList<Modification> mods = new ArrayList<>();
- mods.add(new Modification(ModificationType.DELETE,
- Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
- ModifyOperation modifyOperation =
- rootConnection.processModify(DN.valueOf(userRootDN), mods);
+ ModifyRequest modifyRequest = Requests.newModifyRequest(userRootDN)
+ .addModification(DELETE, "ds-cfg-base-dn", "o=airius.com");
+ ModifyOperation modifyOperation = getRootConnection().processModify(modifyRequest);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
--
Gitblit v1.10.0