Skip to content

Commit 9c156f5

Browse files
JornVerneeJornVernee
committed
Expect carriage return to be part of lines when testing on Windows.
Reviewed-by: ehelin
1 parent 1c632fa commit 9c156f5

File tree

1 file changed

+34
-26
lines changed

1 file changed

+34
-26
lines changed

‎vcs/src/test/java/org/openjdk/skara/vcs/RepositoryTests.java

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,19 @@ void testCommitListingWithSingleCommit(VCS vcs) throws IOException {
311311
assertEquals(new Range(0, 0), hunk.source().range());
312312
assertEquals(new Range(1, 1), hunk.target().range());
313313

314-
assertEquals(List.of(), hunk.source().lines());
315-
assertEquals(List.of("Hello, readme!"), hunk.target().lines());
314+
assertLinesEquals(List.of(), hunk.source().lines());
315+
assertLinesEquals(List.of("Hello, readme!"), hunk.target().lines());
316316
}
317317
}
318318

319+
static void assertLinesEquals(List<String> expected, List<String> actual) {
320+
var newLine = System.lineSeparator();
321+
var suffix = newLine.endsWith("\n")
322+
? newLine.substring(0, newLine.length() - 1) // drop trailing '\n' (keeping any '\r')
323+
: newLine;
324+
assertEquals(expected.stream().map(l -> l + suffix).collect(Collectors.toList()), actual);
325+
}
326+
319327
@ParameterizedTest
320328
@EnumSource(VCS.class)
321329
void testCommitListingWithMultipleCommits(VCS vcs) throws IOException {
@@ -379,8 +387,8 @@ void testCommitListingWithMultipleCommits(VCS vcs) throws IOException {
379387
assertEquals(new Range(2, 0), hunk.source().range());
380388
assertEquals(new Range(2, 1), hunk.target().range());
381389

382-
assertEquals(List.of(), hunk.source().lines());
383-
assertEquals(List.of("Another line"), hunk.target().lines());
390+
assertLinesEquals(List.of(), hunk.source().lines());
391+
assertLinesEquals(List.of("Another line"), hunk.target().lines());
384392
}
385393
}
386394

@@ -511,8 +519,8 @@ void testSquash(VCS vcs) throws IOException {
511519
assertEquals(new Range(2, 0), hunk.source().range());
512520
assertEquals(new Range(2, 2), hunk.target().range());
513521

514-
assertEquals(List.of(), hunk.source().lines());
515-
assertEquals(List.of("Another line", "A final line"), hunk.target().lines());
522+
assertLinesEquals(List.of(), hunk.source().lines());
523+
assertLinesEquals(List.of("Another line", "A final line"), hunk.target().lines());
516524
}
517525
}
518526

@@ -609,7 +617,7 @@ void testRebase(VCS vcs) throws IOException {
609617
var hunks = patch.hunks();
610618
assertEquals(1, hunks.size());
611619
var hunk = hunks.get(0);
612-
assertEquals(List.of("Keep the patches coming"), hunk.target().lines());
620+
assertLinesEquals(List.of("Keep the patches coming"), hunk.target().lines());
613621
}
614622
}
615623

