From 30e915f5d8a0bba89a141109eccd3a33d48dc4be Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Thu, 19 Feb 2015 13:49:36 +0000
Subject: [PATCH] Fix EOL problems in tests
---
opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java | 9 +++++----
opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
index a19e534..44aa2a8 100644
--- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
+++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
@@ -154,11 +154,12 @@
@DataProvider
public Object[][] indentAndWrapProvider() throws Exception {
+ final String EOL = System.getProperty("line.separator");
return new Object[][] {
- { "test1", 5, " ", " test1\n" },
- { "test1 test2", 5, " ", " test1\n test2\n" },
- { "test1 test2test3", 5, " ", " test1\n test2test3\n" },
- { "test1 test2test3 test4", 5, " ", " test1\n test2test3\n test4\n" },
+ { "test1", 5, " ", " test1" + EOL },
+ { "test1 test2", 5, " ", " test1" + EOL + " test2" + EOL },
+ { "test1 test2test3", 5, " ", " test1" + EOL + " test2test3" + EOL },
+ { "test1 test2test3 test4", 5, " ", " test1" + EOL + " test2test3" + EOL +" test4" + EOL },
};
}
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
index dc7b599..c968a27 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
@@ -320,14 +320,15 @@
@Test
public void testToHexPlusAsciiString() throws Exception {
+ final String EOL = System.getProperty("line.separator");
ByteString byteString = new ByteStringBuilder().append("cn=testvalue,org=example").toByteString();
assertThat(byteString.toHexPlusAsciiString(10)).isEqualTo(
- " 63 6E 3D 74 65 73 74 76 61 6C 75 65 2C 6F 72 67 cn=testv alue,org\n"
- + " 3D 65 78 61 6D 70 6C 65 =example \n");
+ " 63 6E 3D 74 65 73 74 76 61 6C 75 65 2C 6F 72 67 cn=testv alue,org" + EOL +
+ " 3D 65 78 61 6D 70 6C 65 =example " + EOL);
assertThat(byteString.toHexPlusAsciiString(0)).isEqualTo(
- "63 6E 3D 74 65 73 74 76 61 6C 75 65 2C 6F 72 67 cn=testv alue,org\n"
- + "3D 65 78 61 6D 70 6C 65 =example \n");
+ "63 6E 3D 74 65 73 74 76 61 6C 75 65 2C 6F 72 67 cn=testv alue,org" + EOL +
+ "3D 65 78 61 6D 70 6C 65 =example " + EOL);
}
@Test
--
Gitblit v1.10.0