Skip to content

Commit 1a621e3

Browse files
committed
Fix test failures on Windows
1 parent 616b48a commit 1a621e3

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/test/java/org/scijava/config/log4j/Log4jTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
*/
4343
public class Log4jTest extends AbstractLoggingTest {
4444

45+
private static final String NL = System.lineSeparator();
46+
4547
private Logger log;
4648

4749
@Before
@@ -54,30 +56,30 @@ public void testFatal() {
5456
final String fatal = "Kernel panic: Fatal exception";
5557
log.fatal(fatal);
5658
assertEquals("", stdout());
57-
assertEquals("[FATAL] " + fatal + "\n", stderr());
59+
assertEquals("[FATAL] " + fatal + NL, stderr());
5860
}
5961

6062
@Test
6163
public void testError() {
6264
final String error = "Guru Meditation";
6365
log.error(error);
6466
assertEquals("", stdout());
65-
assertEquals("[ERROR] " + error + "\n", stderr());
67+
assertEquals("[ERROR] " + error + NL, stderr());
6668
}
6769

6870
@Test
6971
public void testWarn() {
7072
final String warning = "Watch out for snakes!";
7173
log.warn(warning);
7274
assertEquals("", stdout());
73-
assertEquals("[WARN ] " + warning + "\n", stderr());
75+
assertEquals("[WARN ] " + warning + NL, stderr());
7476
}
7577

7678
@Test
7779
public void testInfo() {
7880
final String info = "Dogs are bigger than cats. But not all the time.";
7981
log.info(info);
80-
assertEquals(info + "\n", stdout());
82+
assertEquals(info + NL, stdout());
8183
assertEquals("", stderr());
8284
}
8385

src/test/java/org/scijava/config/logback/LogbackTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
*/
4545
public class LogbackTest extends AbstractLoggingTest {
4646

47+
private static final String NL = System.lineSeparator();
48+
4749
private Logger log;
4850

4951
@Before
@@ -56,22 +58,22 @@ public void testError() {
5658
final String error = "Guru Meditation";
5759
log.error(error);
5860
assertEquals("", stdout());
59-
assertEquals("[ERROR] " + error + "\n", stderr());
61+
assertEquals("[ERROR] " + error + NL, stderr());
6062
}
6163

6264
@Test
6365
public void testWarn() {
6466
final String warning = "Watch out for snakes!";
6567
log.warn(warning);
6668
assertEquals("", stdout());
67-
assertEquals("[WARN] " + warning + "\n", stderr());
69+
assertEquals("[WARN] " + warning + NL, stderr());
6870
}
6971

7072
@Test
7173
public void testInfo() {
7274
final String info = "Dogs are bigger than cats. But not all the time.";
7375
log.info(info);
74-
assertEquals(info + "\n", stdout());
76+
assertEquals(info + NL, stdout());
7577
assertEquals("", stderr());
7678
}
7779

0 commit comments

Comments
 (0)