aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2010-12-31 11:44:54 +0100
committerShawn O. Pearce <spearce@spearce.org>2010-12-31 14:00:05 -0800
commitd9e07a574a946693e491668e0d94619bc5d886a5 (patch)
tree5bce4e9d47090d6b427986de4db30be17cc99c6d /org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
parent7cf8b8812f7baa1636c138113f4ed015eed8cc31 (diff)
downloadjgit-d9e07a574a946693e491668e0d94619bc5d886a5.tar.gz
jgit-d9e07a574a946693e491668e0d94619bc5d886a5.zip
Convert all JGit unit tests to JUnit 4
Eclipse has some problem re-running single JUnit tests if the tests are in Junit 3 format, but the JUnit 4 launcher is used. This was quite unnecessary and the move was not completed. We still have no JUnit4 test. This completes the extermination of JUnit3. Most of the work was global searce/replace using regular expression, followed by numerous invocarions of quick-fix and organize imports and verification that we had the same number of tests before and after. - Annotations were introduced. - All references to JUnit3 classes removed - Half-good replacement for getting the test name. This was needed to make the TestRngs work. The initialization of TestRngs was also made lazily since we can not longer find out the test name in runtime in the @Before methods. - Renamed test classes to end with Test, with the exception of TestTranslateBundle, which fails from Maven - Moved JGitTestUtil to the junit support bundle Change-Id: Iddcd3da6ca927a7be773a9c63ebf8bb2147e2d13 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
index 773ebbff25..d98358746b 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
@@ -45,6 +45,9 @@
package org.eclipse.jgit.lib;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -53,8 +56,10 @@ import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheEditor;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.treewalk.FileTreeIterator;
+import org.junit.Test;
public class IndexDiffTest extends RepositoryTestCase {
+ @Test
public void testAdded() throws IOException {
GitIndex index = new GitIndex(db);
writeTrashFile("file1", "file1");
@@ -76,6 +81,7 @@ public class IndexDiffTest extends RepositoryTestCase {
assertEquals(0, diff.getRemoved().size());
}
+ @Test
public void testRemoved() throws IOException {
writeTrashFile("file2", "file2");
writeTrashFile("dir/file3", "dir/file3");
@@ -101,6 +107,7 @@ public class IndexDiffTest extends RepositoryTestCase {
assertEquals(0, diff.getAdded().size());
}
+ @Test
public void testModified() throws IOException {
GitIndex index = new GitIndex(db);
@@ -132,6 +139,7 @@ public class IndexDiffTest extends RepositoryTestCase {
assertEquals(0, diff.getMissing().size());
}
+ @Test
public void testUnchangedSimple() throws IOException {
GitIndex index = new GitIndex(db);
@@ -166,6 +174,7 @@ public class IndexDiffTest extends RepositoryTestCase {
*
* @throws IOException
*/
+ @Test
public void testUnchangedComplex() throws IOException {
GitIndex index = new GitIndex(db);
@@ -221,6 +230,7 @@ public class IndexDiffTest extends RepositoryTestCase {
*
* @throws Exception
*/
+ @Test
public void testRemovedUntracked() throws Exception{
Git git = new Git(db);
String path = "file";
@@ -235,6 +245,7 @@ public class IndexDiffTest extends RepositoryTestCase {
assertTrue(diff.getUntracked().contains(path));
}
+ @Test
public void testAssumeUnchanged() throws Exception {
Git git = new Git(db);
String path = "file";