From 94f46d587e737f70c74b4889e7b8a6c096748ceb Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 11 Jun 2012 17:37:37 +0200 Subject: [PATCH] improve unit test repository --- .../repository/spi/GitBrowseCommandTest.java | 2 +- .../scm/repository/spi/GitCatCommandTest.java | 4 ++-- .../scm/repository/spi/GitLogCommandTest.java | 19 +++++++++--------- .../scm/repository/spi/scm-git-spi-test.zip | Bin 19256 -> 20891 bytes 4 files changed, 13 insertions(+), 12 deletions(-) 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 88bedbea9c1268f70b52a76225a26b8ebaa3b9c8..3fbab0be38e115c7c9fe342e52ea2a4bdc4e6893 100644 GIT binary patch delta 3948 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 pB1CY7G94T16T=bR9LyjAi?~>