From 1cea068fa7cfcbe84de748281589bc37473775ba Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 03 Oct 2007 11:46:50 +0000
Subject: [PATCH] Modifications related to issue https://opends.dev.java.net/issues/show_bug.cgi?id=582

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index c4369fb..37196cb 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -344,6 +344,7 @@
       "-V", "2",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -370,6 +371,7 @@
       "-V", "3",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -397,6 +399,7 @@
       "-X",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -427,6 +430,7 @@
       "-P", trustStorePath,
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -454,6 +458,7 @@
       "-X",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -484,6 +489,7 @@
       "-P", trustStorePath,
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -513,6 +519,7 @@
       "-o", "mech=PLAIN",
       "-o", "authid=dn:cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -539,6 +546,7 @@
       "-V", "3",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "cn=Does Not Exist,o=test"
     };
 
@@ -565,6 +573,7 @@
       "-V", "3",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "malformed"
     };
 
@@ -612,6 +621,7 @@
       "-V", "3",
       "-D", "cn=Directory Manager",
       "-w", "password",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -637,6 +647,7 @@
       "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
       "-D", "cn=Directory Manager",
       "-j", validPasswordFile,
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -662,6 +673,7 @@
       "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
       "-D", "cn=Directory Manager",
       "-j", invalidPasswordFile,
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -688,6 +700,7 @@
       "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
       "-D", "cn=Directory Manager",
       "-j", "does.not.exist",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -744,7 +757,8 @@
       "-D", "cn=Directory Manager",
       "-j", validPasswordFile,
       "-c",
-      "-f", path
+      "-f", path,
+      "--noPropertiesFile"
     };
 
     LDAPDelete.mainDelete(args, false, null, null);
@@ -755,7 +769,7 @@
   /**
    * Tests a subtree delete operation.
    *
-   * @throws  Exception  If an unexpectd problem occurs.
+   * @throws  Exception  If an unexpected problem occurs.
    */
   @Test()
   public void testSubtreeDelete()
@@ -790,6 +804,7 @@
       "-D", "cn=Directory Manager",
       "-w", "password",
       "-x",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -836,6 +851,7 @@
       "-D", "cn=Directory Manager",
       "-w", "password",
       "-J", "subtreedelete:true",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -862,6 +878,7 @@
       "-D", "cn=Directory Manager",
       "-w", "password",
       "-n",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -888,6 +905,7 @@
       "-D", "cn=Directory Manager",
       "-w", "password",
       "-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -916,6 +934,7 @@
       "-D", "cn=Directory Manager",
       "-w", "password",
       "-J", "no-op:true",
+      "--noPropertiesFile",
       "o=test"
     };
 
@@ -945,6 +964,7 @@
       "-w", "password",
       "-J", OID_MANAGE_DSAIT_CONTROL + ":false",
       "-J", OID_SUBTREE_DELETE_CONTROL + ":true",
+      "--noPropertiesFile",
       "o=test"
     };
 

--
Gitblit v1.10.0