From f0360fb7bf0a00a2ce92d90f1aefaf3e9c90c695 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 16:39:39 +0000
Subject: [PATCH] Replaced JavaPropertiesTool.ErrorReturnCode by opendj-cli returnCode.

---
 opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
index 5287fe8..6f5fc37 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
@@ -30,7 +30,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import static org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode.*;
+import static com.forgerock.opendj.cli.ReturnCode.*;
 import static org.testng.Assert.*;
 
 /**
@@ -72,7 +72,7 @@
       "--handler-name", "HTTP Connection Handler",
       "--set", "authentication-required:false"     
     };
-    assertTrue(dsconfigMain(args) == SUCCESSFUL.getReturnCode());
+    assertTrue(dsconfigMain(args) == SUCCESS.get());
   }
   
   @Test()
@@ -88,7 +88,7 @@
       "--handler-name", "DIGEST-MD5",
       "--set", "server-fqdn:" + "127.0.0.1"
     };
-    assertTrue(dsconfigMain(args) == SUCCESSFUL.getReturnCode());
+    assertTrue(dsconfigMain(args) == SUCCESS.get());
     
     TestCaseUtils.dsconfig(
             "set-sasl-mechanism-handler-prop",
@@ -110,7 +110,7 @@
       "--no-prompt",
       "--set", "max-allowed-client-connections:32768"
     };
-    assertTrue(dsconfigMain(args) == SUCCESSFUL.getReturnCode());
+    assertTrue(dsconfigMain(args) == SUCCESS.get());
   }
   
   @Test()
@@ -126,7 +126,7 @@
       "--no-prompt",
       "--set", "return-bind-error-messages:true"
     };
-    assertTrue(dsconfigMain(args) == SUCCESSFUL.getReturnCode());
+    assertTrue(dsconfigMain(args) == SUCCESS.get());
   }
   
 
@@ -148,7 +148,7 @@
           "--set", "idle-time-limit:10000ms",
           "--set", "idle-time-limit:1000ms"
     };
-    assertTrue(dsconfigMain(args) != SUCCESSFUL.getReturnCode());
+    assertTrue(dsconfigMain(args) != SUCCESS.get());
   }
   
   /**
@@ -170,7 +170,7 @@
           "--set", "denied-client:1.1.1.1",
           "--set", "denied-client:2.2.2.2"
     };
-    assertEquals(dsconfigMain(args), SUCCESSFUL.getReturnCode());
+    assertEquals(dsconfigMain(args), SUCCESS.get());
   }
   
   @Test()

--
Gitblit v1.10.0