Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

implemented parsing of git diff hunks

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-07-29 16:42:49 +02:00
parent 01379caa08
commit 07068880bb
7 changed files with 474 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffResultCommandTest.java
View File

@@ -3,6 +3,7 @@ package sonia.scm.repository.spi;
import org.junit.Test;
import sonia.scm.repository.api.DiffFile;
import sonia.scm.repository.api.DiffResult;
import sonia.scm.repository.api.Hunk;
import java.io.IOException;
import java.util.Iterator;
@@ -13,11 +14,7 @@ public class GitDiffResultCommandTest extends AbstractGitCommandTestBase {
@Test
public void shouldReturnOldAndNewRevision() throws IOException {
GitDiffResultCommand gitDiffResultCommand = new GitDiffResultCommand(createContext(), repository);
DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
diffCommandRequest.setRevision("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
DiffResult diffResult = gitDiffResultCommand.getDiffResult(diffCommandRequest);
DiffResult diffResult = createDiffResult("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
assertThat(diffResult.getNewRevision()).isEqualTo("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
assertThat(diffResult.getOldRevision()).isEqualTo("592d797cd36432e591416e8b2b98154f4f163411");
@@ -25,11 +22,7 @@ public class GitDiffResultCommandTest extends AbstractGitCommandTestBase {
@Test
public void shouldReturnFilePaths() throws IOException {
GitDiffResultCommand gitDiffResultCommand = new GitDiffResultCommand(createContext(), repository);
DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
diffCommandRequest.setRevision("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
DiffResult diffResult = gitDiffResultCommand.getDiffResult(diffCommandRequest);
DiffResult diffResult = createDiffResult("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
Iterator<DiffFile> iterator = diffResult.iterator();
DiffFile a = iterator.next();
assertThat(a.getNewPath()).isEqualTo("a.txt");
@@ -39,4 +32,58 @@ public class GitDiffResultCommandTest extends AbstractGitCommandTestBase {
assertThat(b.getOldPath()).isEqualTo("b.txt");
assertThat(b.getNewPath()).isEqualTo("/dev/null");
}
@Test
public void shouldReturnFileRevisions() throws IOException {
DiffResult diffResult = createDiffResult("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
Iterator<DiffFile> iterator = diffResult.iterator();
DiffFile a = iterator.next();
assertThat(a.getOldRevision()).isEqualTo("78981922613b2afb6025042ff6bd878ac1994e85");
assertThat(a.getNewRevision()).isEqualTo("1dc60c7504f4326bc83b9b628c384ec8d7e57096");
DiffFile b = iterator.next();
assertThat(b.getOldRevision()).isEqualTo("61780798228d17af2d34fce4cfbdf35556832472");
assertThat(b.getNewRevision()).isEqualTo("0000000000000000000000000000000000000000");
}
@Test
public void shouldReturnFileHunks() throws IOException {
DiffResult diffResult = createDiffResult("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4");
Iterator<DiffFile> iterator = diffResult.iterator();
DiffFile a = iterator.next();
Iterator<Hunk> hunks = a.iterator();
Hunk hunk = hunks.next();
assertThat(hunk.getOldStart()).isEqualTo(1);
assertThat(hunk.getOldLineCount()).isEqualTo(1);
assertThat(hunk.getNewStart()).isEqualTo(1);
assertThat(hunk.getNewLineCount()).isEqualTo(1);
}
@Test
public void shouldReturnFileHunksWithFullFileRange() throws IOException {
DiffResult diffResult = createDiffResult("fcd0ef1831e4002ac43ea539f4094334c79ea9ec");
Iterator<DiffFile> iterator = diffResult.iterator();
DiffFile a = iterator.next();
Iterator<Hunk> hunks = a.iterator();
Hunk hunk = hunks.next();
assertThat(hunk.getOldStart()).isEqualTo(1);
assertThat(hunk.getOldLineCount()).isEqualTo(1);
assertThat(hunk.getNewStart()).isEqualTo(1);
assertThat(hunk.getNewLineCount()).isEqualTo(2);
}
private DiffResult createDiffResult(String s) throws IOException {
GitDiffResultCommand gitDiffResultCommand = new GitDiffResultCommand(createContext(), repository);
DiffCommandRequest diffCommandRequest = new DiffCommandRequest();
diffCommandRequest.setRevision(s);
return gitDiffResultCommand.getDiffResult(diffCommandRequest);
}
}

138
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java Normal file
View File

@@ -0,0 +1,138 @@
package sonia.scm.repository.spi;
import org.junit.jupiter.api.Test;
import sonia.scm.repository.api.DiffLine;
import sonia.scm.repository.api.Hunk;
import java.util.Iterator;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
class GitHunkParserTest {
private static final String DIFF_001 = "diff --git a/a.txt b/a.txt\n" +
"index 7898192..2f8bc28 100644\n" +
"--- a/a.txt\n" +
"+++ b/a.txt\n" +
"@@ -1 +1,2 @@\n" +
" a\n" +
"+added line\n";
private static final String DIFF_002 = "diff --git a/file b/file\n" +
"index 5e89957..e8823e1 100644\n" +
"--- a/file\n" +
"+++ b/file\n" +
"@@ -2,6 +2,9 @@\n" +
" 2\n" +
" 3\n" +
" 4\n" +
"+5\n" +
"+6\n" +
"+7\n" +
" 8\n" +
" 9\n" +
" 10\n" +
"@@ -15,14 +18,13 @@\n" +
" 18\n" +
" 19\n" +
" 20\n" +
"+21\n" +
"+22\n" +
" 23\n" +
" 24\n" +
" 25\n" +
" 26\n" +
" 27\n" +
"-a\n" +
"-b\n" +
"-c\n" +
" 28\n" +
" 29\n" +
" 30";
private static final String DIFF_003 = "diff --git a/a.txt b/a.txt\n" +
"index 7898192..2f8bc28 100644\n" +
"--- a/a.txt\n" +
"+++ b/a.txt\n" +
"@@ -1,2 +1 @@\n" +
" a\n" +
"-removed line\n";
private static final String ILLEGAL_DIFF = "diff --git a/a.txt b/a.txt\n" +
"index 7898192..2f8bc28 100644\n" +
"--- a/a.txt\n" +
"+++ b/a.txt\n" +
"@@ -1,2 +1 @@\n" +
" a\n" +
"~illegal line\n";
@Test
void shouldParseHunks() {
List<Hunk> hunks = new GitHunkParser().parse(DIFF_001);
assertThat(hunks).hasSize(1);
assertHunk(hunks.get(0), 1, 1, 1, 2);
}
@Test
void shouldParseMultipleHunks() {
List<Hunk> hunks = new GitHunkParser().parse(DIFF_002);
assertThat(hunks).hasSize(2);
assertHunk(hunks.get(0), 2, 6, 2, 9);
assertHunk(hunks.get(1), 15, 14, 18, 13);
}
@Test
void shouldParseAddedHunkLines() {
List<Hunk> hunks = new GitHunkParser().parse(DIFF_001);
Hunk hunk = hunks.get(0);
Iterator<DiffLine> lines = hunk.iterator();
DiffLine line1 = lines.next();
assertThat(line1.getOldLineNumber()).hasValue(1);
assertThat(line1.getNewLineNumber()).hasValue(1);
assertThat(line1.getContent()).isEqualTo("a");
DiffLine line2 = lines.next();
assertThat(line2.getOldLineNumber()).isEmpty();
assertThat(line2.getNewLineNumber()).hasValue(2);
assertThat(line2.getContent()).isEqualTo("added line");
}
@Test
void shouldParseRemovedHunkLines() {
List<Hunk> hunks = new GitHunkParser().parse(DIFF_003);
Hunk hunk = hunks.get(0);
Iterator<DiffLine> lines = hunk.iterator();
DiffLine line1 = lines.next();
assertThat(line1.getOldLineNumber()).hasValue(1);
assertThat(line1.getNewLineNumber()).hasValue(1);
assertThat(line1.getContent()).isEqualTo("a");
DiffLine line2 = lines.next();
assertThat(line2.getOldLineNumber()).hasValue(2);
assertThat(line2.getNewLineNumber()).isEmpty();
assertThat(line2.getContent()).isEqualTo("removed line");
}
@Test
void shouldFailForIllegalLine() {
assertThrows(IllegalStateException.class, () -> new GitHunkParser().parse(ILLEGAL_DIFF));
}
private void assertHunk(Hunk hunk, int oldStart, int oldLineCount, int newStart, int newLineCount) {
assertThat(hunk.getOldStart()).isEqualTo(oldStart);
assertThat(hunk.getOldLineCount()).isEqualTo(oldLineCount);
assertThat(hunk.getNewStart()).isEqualTo(newStart);
assertThat(hunk.getNewLineCount()).isEqualTo(newLineCount);
}
}