Commit527e83c

committed

fixes#197 - corrected revised filename output

1 parent4b33676 commit527e83cCopy full SHA for 527e83c

File tree

-3

lines changed

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

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public static List<String> generateOriginalAndDiff(List<String> original, List<S`
`352`	`352`	`*/`
`353`	`353`	`publicstaticList<String>generateOriginalAndDiff(List<String>original,List<String>revised,StringoriginalFileName,StringrevisedFileName) {`
`354`	`354`	`StringoriginalFileNameTemp =originalFileName;`
`355`		`-StringrevisedFileNameTemp =originalFileName;`
	`355`	`+StringrevisedFileNameTemp =revisedFileName;`
`356`	`356`	`if (originalFileNameTemp ==null) {`
`357`	`357`	`originalFileNameTemp ="original";`
`358`	`358`	`}`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,14 @@ public void testGenerateUnifiedWithOneDelta() throws IOException {`
`51`	`51`	`@Test`
`52`	`52`	`publicvoidtestGenerateUnifiedDiffWithoutAnyDeltas() {`
`53`	`53`	`List<String>test =Arrays.asList("abc");`
`54`		`-Patch<String>patch =DiffUtils.diff(test,test);`
`55`		`-UnifiedDiffUtils.generateUnifiedDiff("abc","abc",test,patch,0);`
	`54`	`+List<String>testRevised =Arrays.asList("abc2");`
	`55`	`+Patch<String>patch =DiffUtils.diff(test,testRevised);`
	`56`	`+StringunifiedDiffTxt =String.join("\n",UnifiedDiffUtils.generateUnifiedDiff("abc1","abc2",test,patch,0));`
	`57`	`+System.out.println(unifiedDiffTxt);`
	`58`	`+`
	`59`	`+assertThat(unifiedDiffTxt)`
	`60`	`+ .as("original filename should be abc1").contains("--- abc1")`
	`61`	`+ .as("revised filename should be abc2").contains("+++ abc2");`
`56`	`62`	`}`
`57`	`63`
`58`	`64`	`@Test`

Comments

(0)