From eb8ab492e9095c3ee7f88527d9e61cb3cf4ca2d5 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 11 Feb 2014 13:38:04 +0000
Subject: [PATCH] Modified tools : replaced CLIException by ClientException. Replaced closeIfNotNull by Utils.closeSilently Modified unit tests due to modifications in console application.
---
opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
index 40d2333..eacb2cf 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
@@ -106,11 +106,18 @@
if (expectsResults) {
assertThat(out.size()).isGreaterThan(0);
+ assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
} else {
- assertThat(out.size()).isEqualTo(0);
+ if (makeLDIF.isInteractive()) {
+ assertThat(out.size()).isGreaterThan(0);
+ assertThat(err.size()).isEqualTo(0);
+ assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
+ } else {
+ assertThat(out.size()).isEqualTo(0);
+ assertThat(err.size()).isGreaterThan(0);
+ assertThat(err.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
+ }
}
-
- assertThat(err.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
} finally {
closeSilently(outStream, errStream);
}
--
Gitblit v1.10.0