From ed1b9a16cd979ba719aba6f60d867b6a5e84d7e2 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 13 Jun 2008 14:46:45 +0000
Subject: [PATCH] Re-commit fix for issue 3330 with updated unit tests.

---
 opends/resource/config/config.ldif                                                                       |    2 +-
 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java |   14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/opends/resource/config/config.ldif b/opends/resource/config/config.ldif
index e236dbb..3b762ca 100644
--- a/opends/resource/config/config.ldif
+++ b/opends/resource/config/config.ldif
@@ -469,7 +469,7 @@
 objectClass: ds-cfg-ldif-connection-handler
 cn: LDIF Connection Handler
 ds-cfg-java-class: org.opends.server.protocols.LDIFConnectionHandler
-ds-cfg-enabled: true
+ds-cfg-enabled: false
 ds-cfg-ldif-directory: config/auto-process-ldif
 ds-cfg-poll-interval: 5 seconds
 
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
index d728988..59e56f1 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
@@ -82,7 +82,8 @@
     TestCaseUtils.dsconfig(
       "set-connection-handler-prop",
       "--handler-name", "LDIF Connection Handler",
-      "--set", "ldif-directory:" + tempDir.getAbsolutePath());
+      "--set", "ldif-directory:" + tempDir.getAbsolutePath(),
+      "--set", "enabled:true");
 
     try
     {
@@ -186,7 +187,8 @@
     TestCaseUtils.dsconfig(
       "set-connection-handler-prop",
       "--handler-name", "LDIF Connection Handler",
-      "--set", "ldif-directory:" + tempDir.getAbsolutePath());
+      "--set", "ldif-directory:" + tempDir.getAbsolutePath(),
+      "--set", "enabled:true");
 
     try
     {
@@ -270,7 +272,8 @@
     TestCaseUtils.dsconfig(
       "set-connection-handler-prop",
       "--handler-name", "LDIF Connection Handler",
-      "--set", "ldif-directory:" + tempDir.getAbsolutePath());
+      "--set", "ldif-directory:" + tempDir.getAbsolutePath(),
+      "--set", "enabled:true");
 
     try
     {
@@ -349,6 +352,11 @@
   public void testGenericConnectionHandlerMethods()
          throws Exception
   {
+    TestCaseUtils.dsconfig(
+        "set-connection-handler-prop",
+        "--handler-name", "LDIF Connection Handler",
+        "--set", "enabled:true");
+    
     // Get the connection handler from the server.
     LDIFConnectionHandler connHandler = null;
     for (ConnectionHandler handler : DirectoryServer.getConnectionHandlers())

--
Gitblit v1.10.0