From 6acb5680cc685afc071ca5bcc358d31690bb1786 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Feb 2014 10:24:56 +0000
Subject: [PATCH] Code cleanups: - Factorized code - Fixed Sonar violations - Removed duplicated lines reported by Sonar - Applied refactorings suggested by AutoRefactor plugin
---
opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
index 9af3166..9455abb 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
@@ -48,10 +48,9 @@
*/
public class SetupCliTestCase extends AbstractSetupCliTestCase {
- // @formatter:off
@DataProvider(name = "validArguments")
Object[][] createValidArguments() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ args("--help"),
expectedErrOutput(INFO_SETUP_DESCRIPTION.get()) },
{ args("--cli", "create-directory-server", "--doNotStart", "--ldapPort", "1389",
@@ -62,24 +61,22 @@
"-D", "cn=Directory Manager", "-w", "password", "-b", "dc=example,dc=com",
"-a", "--ldapsPort", "1636", "--generateSelfSignedCertificate"), null },
};
- return data;
}
@DataProvider(name = "invalidArguments")
Object[][] createInValidArguments() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ args("-c"),
expectedErrOutput(
ERR_ERROR_PARSING_ARGS.get(ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.get("c"))) },
{ args("-N"), expectedErrOutput(ERR_ERROR_PARSING_ARGS.get(
ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.get("N"))) },
};
- return data;
}
@DataProvider(name = "validPorts")
Object[][] createValidPorts() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ args("--cli", "--doNotStart", "--ldapPort", "1389", "--adminConnectorPort", "4444",
"-D", "cn=Directory Manager", "-w", "password", "-b", "dc=example,dc=com",
"-a"), null },
@@ -90,12 +87,11 @@
"-D", "cn=Directory Manager", "-w", "password", "-b", "dc=example,dc=com",
"-a", "--jmxPort", "1689"), null },
};
- return data;
}
@DataProvider(name = "invalidPorts")
Object[][] createInValidPorts() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ args("--cli", "--doNotStart", "--ldapPort", "1389", "--adminConnectorPort", "4444",
"-D", "cn=Directory Manager", "-w", "password", "-b", "dc=example,dc=com",
"-a", "--jmxPort", "1389"),
@@ -119,9 +115,7 @@
ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID.get(-1, "ldapPort",
ERR_INTARG_VALUE_BELOW_LOWER_BOUND.get("ldapPort", -1, 1)))) },
};
- return data;
}
- // @formatter:on
@Test(dataProvider = "validArguments")
public void testRunValidArguments(String[] arguments, LocalizableMessage expectedErrOutput) throws Exception {
@@ -166,20 +160,15 @@
assertThat(resultCode).isEqualTo(ReturnCode.SUCCESS.get());
} else {
assertThat(resultCode).isNotEqualTo(ReturnCode.SUCCESS.get());
- String errMsg = null;
- String expectedMsg = getUnWrappedMessage(expectedErrOutput.toString());
/**
* If an application is interactive, all messages should be redirect to the stdout. (info, warnings,
* errors). Otherwise, standard messages should be displayed in the stdout(info) and errors to the
* stderr (warnings, errors).
*/
- if (setup.isInteractive()) {
- assertThat(out.size()).isGreaterThan(0);
- errMsg = getUnWrappedMessage(out.toString("UTF-8"));
- } else {
- assertThat(err.size()).isGreaterThan(0);
- errMsg = getUnWrappedMessage(err.toString("UTF-8"));
- }
+ ByteArrayOutputStream std = setup.isInteractive() ? out : err;
+ assertThat(std.size()).isGreaterThan(0);
+ String errMsg = getUnWrappedMessage(std.toString("UTF-8"));
+ String expectedMsg = getUnWrappedMessage(expectedErrOutput.toString());
assertTrue(errMsg.contains(expectedMsg), errMsg + "\n >---< \n" + expectedMsg);
}
} finally {
--
Gitblit v1.10.0