Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit94674a0

Browse files
committed
fixes#119
1 parent91a42b2 commit94674a0

File tree

4 files changed

+42
-1
lines changed

4 files changed

+42
-1
lines changed

‎java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
importjava.util.Collections;
1313
importjava.util.List;
1414
importstaticjava.util.stream.Collectors.joining;
15+
importstaticorg.assertj.core.api.Assertions.assertThat;
1516
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1617
importstaticorg.junit.jupiter.api.Assertions.assertThrows;
1718
importstaticorg.junit.jupiter.api.Assertions.assertTrue;
@@ -204,8 +205,19 @@ public void testFailingPatchByException() throws IOException {
204205
baseLines.set(40,baseLines.get(40) +" corrupted ");
205206

206207
assertThrows(PatchFailedException.class, () ->DiffUtils.patch(baseLines,p));
208+
}
209+
210+
@Test
211+
publicvoidtestWrongContextLength()throwsIOException {
212+
List<String>original =fileToLines(TestConstants.BASE_FOLDER_RESOURCES +"com/github/difflib/text/issue_119_original.txt");
213+
List<String>revised =fileToLines(TestConstants.BASE_FOLDER_RESOURCES +"com/github/difflib/text/issue_119_revised.txt");
214+
215+
Patch<String>patch =DiffUtils.diff(original,revised);
216+
List<String>udiff =UnifiedDiffUtils.generateUnifiedDiff("a/$filename","b/$filename",
217+
original,patch,3);
207218

219+
//System.out.println(udiff.stream().collect(joining("\n")));
208220

209-
221+
assertThat(udiff).contains("@@ -1,4 +1,4 @@");
210222
}
211223
}

‎java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,4 +662,25 @@ public void testCorrectChangeIssue114_2() throws IOException {
662662
assertThat(rows).extracting(item ->item.getTag().name()).containsExactly("CHANGE","DELETE","EQUAL","CHANGE","EQUAL");
663663
assertThat(rows.get(1).toString()).isEqualTo("[DELETE,~B~,]");
664664
}
665+
666+
@Test
667+
publicvoidtestIssue119WrongContextLength()throwsIOException {
668+
Stringoriginal =Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_original.txt")).collect(joining("\n"));
669+
Stringrevised =Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_119_revised.txt")).collect(joining("\n"));
670+
671+
DiffRowGeneratorgenerator =DiffRowGenerator.create()
672+
.showInlineDiffs(true)
673+
.mergeOriginalRevised(true)
674+
.inlineDiffByWord(true)
675+
.oldTag(f ->"~")
676+
.newTag(f ->"**")
677+
.build();
678+
List<DiffRow>rows =generator.generateDiffRows(
679+
Arrays.asList(original.split("\n")),
680+
Arrays.asList(revised.split("\n")));
681+
682+
rows.stream()
683+
.filter(item ->item.getTag() !=DiffRow.Tag.EQUAL)
684+
.forEach(System.out::println);
685+
}
665686
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const world: string = 'world',
2+
p: number | undefined = 42;
3+
4+
console.log(`Hello, ${world}!`);
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const world: string = 'world';
2+
const p: number | undefined = 42;
3+
4+
console.log(`Hello, ${world}!`);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp