From bb1b241977e3e5fe9046fcb3423fdb9f5d27e17c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Mon, 20 Aug 2007 19:47:03 +0000
Subject: [PATCH] Fixed test broken under Windows due to EOL issue.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
index d16ede3..009c395 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
@@ -51,6 +51,8 @@
/** Message to appear in pseudo localized test messages file. */
private static final String TEST_MSG = "XXX";
+ private static final String EOL = System.getProperty("line.separator");
+
@BeforeClass
public void setUp() throws IOException {
createDummyLocalizedCoreMessagesFile();
@@ -60,10 +62,10 @@
public Object[][] rawData() {
return new Object[][]{
{"Hello %s", "Hello World", new Object[]{"World"}},
- {"Hel%nlo %s", "Hel\nlo World", new Object[]{"World"}},
+ {"Hel%nlo %s", "Hel" + EOL + "lo World", new Object[]{"World"}},
{"Hel%%lo %s", "Hel%lo World", new Object[]{"World"}},
{"Hel%%lo", "Hel%lo", new Object[]{}},
- {"Hel%nlo", "Hel\nlo", new Object[]{}},
+ {"Hel%nlo", "Hel" + EOL + "lo", new Object[]{}},
{"Hel%Dlo", "Hel%Dlo", new Object[]{}},
{"Hel%Dlo", "Hel%Dlo", new Object[]{ "abc"}},
@@ -83,8 +85,12 @@
@Test(dataProvider = "rawData")
public void testRaw(String fmt, String result, Object... args) {
Message message = Message.raw(fmt, args);
- assertTrue(message.toString().equals(result));
- assertTrue(message.toString(TEST_LOCALE).equals(result));
+
+ String mStr = message.toString();
+ assertTrue(mStr.equals(result));
+
+ String mStrL = message.toString(TEST_LOCALE);
+ assertTrue(mStrL.equals(result));
}
@Test(dataProvider = "rawData1")
--
Gitblit v1.10.0