From adce24fcd77c7b409553e3b2716559ea9afcac64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 6 Nov 2018 12:36:36 +0100 Subject: [PATCH] Enhance unit test --- .../repository/spi/GitDiffCommandTest.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java index d07801ceab..84088ba4ef 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommandTest.java @@ -43,6 +43,23 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase { assertEquals(DIFF_LATEST_COMMIT_TEST_BRANCH, output.toString()); } + @Test + public void diffForPathShouldCreateLimitedDiff() { + GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository); + DiffCommandRequest diffCommandRequest = new DiffCommandRequest(); + diffCommandRequest.setRevision("test-branch"); + diffCommandRequest.setPath("a.txt"); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + gitDiffCommand.getDiffResult(diffCommandRequest, output); + assertEquals("diff --git a/a.txt b/a.txt\n" + + "index 7898192..1dc60c7 100644\n" + + "--- a/a.txt\n" + + "+++ b/a.txt\n" + + "@@ -1 +1 @@\n" + + "-a\n" + + "+a and b\n", output.toString()); + } + @Test public void diffBetweenTwoBranchesShouldCreateDiff() { GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository); @@ -66,4 +83,22 @@ public class GitDiffCommandTest extends AbstractGitCommandTestBase { "@@ -0,0 +1 @@\n" + "+f\n", output.toString()); } + + @Test + public void diffBetweenTwoBranchesForPathShouldCreateLimitedDiff() { + GitDiffCommand gitDiffCommand = new GitDiffCommand(createContext(), repository); + DiffCommandRequest diffCommandRequest = new DiffCommandRequest(); + diffCommandRequest.setRevision("master"); + diffCommandRequest.setAncestorChangeset("test-branch"); + diffCommandRequest.setPath("a.txt"); + ByteArrayOutputStream output = new ByteArrayOutputStream(); + gitDiffCommand.getDiffResult(diffCommandRequest, output); + assertEquals("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" + + "+line for blame\n", output.toString()); + } }