From 82228a346b457c0f7e3eb8b8fb385e05036723c1 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 20 Nov 2006 06:02:30 +0000
Subject: [PATCH] Update the ldappasswordmodify tool to align the SSL-related arguments with the other LDAP client tools.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index 226b902..fd592c3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -181,13 +181,6 @@
 
     args = new String[]
     {
-      "-k"
-    };
-    argLists.add(args);
-    reasonList.add("No value for '-k' argument");
-
-    args = new String[]
-    {
       "-K"
     };
     argLists.add(args);
@@ -195,17 +188,38 @@
 
     args = new String[]
     {
-      "-t"
+      "-W"
     };
     argLists.add(args);
-    reasonList.add("No value for '-t' argument");
+    reasonList.add("No value for '-W' argument");
 
     args = new String[]
     {
-      "-T"
+      "--keyStorePasswordFile"
     };
     argLists.add(args);
-    reasonList.add("No value for '-T' argument");
+    reasonList.add("No value for '--keyStorePasswordFile' argument");
+
+    args = new String[]
+    {
+      "-P"
+    };
+    argLists.add(args);
+    reasonList.add("No value for '-P' argument");
+
+    args = new String[]
+    {
+      "--trustStorePassword"
+    };
+    argLists.add(args);
+    reasonList.add("No value for '--trustStorePassword' argument");
+
+    args = new String[]
+    {
+      "--trustStorePasswordFile"
+    };
+    argLists.add(args);
+    reasonList.add("No value for '--trustStorePasswordFile' argument");
 
     args = new String[]
     {
@@ -909,7 +923,7 @@
       "-h", "127.0.0.1",
       "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
       "-Z",
-      "-t", trustStorePath,
+      "-P", trustStorePath,
       "-a", "dn:uid=test.user,o=test",
       "-c", "password",
       "-n", "newPassword"
@@ -1006,7 +1020,7 @@
       "-h", "127.0.0.1",
       "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
       "-q",
-      "-t", trustStorePath,
+      "-P", trustStorePath,
       "-a", "dn:uid=test.user,o=test",
       "-c", "password",
       "-n", "newPassword"

--
Gitblit v1.10.0