From 5360b07bd36e6b3479c1bb3f911bb34f8d661b1f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 21 Sep 2016 15:15:44 +0000
Subject: [PATCH] OPENDJ-2413 Apply PR comments: remove builders in parameters classes, simplify configuration retrieval Include also other minor changes and renaming
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 0cee274..fdb2cf5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -17,7 +17,7 @@
*/
package org.opends.server;
-import static org.opends.server.util.embedded.EmbeddedDirectoryServer.defineServer;
+import static org.opends.server.util.embedded.EmbeddedDirectoryServer.manageEmbeddedDirectoryServer;
import static org.opends.server.util.embedded.ConnectionParameters.connectionParams;
import static org.opends.server.util.embedded.ConfigParameters.configParams;
import static org.opends.server.loggers.TextAccessLogPublisher.getStartupTextAccessPublisher;
@@ -266,10 +266,13 @@
String buildDirStr = System.getProperty(PROPERTY_BUILD_DIR, buildRoot + File.separator + "target");
buildDir = new File(buildDirStr);
unitRoot = new File(buildDir, "unit-tests");
- if (installedRoot == null) {
+ if (installedRoot == null)
+ {
testInstallRoot = new File(unitRoot, "package-install");
testInstanceRoot = new File(unitRoot, "package-instance");
- } else {
+ }
+ else
+ {
testInstallRoot = new File(unitRoot, "package");
testInstanceRoot = testInstallRoot;
}
@@ -309,24 +312,15 @@
return;
}
InvocationCounterPlugin.resetStartupCalled();
-
initializePortsAndServer();
-
deployDirectoryDirsAndFiles();
-
setupLoggers();
-
writeBuildInfoFile();
-
server.start();
-
assertTrue(InvocationCounterPlugin.startupCalled());
-
// Save config.ldif for when we restart the server
backupServerConfigLdif();
-
SERVER_STARTED = true;
-
initializeTestBackend(true);
}
catch (Exception e)
@@ -340,19 +334,17 @@
{
ports = new TestPorts();
hostname = InetAddress.getLocalHost().getHostName();
- server = defineServer(
+ server = manageEmbeddedDirectoryServer(
configParams()
.serverRootDirectory(paths.testInstallRoot.getPath())
.serverInstanceDirectory(paths.testInstanceRoot.getPath())
- .configurationFile(paths.configFile.getPath())
- .toParams(),
+ .configurationFile(paths.configFile.getPath()),
connectionParams()
.bindDn("cn=Directory Manager")
.bindPassword("password")
- .hostname(hostname)
+ .hostName(hostname)
.ldapPort(ports.serverLdapPort)
- .adminPort(ports.serverAdminPort)
- .toParams(),
+ .adminPort(ports.serverAdminPort),
System.out,
System.err);
}
--
Gitblit v1.10.0