From 85eed99dc29d3d7c557db102eea9d0441a9c665c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 23 Jul 2014 14:40:02 +0000
Subject: [PATCH] OPENDJ-1074 (CR-4030) Implement combined add/del rate tool Adding an add/del rate tool named addrate. -opendj-core ** EntryGenerator.java: * Changing the subtemplate parsing behavior, add the "generated branches" options ** TemplateFile.java * Adding the "generated branches" options ** addrate.template * New template used to generate entries
---
opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java
index 3297650..ec20d54 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java
@@ -74,16 +74,19 @@
}
private void checkOutputStream(ByteStringBuilder out, Object expectedOutput) {
+ String lineSeparator = System.getProperty("line.separator");
String toCompare = expectedOutput.toString();
if (expectedOutput instanceof LocalizableMessage) {
toCompare = wrapText((LocalizableMessage) expectedOutput, MAX_LINE_WIDTH);
}
+ toCompare = toCompare.replace(lineSeparator, " ");
+
if (toCompare.isEmpty()) {
assertThat(out.toString().length()).isEqualTo(0);
} else {
- assertThat(out.toString()).contains(toCompare);
+ assertThat(out.toString().replace(lineSeparator, " ")).contains(toCompare);
}
}
--
Gitblit v1.10.0