From 85c31995703e1f855532ce7d8394784639e65352 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Tue, 4 Aug 2020 07:27:41 +0200 Subject: [PATCH] changes jgit version --- java-diff-utils-jgit/pom.xml | 2 +- .../algorithm/jgit/HistogramDiffTest.java | 2 +- .../difflib/text/DiffRowGeneratorTest.java | 23 +++++++++++++++++++ .../github/difflib/text/issue_86_original.txt | 7 ++++++ .../github/difflib/text/issue_86_revised.txt | 8 +++++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt create mode 100644 java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt diff --git a/java-diff-utils-jgit/pom.xml b/java-diff-utils-jgit/pom.xml index 6f7dc79..7497c32 100644 --- a/java-diff-utils-jgit/pom.xml +++ b/java-diff-utils-jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit - 4.4.1.201607150455-r + 5.8.1.202007141445-r com.googlecode.javaewah diff --git a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java index d4487c2..4a06ef9 100644 --- a/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java +++ b/java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java @@ -82,6 +82,6 @@ public class HistogramDiffTest { assertEquals(revList, patched); System.out.println(logdata); - assertEquals(17, logdata.size()); + assertEquals(19, logdata.size()); } } diff --git a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java index be40893..63c8e45 100644 --- a/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java +++ b/java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java @@ -3,10 +3,12 @@ package com.github.difflib.text; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; +import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -598,4 +600,25 @@ public class DiffRowGeneratorTest { System.out.println(deltas); } + + @Test + public void testIssue86WrongInlineDiff() throws IOException { + String original = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_original.txt")).collect(joining("\n")); + String revised = Files.lines(Paths.get("target/test-classes/com/github/difflib/text/issue_86_revised.txt")).collect(joining("\n")); + + DiffRowGenerator generator = DiffRowGenerator.create() + .showInlineDiffs(true) + .mergeOriginalRevised(false) + .inlineDiffByWord(true) + .oldTag( f -> "~" ) + .newTag( f -> "**" ) + .build(); + List rows = generator.generateDiffRows( + Arrays.asList(original.split("\n")), + Arrays.asList(revised.split("\n"))); + + for (DiffRow diff : rows) { + System.out.println(diff); + } + } } diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt new file mode 100644 index 0000000..02c2492 --- /dev/null +++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_original.txt @@ -0,0 +1,7 @@ +MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5 +2020-04-04T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,, +2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,1,Screen,0,,,,,,,,,,,,,,,,,,,, +2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt new file mode 100644 index 0000000..e081675 --- /dev/null +++ b/java-diff-utils/src/test/resources/com/github/difflib/text/issue_86_revised.txt @@ -0,0 +1,8 @@ +MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5 +2020-04-02T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-02T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,, +2020-04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,, +2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,, +2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,, \ No newline at end of file