Changed to default maven layout: src/main/java, src/test/java, src/test/resources.

git-svn-id: http://java-diff-utils.googlecode.com/svn/trunk@51 d8d7d024-a22d-11de-b755-fd640f38fa9d

Author: [email protected]

build.xml

@@ -2,7 +2,7 @@
 
 <project name="java-diff-utils" default="jar" basedir=".">
     <property name="version" value="1.3.0-SNAPSHOT"/>
-    <property name="src.dir" value="src" />
+    <property name="src.dir" value="src/main/java" />
     <property name="build.dir" location="build" />
     <property name="dist.dir" value="dist" />
     <property name="jar.file.name" value="${dist.dir}/${ant.project.name}-${version}.jar" />

java-diff-utils.iml

@@ -5,9 +5,9 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test/testcase" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test/mocks" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/target" />

pom.xml

@@ -30,13 +30,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>
-    <sourceDirectory>src/</sourceDirectory>
-    <testSourceDirectory>test/testcase</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>test/mocks</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

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

@@ -15,8 +15,7 @@
 import java.util.List;
 
 public class GenerateUnifiedDiffTest extends TestCase {
-    private static final String FS = File.separator;
-    private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS;
+
 
     public List<String> fileToLines(String filename) {
         List<String> lines = new LinkedList<String>();
@@ -34,15 +33,15 @@ public List<String> fileToLines(String filename) {
     }
 
     public void testGenerateUnified() {
-        List<String> origLines = fileToLines(MOCK_FOLDER + "original.txt");
-        List<String> revLines = fileToLines(MOCK_FOLDER + "revised.txt");
+        List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
+        List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
 
         verify(origLines, revLines, "original.txt", "revised.txt");
     }
 
     public void testGenerateUnifiedWithOneDelta() {
-        List<String> origLines = fileToLines(MOCK_FOLDER + "one_delta_test_original.txt");
-        List<String> revLines = fileToLines(MOCK_FOLDER + "one_delta_test_revised.txt");
+        List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
+        List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
 
         verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
     }
@@ -54,8 +53,8 @@ public void testGenerateUnifiedDiffWithoutAnyDeltas() {
     }
 
     public void testDiff_Issue10() {
-        final List<String> baseLines = fileToLines(MOCK_FOLDER + "issue10_base.txt");
-        final List<String> patchLines = fileToLines(MOCK_FOLDER + "issue10_patch.txt");
+        final List<String> baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
+        final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
         final Patch p = DiffUtils.parseUnifiedDiff(patchLines);
         try {
             DiffUtils.patch(baseLines, p);
@@ -68,14 +67,14 @@ public void testDiff_Issue10() {
      * Issue 12
      */
     public void testPatchWithNoDeltas() {
-        final List<String> lines1 = fileToLines(MOCK_FOLDER + "issue11_1.txt");
-        final List<String> lines2 = fileToLines(MOCK_FOLDER + "issue11_2.txt");
+        final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
+        final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
         verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
     }
 
     public void testDiff5() {
-        final List<String> lines1 = fileToLines(MOCK_FOLDER + "5A.txt");
-        final List<String> lines2 = fileToLines(MOCK_FOLDER + "5B.txt");
+        final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
+        final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
         verify(lines1, lines2, "5A.txt", "5B.txt");
     }
 

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

@@ -0,0 +1,25 @@
+package diffutils;
+
+import java.io.File;
+
+/**
+ * Test constants
+ * @author [email protected]
+ *
+ */
+public final class TestConstants {
+
+	private TestConstants() {
+		// prevent construction.
+	}
+	
+	/** File separator. */
+	public static final String FS = File.separator;
+	
+	/** The base resource path. */
+	public static String BASE_FOLDER_RESOURCES = "src" + FS + "test" + FS + "resources";
+	
+	/** The base folder containing the test files. Ends with {@link #FS}. */
+	public static final String MOCK_FOLDER = BASE_FOLDER_RESOURCES + FS + "mocks" + FS;
+	
+}

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

@@ -0,0 +1,27 @@
+package diffutils.examples;
+
+import java.util.List;
+
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+import diffutils.TestConstants;
+
+public class ApplyPatch extends Example {
+
+	static final String ORIGINAL = TestConstants.MOCK_FOLDER + "issue10_base.txt";
+	static final String PATCH = TestConstants.MOCK_FOLDER + "issue10_patch.txt";
+
+	public static void main(String[] args) throws PatchFailedException {
+		List<String> original = fileToLines(ORIGINAL);
+		List<String> patched = fileToLines(PATCH);
+
+		// At first, parse the unified diff file and get the patch
+		Patch patch = DiffUtils.parseUnifiedDiff(patched);
+
+		// Then apply the computed patch to the given text
+		List result = DiffUtils.patch(original, patch);
+		System.out.println(result);
+		// / Or we can call patch.applyTo(original). There is no difference.
+	}
+}

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

@@ -1,16 +1,17 @@
-package diffutils;
+package diffutils.examples;
 
-import java.io.File;
 import java.util.List;
 
 import difflib.Delta;
 import difflib.DiffUtils;
 import difflib.Patch;
+import diffutils.TestConstants;
 
 public class ComputeDifference extends Example {
-    static final String FS = File.separator;
-    static final String ORIGINAL = "test" + FS + "mocks" + FS + "original.txt";
-    static final String RIVISED = "test" + FS + "mocks" + FS + "revised.txt";
+    
+     
+    static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt";
+    static final String RIVISED = TestConstants.MOCK_FOLDER + "revised.txt";
 
     public static void main(String[] args) {
         List<String> original = fileToLines(ORIGINAL);

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

@@ -1,12 +1,24 @@
-package diffutils;
+package diffutils.examples;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-public class Example {
+public abstract class Example {
+	
+	/** File separator. */
+	protected static final String FS = File.separator;
+	/** The base resource path. */
+	protected static String BASE_PATH = "src" + FS + "test" + FS + "resources";
+	
+	/**
+	 * Tries to read the file and split it into a list of lines.
+	 * @param filename The filename as path.
+	 * @return A list of lines.
+	 */
     public static List<String> fileToLines(String filename) {
         List<String> lines = new LinkedList<String>();
         String line = "";