From cd3a41a0bd6762b1f63e58c6a65743f9800f5300 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 Remove uses of EmbeddedUtils class and deprecate it
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 856309c..74f1534 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
@@ -104,7 +104,6 @@
import org.opends.server.types.LDIFImportConfig;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.BuildVersion;
-import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.embedded.EmbeddedDirectoryServer;
import org.testng.Assert;
@@ -589,9 +588,11 @@
clearLoggersContents();
- EmbeddedUtils.stopServer(null, null);
+ server.stop(TestCaseUtils.class.getSimpleName(), LocalizableMessage.raw("restart server for tests"));
+
restoreServerConfigLdif();
- EmbeddedUtils.startServer(DirectoryServer.getEnvironmentConfig());
+
+ server.start();
clearJEBackends();
initializeTestBackend(true);
@@ -610,6 +611,16 @@
}
}
+ /**
+ * Returns the embedded server used for tests.
+ *
+ * @return the embedded server.
+ */
+ public static EmbeddedDirectoryServer getServer()
+ {
+ return server;
+ }
+
private static List<Long> restartTimesMs = new ArrayList<>();
public static List<Long> getRestartTimesMs() {
return Collections.unmodifiableList(restartTimesMs);
--
Gitblit v1.10.0