From 641a157b56e497cd12f37290857a8a522cd1adf9 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 11 Oct 2007 08:47:01 +0000
Subject: [PATCH] Fix create-ads: backend name should not be mandatory as it's always exit in the server Fix unit-test 'beforeclass' and 'afterclass'
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java | 25 ++++++++++++-------------
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java | 8 ++++++--
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java
index b9650bb..e853598 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java
@@ -186,7 +186,7 @@
subCommands.add(createAdsSubCmd);
createAdsBackendNameArg = new StringArgument("backendName",
- OPTION_SHORT_BACKENDNAME, OPTION_LONG_BACKENDNAME, true, true,
+ OPTION_SHORT_BACKENDNAME, OPTION_LONG_BACKENDNAME, false, true,
OPTION_VALUE_BACKENDNAME,
INFO_ADMIN_ARG_BACKENDNAME_DESCRIPTION.get());
createAdsSubCmd.addArgument(createAdsBackendNameArg);
@@ -231,7 +231,11 @@
// create-ads subcommand
if (subCmd.getName().equals(createAdsSubCmd.getName()))
{
- String backendName = createAdsBackendNameArg.getValue();
+ String backendName = null;
+ if (createAdsBackendNameArg.isPresent())
+ {
+ backendName = createAdsBackendNameArg.getValue();
+ }
ctx = argParser.getContext(outStream, errStream);
if (ctx == null)
{
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
index 923a6a6..c04a640 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
@@ -88,8 +88,7 @@
"create-ads",
"--noPropertiesFile",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "--backendName", "admin"
+ "-w", "password"
};
assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out,
@@ -104,17 +103,17 @@
public void afterClass()
throws Exception
{
- String[] args =
- {
- "delete-ads",
- "--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "--backendName", "admin"
- };
-
- assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out,
- System.err), SUCCESSFUL.getReturnCode());
+// String[] args =
+// {
+// "delete-ads",
+// "--noPropertiesFile",
+// "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+// "-w", "password",
+// "--backendName", "admin"
+// };
+//
+// assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out,
+// System.err), SUCCESSFUL.getReturnCode());
}
/**
--
Gitblit v1.10.0