From 2095a28e3b117ddc7b565bc7fbe410af70cb48f4 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2772 Align SDK client tool with server's
---
opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java
index 8018c2e..4e185cb 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java
@@ -127,9 +127,11 @@
@Test
public void testMakeLDIFSupportsLineFolding() throws Exception {
final Path tempOutputFile = Paths.get(TEST_RESOURCE_PATH, TEMP_OUTPUT_FILE);
- run(args("-o", tempOutputFile.toString(), VALID_TEMPLATE_FILE_PATH),
+ run(args("-o", tempOutputFile.toString(),
+ "-t", "80",
+ VALID_TEMPLATE_FILE_PATH),
SUCCESS, INFO_MAKELDIF_PROCESSING_COMPLETE.get(2));
- assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output.ldif");
+ assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output_80_column.ldif");
Files.delete(tempOutputFile);
}
@@ -137,9 +139,9 @@
@Test
public void testMakeLDIFSupportsLineFoldingAndLineWrapping() throws Exception {
final Path tempOutputFile = Paths.get(TEST_RESOURCE_PATH, TEMP_OUTPUT_FILE);
- run(args("-o", tempOutputFile.toString(), "-w", "80", VALID_TEMPLATE_FILE_PATH),
+ run(args("-o", tempOutputFile.toString(), "-t", "0", VALID_TEMPLATE_FILE_PATH),
SUCCESS, INFO_MAKELDIF_PROCESSING_COMPLETE.get(2));
- assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output_80_column.ldif");
+ assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output.ldif");
Files.delete(tempOutputFile);
}
@@ -150,8 +152,7 @@
private void run(final String[] arguments, final boolean expectsSuccess, final LocalizableMessage expectedOutput)
throws Exception {
- final MakeLDIF makeLDIF = new MakeLDIF(outStream, errStream);
- int retCode = makeLDIF.run(arguments);
+ final int retCode = MakeLDIF.run(outStream, errStream, arguments);
checkOuputStreams(out, err, expectedOutput, "");
if (expectsSuccess) {
assertThat(retCode).isEqualTo(0);
--
Gitblit v1.10.0