From 81418ac3dea77db5b51e6cf65615b532fa069c16 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 06 Aug 2007 18:13:25 +0000
Subject: [PATCH] Implement a TestCaseUtils.dsconfig method that provides a more convenient mechanism for making configuration changes within the unit test framework.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 23 --
opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java | 110 ++----------
opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java | 44 ----
opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 22 --
opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java | 22 --
opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java | 264 +++++------------------------
opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 38 ++++
7 files changed, 126 insertions(+), 397 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index bb659de..f01e8e0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -68,6 +68,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.BindResponseProtocolOp;
import org.opends.server.tools.LDAPModify;
+import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
@@ -353,7 +354,7 @@
assertTrue(InvocationCounterPlugin.startupCalled());
SERVER_STARTED = true;
-
+
initializeTestBackend(true);
}
@@ -1223,4 +1224,39 @@
}
}
}
+
+
+
+ /**
+ * Invokes the dsconfig tool with the provided set of arguments. Note that
+ * the address, port, bind DN (cn=Directory Manager), and password will always
+ * be provided, so they should not be included in the argument list. The
+ * given arguments should include only the subcommand and its associated
+ * options, along with any other global options that may not be included by
+ * default.
+ * <BR><BR>
+ * An assertion will be used to ensure that the dsconfig invocation is
+ * successful. If running dsconfig returns a non-zero result, then an
+ * assertion error will be thrown.
+ *
+ * @param args The set of arguments that should be provided when invoking
+ * the dsconfig tool
+ */
+ public static void dsconfig(String... args)
+ {
+ String[] fullArgs = new String[args.length + 8];
+ fullArgs[0] = "-h";
+ fullArgs[1] = "127.0.0.1";
+ fullArgs[2] = "-p";
+ fullArgs[3] = String.valueOf(serverLdapPort);
+ fullArgs[4] = "-D";
+ fullArgs[5] = "cn=Directory Manager";
+ fullArgs[6] = "-w";
+ fullArgs[7] = "password";
+
+ System.arraycopy(args, 0, fullArgs, 8, args.length);
+
+ assertEquals(DSConfig.main(fullArgs, false, System.out, System.err), 0);
+ }
}
+
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
index 23aea65..7d531b0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
@@ -118,17 +118,10 @@
@Test()
public void testEnabledAlert()
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--add", "enabled-alert-type:" + ALERT_TYPE
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "enabled-alert-type:" + ALERT_TYPE);
try
{
@@ -140,17 +133,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--remove", "enabled-alert-type:" + ALERT_TYPE
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "enabled-alert-type:" + ALERT_TYPE);
}
}
@@ -163,17 +149,10 @@
@Test()
public void testNotEnabledAlert()
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--add", "enabled-alert-type:" + ALERT_TYPE + ".bogus"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "enabled-alert-type:" + ALERT_TYPE + ".bogus");
try
{
@@ -185,17 +164,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--remove", "enabled-alert-type:" + ALERT_TYPE + ".bogus"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "enabled-alert-type:" + ALERT_TYPE + ".bogus");
}
}
@@ -208,17 +180,10 @@
@Test()
public void testDisabledAlert()
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--add", "disabled-alert-type:" + ALERT_TYPE
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "disabled-alert-type:" + ALERT_TYPE);
try
{
@@ -230,17 +195,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--remove", "disabled-alert-type:" + ALERT_TYPE
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "disabled-alert-type:" + ALERT_TYPE);
}
}
@@ -253,17 +211,10 @@
@Test()
public void testNotDisabledAlert()
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--add", "disabled-alert-type:" + ALERT_TYPE + ".bogus"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "disabled-alert-type:" + ALERT_TYPE + ".bogus");
try
{
@@ -275,17 +226,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
- "--remove", "disabled-alert-type:" + ALERT_TYPE + ".bogus"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "disabled-alert-type:" + ALERT_TYPE + ".bogus");
}
}
@@ -298,18 +242,11 @@
@Test()
public void testEnabledAndDisabledAlert()
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
"--add", "enabled-alert-type:" + ALERT_TYPE,
- "--add", "disabled-alert-type:" + ALERT_TYPE,
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "disabled-alert-type:" + ALERT_TYPE);
try
{
@@ -321,18 +258,11 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-alert-handler-prop",
"--handler-name", "Dummy Alert Handler",
"--remove", "enabled-alert-type:" + ALERT_TYPE,
- "--remove", "disabled-alert-type:" + ALERT_TYPE,
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "disabled-alert-type:" + ALERT_TYPE);
}
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
index f75804b..6ced7f1 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
@@ -83,17 +83,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -183,17 +176,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
@@ -296,18 +282,11 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
"--add", "password-validator-dn:cn=Length-Based Password Validator," +
- "cn=Password Validators,cn=config"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "cn=Password Validators,cn=config");
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
@@ -367,18 +346,11 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
"--remove", "password-validator-dn:cn=Length-Based Password " +
- "Validator,cn=Password Validators,cn=config"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "Validator,cn=Password Validators,cn=config");
try
{
@@ -402,17 +374,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "lockout-failure-count:3"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "lockout-failure-count:3");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -481,17 +446,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "lockout-failure-count:0"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "lockout-failure-count:0");
try
{
@@ -514,17 +472,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -591,17 +542,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
@@ -624,17 +568,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntries(
"dn: uid=test.user,o=test",
@@ -705,17 +642,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
@@ -738,17 +668,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -818,17 +741,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
@@ -852,17 +768,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "allow-user-password-changes:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "allow-user-password-changes:false");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -933,17 +842,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "allow-user-password-changes:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "allow-user-password-changes:true");
try
{
@@ -967,17 +869,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "password-history-count:5"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "password-history-count:5");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -1048,17 +943,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "password-history-count:0"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "password-history-count:0");
try
{
@@ -1082,17 +970,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "password-change-requires-current-password:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "password-change-requires-current-password:true");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -1163,17 +1044,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "password-change-requires-current-password:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "password-change-requires-current-password:false");
try
{
@@ -1197,17 +1071,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "minimum-password-age:24 hours"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "minimum-password-age:24 hours");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -1278,17 +1145,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "minimum-password-age:0 seconds"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "minimum-password-age:0 seconds");
try
{
@@ -1311,17 +1171,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntries(
"dn: uid=test.user,o=test",
@@ -1394,17 +1247,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
@@ -1427,17 +1273,10 @@
{
TestCaseUtils.initializeTestBackend(true);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:true");
TestCaseUtils.addEntry(
"dn: uid=test.user,o=test",
@@ -1508,17 +1347,10 @@
}
finally
{
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-password-policy-prop",
"--policy-name", "Default Password Policy",
- "--set", "force-change-on-add:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "force-change-on-add:false");
try
{
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index 40fe4ae..d6bd2ef 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -1922,16 +1922,9 @@
// Change the server configuration so that error messages should be
// returned.
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "return-bind-error-messages:true"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "return-bind-error-messages:true");
bindOperation =
conn.processSimpleBind(new ASN1OctetString("cn=Directory Manager"),
@@ -1942,16 +1935,9 @@
// Change the configuration back and make sure that the error message goes
// away.
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "return-bind-error-messages:false"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "return-bind-error-messages:false");
bindOperation =
conn.processSimpleBind(new ASN1OctetString("cn=Directory Manager"),
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
index 7e1d908..1c17b20 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
@@ -72,16 +72,9 @@
public void testServerWideAnonymousIdleTimeLimit()
throws Exception
{
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "idle-time-limit:5 seconds"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "idle-time-limit:5 seconds");
Socket s = null;
@@ -107,16 +100,9 @@
s.close();
} catch (Exception e) {}
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "idle-time-limit:0 seconds"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "idle-time-limit:0 seconds");
}
}
@@ -146,16 +132,9 @@
);
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "idle-time-limit:5 seconds"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "idle-time-limit:5 seconds");
Socket s = null;
@@ -194,16 +173,9 @@
s.close();
} catch (Exception e) {}
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--set", "idle-time-limit:0 seconds"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--set", "idle-time-limit:0 seconds");
}
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
index 6afad5a..b92f95e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
@@ -102,16 +102,9 @@
// Update the set of allowed tasks to include the dummy task.
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--add", "allowed-task:org.opends.server.tasks.DummyTask"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--add", "allowed-task:org.opends.server.tasks.DummyTask");
// Now verify that we can add the task and have it complete successfully.
@@ -143,16 +136,9 @@
// Remove the task class from the set of allowed tasks and verify that we
// can no longer schedule the task.
- args = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--remove", "allowed-task:org.opends.server.tasks.DummyTask"
- };
- assertEquals(DSConfig.main(args, false, System.out, System.err), 0);
+ "--remove", "allowed-task:org.opends.server.tasks.DummyTask");
// Now verify that we can add the task and have it complete successfully.
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index 1f1b1bc..5631e8b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -2333,31 +2333,18 @@
// Disable the PROXIED_AUTH privilege and verify that the operation now
// succeeds.
- String[] configArgs =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--add", "disabled-privilege:proxied-auth"
- };
- assertEquals(DSConfig.main(configArgs, false, System.out, System.err), 0);
+ "--add", "disabled-privilege:proxied-auth");
assertEquals(LDAPSearch.mainSearch(searchArgs, false, null, null), 0);
// Re-enable the PROXIED_AUTH privilege and verify that the operation
// fails again.
- configArgs = new String[]
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
+ TestCaseUtils.dsconfig(
"set-global-configuration-prop",
- "--remove", "disabled-privilege:proxied-auth"
- };
- assertEquals(DSConfig.main(configArgs, false, System.out, System.err), 0);
+ "--remove", "disabled-privilege:proxied-auth");
+
assertFalse(LDAPSearch.mainSearch(searchArgs, false, null, null) == 0);
}
--
Gitblit v1.10.0