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-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 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 eacb2cf..bd33975 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
@@ -104,20 +104,12 @@
MakeLDIF makeLDIF = new MakeLDIF(outStream, errStream);
makeLDIF.run(arguments);
- if (expectsResults) {
- assertThat(out.size()).isGreaterThan(0);
- assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
- } else {
- 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(out.size()).isGreaterThan(0);
+ if (!expectsResults) {
+ assertThat(err.size()).isEqualTo(0);
}
+ ByteArrayOutputStream std = expectsResults || makeLDIF.isInteractive() ? out : err;
+ assertThat(std.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
} finally {
closeSilently(outStream, errStream);
}
--
Gitblit v1.10.0