java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

udiff pattern fixed, test added

Browse Source
This commit is contained in:
shotwave
2011-04-06 17:01:37 +00:00
parent f17ae5816f
commit 9a6d3aef55
2 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/difflib/DiffUtils.java
View File

@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
public class DiffUtils {
private static DiffAlgorithm defaultDiffAlgorithm = new MyersDiff();
private static Pattern unifiedDiffChunkRe =
Pattern.compile("@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$");
/**
* Compute the difference between the original and revised texts with default diff algorithm

85
test/testcase/diffutils/GenerateUnifiedDiffTest.java
View File

@@ -2,23 +2,17 @@ package diffutils;
import difflib.DiffUtils;
import difflib.Patch;
import difflib.PatchFailedException;
import junit.framework.TestCase;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
public class GenerateUnifiedDiffTest extends TestCase {
static final String FS = File.separator;
static final String originalFilename = "test" + FS + "mocks" + FS + "original.txt";
static final String revisedFilename = "test" + FS + "mocks" + FS + "revised.txt";
static final String originalFilenameOneDelta = "test" + FS + "mocks" + FS + "one_delta_test_original.txt";
static final String revisedFilenameOneDelta = "test" + FS + "mocks" + FS + "one_delta_test_revised.txt";
public List<String> fileToLines(String filename) {
List<String> lines = new LinkedList<String>();
@@ -34,53 +28,18 @@ public class GenerateUnifiedDiffTest extends TestCase {
return lines;
}
/**
* Tests the Unified Diff generation by creating a Patch, then
* creating the Unified Diff representation, then parsing that
* Unified Diff, and applying the patch to the original unrevised
* text, then comparing that to the original revised text.
*
* @author Bill James (tankerbay@gmail.com)
*/
public void testGenerateUnified() {
List<String> origLines = fileToLines(originalFilename);
List<String> revLines = fileToLines(revisedFilename);
public void testGenerateUnified() throws Exception {
List<String> origLines = fileToLines("test" + FS + "mocks" + FS + "original.txt");
List<String> revLines = fileToLines("test" + FS + "mocks" + FS + "revised.txt");
testGenerateUnified(origLines, revLines);
verify(origLines, revLines);
}
/**
* Tests the Unified Diff generation for diff with one delta.
*/
public void testGenerateUnifiedWithOneDelta() {
List<String> origLines = fileToLines(originalFilenameOneDelta);
List<String> revLines = fileToLines(revisedFilenameOneDelta);
public void testGenerateUnifiedWithOneDelta() throws Exception {
List<String> origLines = fileToLines("test" + FS + "mocks" + FS + "one_delta_test_original.txt");
List<String> revLines = fileToLines("test" + FS + "mocks" + FS + "one_delta_test_revised.txt");
testGenerateUnified(origLines, revLines);
}
private void testGenerateUnified(List<String> origLines, List<String> revLines) {
Patch p = DiffUtils.diff(origLines, revLines);
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff(
originalFilename, revisedFilename, origLines, p, 10);
Patch fromUnifiedPatch = DiffUtils.parseUnifiedDiff(unifiedDiff);
List<String> patchedLines = new ArrayList<String>();
try {
patchedLines = (List<String>) fromUnifiedPatch.applyTo(origLines);
} catch (PatchFailedException e) {
// TODO Auto-generated catch block
fail(e.getMessage());
}
assertTrue(revLines.size() == patchedLines.size());
for (int i = 0; i < revLines.size(); i++) {
String l1 = revLines.get(i);
String l2 = patchedLines.get(i);
if (l1.equals(l2) == false) {
fail("Line " + (i + 1) + " of the patched file did not match the revised original");
}
}
verify(origLines, revLines);
}
public void testDiff_Issue10() throws Exception {
@@ -93,12 +52,30 @@ public class GenerateUnifiedDiffTest extends TestCase {
public void testDiff_Issue11() throws Exception {
final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "issue11_1.txt");
final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "issue11_2.txt");
verify(lines1, lines2);
}
public void testDiff5() throws Exception {
final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "5A.txt");
final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "5B.txt");
verify(lines1, lines2);
}
final Patch patch = DiffUtils.diff(lines1, lines2);
final String fileName = "xxx";
final List<String> stringList = DiffUtils.generateUnifiedDiff(fileName, fileName, lines1, patch, 3);
final Patch x = DiffUtils.parseUnifiedDiff(stringList);
DiffUtils.patch(lines1, x);
private void verify(List<String> origLines, List<String> revLines) throws Exception {
Patch p = DiffUtils.diff(origLines, revLines);
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff(
"test" + FS + "mocks" + FS + "original.txt", "test" + FS + "mocks" + FS + "revised.txt", origLines, p, 10);
Patch fromUnifiedPatch = DiffUtils.parseUnifiedDiff(unifiedDiff);
List<String> patchedLines = (List<String>) fromUnifiedPatch.applyTo(origLines);
assertTrue(revLines.size() == patchedLines.size());
for (int i = 0; i < revLines.size(); i++) {
String l1 = revLines.get(i);
String l2 = patchedLines.get(i);
if (!l1.equals(l2)) {
fail("Line " + (i + 1) + " of the patched file did not match the revised original");
}
}
}
}