aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2012-12-30 13:31:07 +0100
committerRobin Rosenberg <robin.rosenberg@dewire.com>2013-02-04 07:24:56 +0100
commit767be14f34b07e5acb8f332032fd97dd3e19a059 (patch)
tree43abbe102ff8b30922413ecd400ee3504c23e43f /org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
parentaae08070c6a5456ec2ef4a2700d201bd76a3163c (diff)
downloadjgit-767be14f34b07e5acb8f332032fd97dd3e19a059.tar.gz
jgit-767be14f34b07e5acb8f332032fd97dd3e19a059.zip
Move base test classes to the junit bundle for reuse for Java 7 tests
Change-Id: Iedb54eb9d8396bc3ae66d8754c1527fd9ca655f9
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
index a36a28c6b6..228e11dfb7 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
@@ -42,7 +42,11 @@
*/
package org.eclipse.jgit.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -53,11 +57,11 @@ import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.RepositoryState;
-import org.eclipse.jgit.lib.RepositoryTestCase;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.ReflogReader;
@@ -131,7 +135,7 @@ public class RevertCommandTest extends RepositoryTestCase {
doRevertAndCheckResult(git, sideCommit,
MergeFailureReason.DIRTY_INDEX);
- }
+}
@Test
public void testRevertDirtyWorktree() throws Exception {