From faf250ab80ac3c0ddad417541df56e1bb77d6dc2 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 07 Feb 2014 16:48:45 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1306 Modified files due to changes on console application err/out stream.
---
opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java | 8 ++++----
opendj-sdk/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
index f8c2ae7..2b09329 100644
--- a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
+++ b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
@@ -156,7 +156,7 @@
try {
checkJavaVersion();
} catch (CLIException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ReturnCode.JAVA_VERSION_INCOMPATIBLE.get();
}
@@ -165,7 +165,7 @@
initializeArguments();
} catch (ArgumentException e) {
final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(e.getMessage());
- println(message);
+ errPrintln(message);
return ReturnCode.CLIENT_SIDE_PARAM_ERROR.get();
}
@@ -179,7 +179,7 @@
}
} catch (final ArgumentException e) {
final LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(e.getMessage());
- println(message);
+ errPrintln(message);
return ReturnCode.CLIENT_SIDE_PARAM_ERROR.get();
}
@@ -195,7 +195,7 @@
getMessageFromCollection(errorMessages, LINE_SEPARATOR)));
}
} catch (final ArgumentException e) {
- println(e.getMessageObject());
+ errPrintln(e.getMessageObject());
return ReturnCode.CLIENT_SIDE_PARAM_ERROR.get();
}
diff --git a/opendj-sdk/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java b/opendj-sdk/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
index 0b1225d..1a339b3 100644
--- a/opendj-sdk/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
+++ b/opendj-sdk/opendj-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java
@@ -142,9 +142,9 @@
PrintStream errStream = null;
int resultCode = 0;
try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
outStream = new PrintStream(out);
- ByteArrayOutputStream err = new ByteArrayOutputStream();
+ final ByteArrayOutputStream err = new ByteArrayOutputStream();
errStream = new PrintStream(err);
final SetupCli setup = new SetupCli(outStream, errStream);
@@ -154,10 +154,10 @@
if (expectedErrOutput != null) {
assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
}
+ assertThat(err.size()).isEqualTo(0);
assertThat(resultCode).isEqualTo(ReturnCode.SUCCESS.get());
} else {
assertThat(resultCode).isNotEqualTo(ReturnCode.SUCCESS.get());
- assertThat(out.size()).isEqualTo(0);
assertThat(err.size()).isGreaterThan(0);
final String errorMsg = err.toString("UTF-8").replaceAll(Utils.LINE_SEPARATOR, " ");
final String expectedMsg = expectedErrOutput.toString().replaceAll(Utils.LINE_SEPARATOR, " ");
--
Gitblit v1.10.0