Issue 16

.gitignore

@@ -1,4 +1,5 @@
-/diffparser.iml
-/build
-/.idea
-/.gradle
+/diffparser.iml
+/build
+/.idea
+/.gradle
+/.nb-gradle/

build.gradle

@@ -24,7 +24,7 @@ ext{
 dependencies {
     compile('org.slf4j:slf4j-api:1.7.25')
     testCompile('org.slf4j:slf4j-log4j12:1.7.25')
-    testCompile('org.testng:testng:6.8.7')
+    testCompile('org.testng:testng:6.10')
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -137,4 +137,7 @@ bintray {
     publish = true
 }
 
-
+//Setup the test task
+test {
+    useTestNG()
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

src/main/java/io/reflectoring/diffparser/api/UnifiedDiffParser.java

@@ -15,19 +15,23 @@
  */
 package io.reflectoring.diffparser.api;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import io.reflectoring.diffparser.api.model.Diff;
 import io.reflectoring.diffparser.api.model.Hunk;
 import io.reflectoring.diffparser.api.model.Line;
 import io.reflectoring.diffparser.api.model.Range;
 import io.reflectoring.diffparser.unified.ParserState;
 import io.reflectoring.diffparser.unified.ResizingParseWindow;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * A parser that parses a unified diff from text into a {@link Diff} data structure.
  * <p/>
@@ -101,7 +105,7 @@ public List<Diff> parse(InputStream in) {
     }
 
     private void parseNeutralLine(Diff currentDiff, String currentLine) {
-        Line line = new Line(Line.LineType.NEUTRAL, currentLine);
+        Line line = new Line(Line.LineType.NEUTRAL, currentLine.substring(1));
         currentDiff.getLatestHunk().getLines().add(line);
     }
 
@@ -169,12 +173,8 @@ public List<Diff> parse(byte[] bytes) {
 
     @Override
     public List<Diff> parse(File file) throws IOException {
-        FileInputStream in = new FileInputStream(file);
-        try{
+        try(FileInputStream in = new FileInputStream(file)) {
           return parse(in);
-        } finally {
-          in.close();
         }
     }
-
 }

src/test/java/io/reflectoring/diffparser/unified/GitDiffTest.java

@@ -3,51 +3,54 @@
  */
 package io.reflectoring.diffparser.unified;
 
-import io.reflectoring.diffparser.api.DiffParser;
-import io.reflectoring.diffparser.api.UnifiedDiffParser;
-import io.reflectoring.diffparser.api.model.Diff;
-import io.reflectoring.diffparser.api.model.Hunk;
-import io.reflectoring.diffparser.api.model.Line;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
 import java.io.InputStream;
 import java.util.List;
 
 import org.testng.annotations.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-public class GitDiffTest {
-
-    @Test
-    public void testParse() {
-        // given
-        DiffParser parser = new UnifiedDiffParser();
-        InputStream in = getClass().getResourceAsStream("git.diff");
-
-        // when
-        List<Diff> diffs = parser.parse(in);
-
-        // then
-        assertNotNull(diffs);
-        assertEquals(3, diffs.size());
-
-        Diff diff1 = diffs.get(0);
-        assertEquals("a/diffparser/pom.xml", diff1.getFromFileName());
-        assertEquals("b/diffparser/pom.xml", diff1.getToFileName());
-        assertEquals(2, diff1.getHunks().size());
-
-        List<String> headerLines = diff1.getHeaderLines();
-        assertEquals(2, headerLines.size());
-
-        Hunk hunk1 = diff1.getHunks().get(0);
-        assertEquals(6, hunk1.getFromFileRange().getLineStart());
-        assertEquals(7, hunk1.getFromFileRange().getLineCount());
-        assertEquals(6, hunk1.getToFileRange().getLineStart());
-        assertEquals(7, hunk1.getToFileRange().getLineCount());
+import io.reflectoring.diffparser.api.DiffParser;
+import io.reflectoring.diffparser.api.UnifiedDiffParser;
+import io.reflectoring.diffparser.api.model.Diff;
+import io.reflectoring.diffparser.api.model.Hunk;
+import io.reflectoring.diffparser.api.model.Line;
 
-        List<Line> lines = hunk1.getLines();
-        assertEquals(8, lines.size());
-        assertEquals(Line.LineType.FROM, lines.get(3).getLineType());
-        assertEquals(Line.LineType.TO, lines.get(4).getLineType());
-    }
+public class GitDiffTest
+{
+
+  @Test
+  public void testParse()
+  {
+    // given
+    DiffParser parser = new UnifiedDiffParser();
+    InputStream in = getClass().getResourceAsStream("git.diff");
+
+    // when
+    List<Diff> diffs = parser.parse(in);
+
+    // then
+    assertNotNull(diffs);
+    assertEquals(diffs.size(), 3);
+
+    Diff diff1 = diffs.get(0);
+    assertEquals("a/diffparser/pom.xml", diff1.getFromFileName());
+    assertEquals("b/diffparser/pom.xml", diff1.getToFileName());
+    assertEquals(diff1.getHunks().size(), 2);
+
+    List<String> headerLines = diff1.getHeaderLines();
+    assertEquals(headerLines.size(), 2);
+
+    Hunk hunk1 = diff1.getHunks().get(0);
+    assertEquals(hunk1.getFromFileRange().getLineStart(), 6);
+    assertEquals(hunk1.getFromFileRange().getLineCount(), 7);
+    assertEquals(hunk1.getToFileRange().getLineStart(), 6);
+    assertEquals(hunk1.getToFileRange().getLineCount(), 7);
+
+    List<Line> lines = hunk1.getLines();
+    assertEquals(lines.size(), 8);
+    assertEquals(lines.get(3).getLineType(), Line.LineType.FROM);
+    assertEquals(lines.get(4).getLineType(), Line.LineType.TO);
+  }
 }

src/test/java/io/reflectoring/diffparser/unified/SvnDiffTest.java

@@ -1,16 +1,17 @@
 package io.reflectoring.diffparser.unified;
 
+import java.io.InputStream;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import io.reflectoring.diffparser.api.DiffParser;
 import io.reflectoring.diffparser.api.UnifiedDiffParser;
-import junit.framework.Assert;
-import org.testng.annotations.Test;
 import io.reflectoring.diffparser.api.model.Diff;
 import io.reflectoring.diffparser.api.model.Hunk;
 import io.reflectoring.diffparser.api.model.Line;
 
-import java.io.InputStream;
-import java.util.List;
-
 /**
  * Tests the DiffParser with a diff created by the "svn diff" command.
  */