@@ -887,7 +895,7 @@ void testDiffBetweenCommits(VCS vcs) throws IOException {
887895

888896
assertEquals(2, hunk.target().range().start());
889897
assertEquals(1, hunk.target().range().count());
890-
assertEquals(List.of("One more line"), hunk.target().lines());
898+
assertLinesEquals(List.of("One more line"), hunk.target().lines());
891899

892900
assertEquals(1, hunk.added());
893901
assertEquals(0, hunk.removed());
@@ -937,11 +945,11 @@ void testDiffBetweenCommitsWithMultiplePatches(VCS vcs) throws IOException {
937945
var hunk1 = hunks1.get(0);
938946
assertEquals(1, hunk1.source().range().start());
939947
assertEquals(1, hunk1.source().range().count());
940-
assertEquals(List.of("make"), hunk1.source().lines());
948+
assertLinesEquals(List.of("make"), hunk1.source().lines());
941949

942950
assertEquals(1, hunk1.target().range().start());
943951
assertEquals(1, hunk1.target().range().count());
944-
assertEquals(List.of("make images"), hunk1.target().lines());
952+
assertLinesEquals(List.of("make images"), hunk1.target().lines());
945953

946954
var patch2 = patches.get(1).asTextualPatch();
947955
assertEquals(Path.of("README"), patch2.source().path().get());
@@ -956,11 +964,11 @@ void testDiffBetweenCommitsWithMultiplePatches(VCS vcs) throws IOException {
956964
var hunk2 = hunks2.get(0);
957965
assertEquals(1, hunk2.source().range().start());
958966
assertEquals(1, hunk2.source().range().count());
959-
assertEquals(List.of("Hello, readme!"), hunk2.source().lines());
967+
assertLinesEquals(List.of("Hello, readme!"), hunk2.source().lines());
960968

961969
assertEquals(1, hunk2.target().range().start());
962970
assertEquals(1, hunk2.target().range().count());
963-
assertEquals(List.of("Hello, Skara!"), hunk2.target().lines());
971+
assertLinesEquals(List.of("Hello, Skara!"), hunk2.target().lines());
964972
}
965973
}
966974

@@ -1000,11 +1008,11 @@ void testDiffBetweenCommitsWithMultipleHunks(VCS vcs) throws IOException {
10001008
var hunk1 = hunks.get(0);
10011009
assertEquals(1, hunk1.source().range().start());
10021010
assertEquals(1, hunk1.source().range().count());
1003-
assertEquals(List.of("A"), hunk1.source().lines());
1011+
assertLinesEquals(List.of("A"), hunk1.source().lines());
10041012

10051013
assertEquals(1, hunk1.target().range().start());
10061014
assertEquals(2, hunk1.target().range().count());
1007-
assertEquals(List.of("1", "2"), hunk1.target().lines());
1015+
assertLinesEquals(List.of("1", "2"), hunk1.target().lines());
10081016

10091017
assertEquals(1, hunk1.added());
10101018
assertEquals(0, hunk1.removed());
@@ -1013,11 +1021,11 @@ void testDiffBetweenCommitsWithMultipleHunks(VCS vcs) throws IOException {
10131021
var hunk2 = hunks.get(1);
10141022
assertEquals(3, hunk2.source().range().start());
10151023
assertEquals(1, hunk2.source().range().count());
1016-
assertEquals(List.of("C"), hunk2.source().lines());
1024+
assertLinesEquals(List.of("C"), hunk2.source().lines());
10171025

10181026
assertEquals(4, hunk2.target().range().start());
10191027
assertEquals(1, hunk2.target().range().count());
1020-
assertEquals(List.of("3"), hunk2.target().lines());
1028+
assertLinesEquals(List.of("3"), hunk2.target().lines());
10211029

10221030
assertEquals(0, hunk2.added());
10231031
assertEquals(0, hunk2.removed());
@@ -1061,11 +1069,11 @@ void testDiffWithRemoval(VCS vcs) throws IOException {
10611069
var hunk = hunks.get(0);
10621070
assertEquals(1, hunk.source().range().start());
10631071
assertEquals(1, hunk.source().range().count());
1064-
assertEquals(List.of("Hello, world!"), hunk.source().lines());
1072+
assertLinesEquals(List.of("Hello, world!"), hunk.source().lines());
10651073

10661074
assertEquals(0, hunk.target().range().start());
10671075
assertEquals(0, hunk.target().range().count());
1068-
assertEquals(List.of(), hunk.target().lines());
1076+
assertLinesEquals(List.of(), hunk.target().lines());
10691077

10701078
assertEquals(0, hunk.added());
10711079
assertEquals(1, hunk.removed());
@@ -1110,11 +1118,11 @@ void testDiffWithAddition(VCS vcs) throws IOException {
11101118
var hunk = hunks.get(0);
11111119
assertEquals(0, hunk.source().range().start());
11121120
assertEquals(0, hunk.source().range().count());
1113-
assertEquals(List.of(), hunk.source().lines());
1121+
assertLinesEquals(List.of(), hunk.source().lines());
11141122

11151123
assertEquals(1, hunk.target().range().start());
11161124
assertEquals(1, hunk.target().range().count());
1117-
assertEquals(List.of("make"), hunk.target().lines());
1125+
assertLinesEquals(List.of("make"), hunk.target().lines());
11181126

11191127
assertEquals(1, hunk.added());
11201128
assertEquals(0, hunk.removed());
@@ -1156,11 +1164,11 @@ void testDiffWithWorkingDir(VCS vcs) throws IOException {
11561164
var hunk = hunks.get(0);
11571165
assertEquals(2, hunk.source().range().start());
11581166
assertEquals(0, hunk.source().range().count());
1159-
assertEquals(List.of(), hunk.source().lines());
1167+
assertLinesEquals(List.of(), hunk.source().lines());
11601168

11611169
assertEquals(2, hunk.target().range().start());
11621170
assertEquals(1, hunk.target().range().count());
1163-
assertEquals(List.of("One more line"), hunk.target().lines());
1171+
assertLinesEquals(List.of("One more line"), hunk.target().lines());
11641172

11651173
assertEquals(1, hunk.added());
11661174
assertEquals(0, hunk.removed());
@@ -1302,8 +1310,8 @@ void testMergeWithEdit(VCS vcs) throws IOException {
13021310
assertEquals(1, secondPatch.hunks().size());
13031311

13041312
var secondHunk = secondPatch.hunks().get(0);
1305-
assertEquals(List.of(), secondHunk.source().lines());
1306-
assertEquals(List.of("One last line"), secondHunk.target().lines());
1313+
assertLinesEquals(List.of(), secondHunk.source().lines());
1314+
assertLinesEquals(List.of("One last line"), secondHunk.target().lines());
13071315

13081316
assertEquals(3, secondHunk.source().range().start());
13091317
assertEquals(0, secondHunk.source().range().count());
@@ -1321,8 +1329,8 @@ void testMergeWithEdit(VCS vcs) throws IOException {
13211329
assertEquals(1, thirdPatch.hunks().size());
13221330

13231331
var thirdHunk = thirdPatch.hunks().get(0);
1324-
assertEquals(List.of(), thirdHunk.source().lines());
1325-
assertEquals(List.of("One more line", "One last line"), thirdHunk.target().lines());
1332+
assertLinesEquals(List.of(), thirdHunk.source().lines());
1333+
assertLinesEquals(List.of("One more line", "One last line"), thirdHunk.target().lines());
13261334

13271335
assertEquals(2, thirdHunk.source().range().start());
13281336
assertEquals(0, thirdHunk.source().range().count());

0 commit comments

Comments
 (0)