From abfe66cd244bd02b21219b62a623d75cc4994949 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-server/src/test/java/org/forgerock/opendj/server/setup/cli/SetupCliTestCase.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 0b1225d..1a339b3 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
@@ -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