From 169d9ce51d21bd93f910ecc9b57fe54553f1f7db Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 24 Feb 2015 15:33:48 +0000
Subject: [PATCH] OPENDJ-1777 Re-enable unit tests for Adapters and Converters classes

---
 opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index 786afd4..7a9f171 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -57,7 +57,6 @@
 import org.forgerock.opendj.ldap.responses.GenericExtendedResult;
 import org.forgerock.opendj.ldap.responses.Responses;
 import org.forgerock.opendj.ldap.responses.Result;
-import org.forgerock.testng.ForgeRockTestCase;
 import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.Scope;
 import org.opends.server.core.BindOperation;
 import org.opends.server.core.CompareOperation;
@@ -67,6 +66,7 @@
 import org.opends.server.protocols.ldap.LDAPControl;
 import org.opends.server.protocols.ldap.LDAPFilter;
 import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.TestCaseUtils;
 import org.opends.server.types.Attribute;
 import org.opends.server.types.Attributes;
 import org.opends.server.types.DirectoryException;
@@ -75,7 +75,6 @@
 import org.opends.server.types.Operation;
 import org.opends.server.types.SearchResultEntry;
 import org.opends.server.types.SearchResultReference;
-import org.testng.annotations.AfterGroups;
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -102,16 +101,7 @@
      */
     @BeforeGroups(groups = "needRunningServer")
     public void startServer() throws Exception {
-        EmbeddedServerTestCaseUtils.startServer();
-    }
-
-    /**
-     * Stops the server at the end of the test class.
-     */
-    @AfterGroups(groups = "needRunningServer")
-    public void shutDownServer() {
-        // Stops the server.
-        EmbeddedServerTestCaseUtils.shutDownServer();
+        TestCaseUtils.startServer();
     }
 
     /**

--
Gitblit v1.10.0