From 440d7f41270f18f430b40d4ce3873d84593a5533 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Mon, 7 Mar 2011 16:47:04 +0100 Subject: [PATCH] Enable test methods in CommitAndLogCommandTests Change-Id: I52bbf19416cba42340004f0235e17a436cad1058 Bug: 339086 Signed-off-by: Chris Aniszczyk --- .../tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java index bc313e87e..f8e1e03b5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java @@ -67,8 +67,10 @@ import org.eclipse.jgit.lib.RepositoryTestCase; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; public class CommitAndLogCommandTests extends RepositoryTestCase { + @Test public void testSomeCommits() throws NoHeadException, NoMessageException, UnmergedPathException, ConcurrentRefUpdateException, JGitInternalException, WrongRepositoryStateException { @@ -103,6 +105,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { } // try to do a commit without specifying a message. Should fail! + @Test public void testWrongParams() throws UnmergedPathException, NoHeadException, ConcurrentRefUpdateException, JGitInternalException, WrongRepositoryStateException { @@ -117,6 +120,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { // try to work with Commands after command has been invoked. Should throw // exceptions + @Test public void testMultipleInvocations() throws NoHeadException, ConcurrentRefUpdateException, NoMessageException, UnmergedPathException, JGitInternalException, @@ -142,6 +146,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { } } + @Test public void testMergeEmptyBranches() throws IOException, NoHeadException, NoMessageException, ConcurrentRefUpdateException, JGitInternalException, WrongRepositoryStateException { @@ -165,6 +170,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { assertTrue(parents.length==2); } + @Test public void testAddUnstagedChanges() throws IOException, NoHeadException, NoMessageException, ConcurrentRefUpdateException, JGitInternalException, WrongRepositoryStateException, @@ -197,6 +203,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { tw.getObjectId(0).getName()); } + @Test public void testCommitRange() throws NoHeadException, NoMessageException, UnmergedPathException, ConcurrentRefUpdateException, JGitInternalException, WrongRepositoryStateException,