test: fix string matching tests on Windows

rdeltour · rdeltour · commit c26784a02d74 · 2025-09-01T15:41:30.000+02:00
diff --git a/src/test/java/org/w3c/epubcheck/test/CLISteps.java b/src/test/java/org/w3c/epubcheck/test/CLISteps.java
@@ -145,16 +145,16 @@ public void assertStreamDoesNotContain(String stream, String string)
   }
 
   @Then("{outputStream} is empty")
-  public void assertStreamIs(String stream)
+  public void assertStreamIsEmpty(String stream)
   {
     assertThat(stream, is(emptyString()));
   }
 
   @Then("{outputStream} is")
   @Then("{outputStream} is {string}")
-  public void assertStreamIsEmpty(String stream, String expected)
+  public void assertStreamIs(String stream, String expected)
   {
-    assertThat(stream, equalTo(replace(expected)));
+    assertThat(stream.replaceAll("\r\n$", "\n"), equalTo(replace(expected)));
   }
 
   @Then("{outputStream} starts with")

Original file line number	Diff line number	Diff line change
`@@ -145,16 +145,16 @@ public void assertStreamDoesNotContain(String stream, String string)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@Then("{outputStream} is empty")`
`148`		`- public void assertStreamIs(String stream)`
	`148`	`+ public void assertStreamIsEmpty(String stream)`
`149`	`149`	`{`
`150`	`150`	`assertThat(stream, is(emptyString()));`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`@Then("{outputStream} is")`
`154`	`154`	`@Then("{outputStream} is {string}")`
`155`		`- public void assertStreamIsEmpty(String stream, String expected)`
	`155`	`+ public void assertStreamIs(String stream, String expected)`
`156`	`156`	`{`
`157`		`- assertThat(stream, equalTo(replace(expected)));`
	`157`	`+ assertThat(stream.replaceAll("\r\n$", "\n"), equalTo(replace(expected)));`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`@Then("{outputStream} starts with")`