Code cleanups: - Factorized code - Fixed Sonar violations - Removed duplica...

Jean-Noel Rouvignac

13.24.2014 6acb5680cc685afc071ca5bcc358d31690bb1786

 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);
        }