mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

lutoff
11.47.2007 641a157b56e497cd12f37290857a8a522cd1adf9
Fix create-ads: backend name should not be mandatory as it's always exit in the server
Fix unit-test 'beforeclass' and 'afterclass'
2 files modified
33 ■■■■ changed files
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java 8 ●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java 25 ●●●● patch | view | raw | blame | history
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)
        {
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());
  }
  /**