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
Appearance settings

Commit 39f92a7

Browse filesBrowse files
simonmitsimonmit
committed
Changed to default maven layout: src/main/java, src/test/java, src/test/resources.
1 parent 0bf3be2 commit 39f92a7
Copy full SHA for 39f92a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

45 files changed

+87
-57
lines changed

‎build.xml

Copy file name to clipboardExpand all lines: build.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<project name="java-diff-utils" default="jar" basedir=".">
44
<property name="version" value="1.3.0-SNAPSHOT"/>
5-
<property name="src.dir" value="src" />
5+
<property name="src.dir" value="src/main/java" />
66
<property name="build.dir" location="build" />
77
<property name="dist.dir" value="dist" />
88
<property name="jar.file.name" value="${dist.dir}/${ant.project.name}-${version}.jar" />

‎java-diff-utils.iml

Copy file name to clipboardExpand all lines: java-diff-utils.iml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<exclude-output />
77
<content url="file://$MODULE_DIR$">
8-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
9-
<sourceFolder url="file://$MODULE_DIR$/test/testcase" isTestSource="true" />
10-
<sourceFolder url="file://$MODULE_DIR$/test/mocks" isTestSource="true" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
1111
<excludeFolder url="file://$MODULE_DIR$/build" />
1212
<excludeFolder url="file://$MODULE_DIR$/dist" />
1313
<excludeFolder url="file://$MODULE_DIR$/target" />

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
-7Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
</properties>
3232
<build>
33-
<sourceDirectory>src/</sourceDirectory>
34-
<testSourceDirectory>test/testcase</testSourceDirectory>
35-
<testResources>
36-
<testResource>
37-
<directory>test/mocks</directory>
38-
</testResource>
39-
</testResources>
4033
<plugins>
4134
<plugin>
4235
<groupId>org.apache.maven.plugins</groupId>

‎src/difflib/ChangeDelta.java renamed to ‎src/main/java/difflib/ChangeDelta.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/Chunk.java renamed to ‎src/main/java/difflib/Chunk.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DeleteDelta.java renamed to ‎src/main/java/difflib/DeleteDelta.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/Delta.java renamed to ‎src/main/java/difflib/Delta.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DeltaComparator.java renamed to ‎src/main/java/difflib/DeltaComparator.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DiffAlgorithm.java renamed to ‎src/main/java/difflib/DiffAlgorithm.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DiffException.java renamed to ‎src/main/java/difflib/DiffException.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DiffRow.java renamed to ‎src/main/java/difflib/DiffRow.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DiffRowGenerator.java renamed to ‎src/main/java/difflib/DiffRowGenerator.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/DiffUtils.java renamed to ‎src/main/java/difflib/DiffUtils.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/InsertDelta.java renamed to ‎src/main/java/difflib/InsertDelta.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/Patch.java renamed to ‎src/main/java/difflib/Patch.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/PatchFailedException.java renamed to ‎src/main/java/difflib/PatchFailedException.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/StringUtills.java renamed to ‎src/main/java/difflib/StringUtills.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/DiffException.java renamed to ‎src/main/java/difflib/myers/DiffException.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/DiffNode.java renamed to ‎src/main/java/difflib/myers/DiffNode.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/DifferentiationFailedException.java renamed to ‎src/main/java/difflib/myers/DifferentiationFailedException.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/Equalizer.java renamed to ‎src/main/java/difflib/myers/Equalizer.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/MyersDiff.java renamed to ‎src/main/java/difflib/myers/MyersDiff.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/PathNode.java renamed to ‎src/main/java/difflib/myers/PathNode.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/Snake.java renamed to ‎src/main/java/difflib/myers/Snake.java

Copy file name to clipboard
File renamed without changes.

‎src/difflib/myers/package.html renamed to ‎src/main/java/difflib/myers/package.html

Copy file name to clipboard
File renamed without changes.

‎src/difflib/package.html renamed to ‎src/main/java/difflib/package.html

Copy file name to clipboard
File renamed without changes.

‎test/testcase/diffutils/DiffRowGeneratorTest.java renamed to ‎src/test/java/diffutils/DiffRowGeneratorTest.java

