Fix create-ads: backend name should not be mandatory as it's always exit in the server
Fix unit-test 'beforeclass' and 'afterclass'
| | |
| | | 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); |
| | |
| | | // 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) |
| | | { |
| | |
| | | "create-ads", |
| | | "--noPropertiesFile", |
| | | "-p", String.valueOf(TestCaseUtils.getServerLdapPort()), |
| | | "-w", "password", |
| | | "--backendName", "admin" |
| | | "-w", "password" |
| | | }; |
| | | |
| | | assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out, |
| | |
| | | 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()); |
| | | } |
| | | |
| | | /** |