diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java index 3846199696..9ffe865e97 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java @@ -90,7 +90,7 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase assertFalse(a.isDirectory()); assertEquals("a.txt", a.getName()); assertEquals("a.txt", a.getPath()); - assertEquals("added a and b files", a.getDescription()); + assertEquals("added new line for blame", a.getDescription()); assertTrue(a.getLength() > 0); checkDate(a.getLastModified()); assertNotNull(c); diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java index 69eaaad058..154e9d0a36 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommandTest.java @@ -72,8 +72,8 @@ public class GitCatCommandTest extends AbstractGitCommandTestBase { CatCommandRequest request = new CatCommandRequest(); - request.setPath("a.txt"); - assertEquals("a", execute(request)); + request.setPath("b.txt"); + assertEquals("b", execute(request)); } /** diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java index 0913fdf173..5945c38203 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java @@ -63,8 +63,8 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase new LogCommandRequest()); assertNotNull(result); - assertEquals(4, result.getTotal()); - assertEquals(4, result.getChangesets().size()); + assertEquals(5, result.getTotal()); + assertEquals(5, result.getChangesets().size()); } /** @@ -82,10 +82,11 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase new GitLogCommand(repository, repositoryDirectory).getChangesets(request); assertNotNull(result); - assertEquals(2, result.getTotal()); - assertEquals(2, result.getChangesets().size()); - assertEquals("3f76a12f08a6ba0dc988", result.getChangesets().get(0).getId()); - assertEquals("435df2f061add3589cb3", result.getChangesets().get(1).getId()); + assertEquals(3, result.getTotal()); + assertEquals(3, result.getChangesets().size()); + assertEquals("fcd0ef1831e4002ac43e", result.getChangesets().get(0).getId()); + assertEquals("3f76a12f08a6ba0dc988", result.getChangesets().get(1).getId()); + assertEquals("435df2f061add3589cb3", result.getChangesets().get(2).getId()); } /** @@ -103,18 +104,18 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase new GitLogCommand(repository, repositoryDirectory).getChangesets(request); assertNotNull(result); - assertEquals(4, result.getTotal()); + assertEquals(5, result.getTotal()); assertEquals(2, result.getChangesets().size()); Changeset c1 = result.getChangesets().get(0); assertNotNull(c1); - assertEquals("86a6645eceefe8b9a247", c1.getId()); + assertEquals("fcd0ef1831e4002ac43e", c1.getId()); Changeset c2 = result.getChangesets().get(1); assertNotNull(c2); - assertEquals("3f76a12f08a6ba0dc988", c2.getId()); + assertEquals("86a6645eceefe8b9a247", c2.getId()); } /** diff --git a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip index 88bedbea9c..3fbab0be38 100644 Binary files a/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip and b/scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/repository/spi/scm-git-spi-test.zip differ