This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1a6acc0a8b OAK-10338: Change test to tolerate different line endings
1a6acc0a8b is described below
commit 1a6acc0a8b4c6e5637346569169465064e1aa8ba
Author: Julian Reschke <[email protected]>
AuthorDate: Fri Jul 7 14:56:56 2023 +0100
OAK-10338: Change test to tolerate different line endings
---
.../document/flatfile/pipelined/PipelinedIT.java | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
index eb3a7d3279..452518513c 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
@@ -48,6 +48,7 @@ import org.junit.rules.TemporaryFolder;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.util.Arrays;
import java.util.Set;
import java.util.function.Predicate;
@@ -91,16 +92,16 @@ public class PipelinedIT {
File file = pipelinedStrategy.createSortedStoreFile();
assertTrue(file.exists());
- assertEquals("/content/dam|{}\n" +
- "/content/dam/1000|{}\n" +
- "/content/dam/1000/12|{\"p1\":\"v100012\"}\n" +
- "/content/dam/2022|{}\n" +
- "/content/dam/2022/02|{\"p1\":\"v202202\"}\n" +
- "/content/dam/2023|{\"p2\":\"v2023\"}\n" +
- "/content/dam/2023/01|{\"p1\":\"v202301\"}\n" +
- "/content/dam/2023/02|{}\n" +
- "/content/dam/2023/02/28|{\"p1\":\"v20230228\"}\n",
- Files.readString(file.toPath()));
+ assertEquals(Arrays.asList(new String[] {"/content/dam|{}",
+ "/content/dam/1000|{}",
+ "/content/dam/1000/12|{\"p1\":\"v100012\"}",
+ "/content/dam/2022|{}",
+ "/content/dam/2022/02|{\"p1\":\"v202202\"}",
+ "/content/dam/2023|{\"p2\":\"v2023\"}",
+ "/content/dam/2023/01|{\"p1\":\"v202301\"}",
+ "/content/dam/2023/02|{}",
+ "/content/dam/2023/02/28|{\"p1\":\"v20230228\"}"}),
+ Files.readAllLines(file.toPath()));
}
@Test
