Author: wumpz

src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java

@@ -15,6 +15,7 @@
  */
 package com.github.difflib.unifieddiff;
 
+import java.io.IOException;
 import java.io.Writer;
 
 /**
@@ -23,7 +24,29 @@
  */
 public class UnifiedDiffWriter {
 
-    public static void write(UnifiedDiff diff, Writer writer) {
+    public static void write(UnifiedDiff diff, Writer writer) throws IOException {
+        writer.write(diff.getHeader());
 
+        for (UnifiedDiffFile file : diff.getFiles()) {
+            writeOrNothing(writer, file.getDiffCommand());
+            if (file.getIndex() != null) {
+                writer.write("index " + file.getIndex() + "\n");
+            }
+            if (file.getFromFile() != null) {
+                writer.write("--- " + file.getFromFile() + "\n");
+            }
+            if (file.getToFile() != null) {
+                writer.write("+++ " + file.getToFile() + "\n");
+            }
+
+        }
+
+        writer.write(diff.getTail());
+    }
+
+    private static void writeOrNothing(Writer writer, String str) throws IOException {
+        if (str != null) {
+            writer.append(str).append("\n");
+        }
     }
 }

src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java

@@ -19,12 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import org.junit.After;
-import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -33,25 +29,6 @@
  */
 public class UnifiedDiffReaderTest {
 
-    public UnifiedDiffReaderTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testSimpleParse() throws IOException {
         UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));

src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java

@@ -15,10 +15,14 @@
  */
 package com.github.difflib.unifieddiff;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import org.junit.Test;
 
 /**
@@ -30,25 +34,19 @@ public class UnifiedDiffWriterTest {
     public UnifiedDiffWriterTest() {
     }
 
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
-    public void testWrite() {
+    public void testWrite() throws URISyntaxException, IOException {
+        String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset());
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));
 
+        StringWriter writer = new StringWriter();
+        UnifiedDiffWriter.write(diff, writer);
+        System.out.println(writer.toString());
     }
 
+    static String readFile(URI path, Charset encoding)
+            throws IOException {
+        byte[] encoded = Files.readAllBytes(Paths.get(path));
+        return new String(encoded, encoding);
+    }
 }