Copy file name to clipboard
File renamed without changes.

‎test/testcase/diffutils/DiffTest.java renamed to ‎src/test/java/diffutils/DiffTest.java

Copy file name to clipboard
File renamed without changes.

‎test/testcase/diffutils/GenerateUnifiedDiffTest.java renamed to ‎src/test/java/diffutils/GenerateUnifiedDiffTest.java

Copy file name to clipboardExpand all lines: src/test/java/diffutils/GenerateUnifiedDiffTest.java
+11-12Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
import java.util.List;
1616

1717
public class GenerateUnifiedDiffTest extends TestCase {
18-
private static final String FS = File.separator;
19-
private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS;
18+
2019

2120
public List<String> fileToLines(String filename) {
2221
List<String> lines = new LinkedList<String>();
@@ -34,15 +33,15 @@ public List<String> fileToLines(String filename) {
3433
}
3534

3635
public void testGenerateUnified() {
37-
List<String> origLines = fileToLines(MOCK_FOLDER + "original.txt");
38-
List<String> revLines = fileToLines(MOCK_FOLDER + "revised.txt");
36+
List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
37+
List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
3938

4039
verify(origLines, revLines, "original.txt", "revised.txt");
4140
}
4241

4342
public void testGenerateUnifiedWithOneDelta() {
44-
List<String> origLines = fileToLines(MOCK_FOLDER + "one_delta_test_original.txt");
45-
List<String> revLines = fileToLines(MOCK_FOLDER + "one_delta_test_revised.txt");
43+
List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
44+
List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
4645

4746
verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
4847
}
@@ -54,8 +53,8 @@ public void testGenerateUnifiedDiffWithoutAnyDeltas() {
5453
}
5554

5655
public void testDiff_Issue10() {
57-
final List<String> baseLines = fileToLines(MOCK_FOLDER + "issue10_base.txt");
58-
final List<String> patchLines = fileToLines(MOCK_FOLDER + "issue10_patch.txt");
56+
final List<String> baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
57+
final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
5958
final Patch p = DiffUtils.parseUnifiedDiff(patchLines);
6059
try {
6160
DiffUtils.patch(baseLines, p);
@@ -68,14 +67,14 @@ public void testDiff_Issue10() {
6867
* Issue 12
6968
*/
7069
public void testPatchWithNoDeltas() {
71-
final List<String> lines1 = fileToLines(MOCK_FOLDER + "issue11_1.txt");
72-
final List<String> lines2 = fileToLines(MOCK_FOLDER + "issue11_2.txt");
70+
final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
71+
final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
7372
verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
7473
}
7574

7675
public void testDiff5() {
77-
final List<String> lines1 = fileToLines(MOCK_FOLDER + "5A.txt");
78-
final List<String> lines2 = fileToLines(MOCK_FOLDER + "5B.txt");
76+
final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
77+
final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
7978
verify(lines1, lines2, "5A.txt", "5B.txt");
8079
}
8180

‎test/testcase/diffutils/PatchTest.java renamed to ‎src/test/java/diffutils/PatchTest.java

Copy file name to clipboard
File renamed without changes.

‎src/test/java/diffutils/TestConstants.java

Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package diffutils;
2+
3+
import java.io.File;
4+
5+
/**
6+
* Test constants
7+
* @author simon.mittermueller@gmail.com
8+
*
9+
*/
10+
public final class TestConstants {
11+
12+
private TestConstants() {
13+
// prevent construction.
14+
}
15+
16+
/** File separator. */
17+
public static final String FS = File.separator;
18+
19+
/** The base resource path. */
20+
public static String BASE_FOLDER_RESOURCES = "src" + FS + "test" + FS + "resources";
21+
22+
/** The base folder containing the test files. Ends with {@link #FS}. */
23+
public static final String MOCK_FOLDER = BASE_FOLDER_RESOURCES + FS + "mocks" + FS;
24+
25+
}

‎src/test/java/diffutils/examples/ApplyPatch.java

Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package diffutils.examples;
2+
3+
import java.util.List;
4+
5+
import difflib.DiffUtils;
6+
import difflib.Patch;
7+
import difflib.PatchFailedException;
8+
import diffutils.TestConstants;
9+
10+
public class ApplyPatch extends Example {
11+
12+
static final String ORIGINAL = TestConstants.MOCK_FOLDER + "issue10_base.txt";
13+
static final String PATCH = TestConstants.MOCK_FOLDER + "issue10_patch.txt";
14+
15+
public static void main(String[] args) throws PatchFailedException {
16+
List<String> original = fileToLines(ORIGINAL);
17+
List<String> patched = fileToLines(PATCH);
18+
19+
// At first, parse the unified diff file and get the patch
20+
Patch patch = DiffUtils.parseUnifiedDiff(patched);
21+
22+
// Then apply the computed patch to the given text
23+
List result = DiffUtils.patch(original, patch);
24+
System.out.println(result);
25+
// / Or we can call patch.applyTo(original). There is no difference.
26+
}
27+
}

‎test/examples/diffutils/ComputeDifference.java renamed to ‎src/test/java/diffutils/examples/ComputeDifference.java

Copy file name to clipboardExpand all lines: src/test/java/diffutils/examples/ComputeDifference.java
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
package diffutils;
1+
package diffutils.examples;
22

3-
import java.io.File;
43
import java.util.List;
54

65
import difflib.Delta;
76
import difflib.DiffUtils;
87
import difflib.Patch;
8+
import diffutils.TestConstants;
99

1010
public class ComputeDifference extends Example {
11-
static final String FS = File.separator;
12-
static final String ORIGINAL = "test" + FS + "mocks" + FS + "original.txt";
13-
static final String RIVISED = "test" + FS + "mocks" + FS + "revised.txt";
11+
12+
13+
static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
14+
static final String RIVISED = TestConstants.MOCK_FOLDER + "revised.txt";
1415

1516
public static void main(String[] args) {
1617
List<String> original = fileToLines(ORIGINAL);

‎test/examples/diffutils/Example.java renamed to ‎src/test/java/diffutils/examples/Example.java

Copy file name to clipboardExpand all lines: src/test/java/diffutils/examples/Example.java
+14-2Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
package diffutils;
1+
package diffutils.examples;
22

33
import java.io.BufferedReader;
4+
import java.io.File;
45
import java.io.FileReader;
56
import java.io.IOException;
67
import java.util.LinkedList;
78
import java.util.List;
89

9-
public class Example {
10+
public abstract class Example {
11+
12+
/** File separator. */
13+
protected static final String FS = File.separator;
14+
/** The base resource path. */
15+
protected static String BASE_PATH = "src" + FS + "test" + FS + "resources";
16+
17+
/**
18+
* Tries to read the file and split it into a list of lines.
19+
* @param filename The filename as path.
20+
* @return A list of lines.
21+
*/
1022
public static List<String> fileToLines(String filename) {
1123
List<String> lines = new LinkedList<String>();
1224
String line = "";

‎test/mocks/5A.txt renamed to ‎src/test/resources/mocks/5A.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/5B.txt renamed to ‎src/test/resources/mocks/5B.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/issue10_base.txt renamed to ‎src/test/resources/mocks/issue10_base.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/issue10_patch.txt renamed to ‎src/test/resources/mocks/issue10_patch.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/issue11_1.txt renamed to ‎src/test/resources/mocks/issue11_1.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/issue11_2.txt renamed to ‎src/test/resources/mocks/issue11_2.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/one_delta_test_original.txt renamed to ‎src/test/resources/mocks/one_delta_test_original.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/one_delta_test_revised.txt renamed to ‎src/test/resources/mocks/one_delta_test_revised.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/original.txt renamed to ‎src/test/resources/mocks/original.txt

Copy file name to clipboard
File renamed without changes.

‎test/mocks/revised.txt renamed to ‎src/test/resources/mocks/revised.txt

Copy file name to clipboard
File renamed without changes.

‎test/examples/diffutils/ApplyPatch.java

Copy file name to clipboardExpand all lines: test/examples/diffutils/ApplyPatch.java
-27Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.