diff options
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java index 10c9f9b12e..b5d4909f39 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergeBaseTest.java @@ -43,10 +43,15 @@ package org.eclipse.jgit.revwalk; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import org.eclipse.jgit.revwalk.filter.RevFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter; +import org.junit.Test; public class RevWalkMergeBaseTest extends RevWalkTestCase { + @Test public void testNone() throws Exception { final RevCommit c1 = commit(commit(commit())); final RevCommit c2 = commit(commit(commit())); @@ -57,6 +62,7 @@ public class RevWalkMergeBaseTest extends RevWalkTestCase { assertNull(rw.next()); } + @Test public void testDisallowTreeFilter() throws Exception { final RevCommit c1 = commit(); final RevCommit c2 = commit(); @@ -73,6 +79,7 @@ public class RevWalkMergeBaseTest extends RevWalkTestCase { } } + @Test public void testSimple() throws Exception { final RevCommit a = commit(); final RevCommit b = commit(a); @@ -86,6 +93,7 @@ public class RevWalkMergeBaseTest extends RevWalkTestCase { assertNull(rw.next()); } + @Test public void testMultipleHeads_SameBase1() throws Exception { final RevCommit a = commit(); final RevCommit b = commit(a); @@ -101,6 +109,7 @@ public class RevWalkMergeBaseTest extends RevWalkTestCase { assertNull(rw.next()); } + @Test public void testMultipleHeads_SameBase2() throws Exception { final RevCommit a = commit(); final RevCommit b = commit(a); @@ -117,6 +126,7 @@ public class RevWalkMergeBaseTest extends RevWalkTestCase { assertNull(rw.next()); } + @Test public void testCrissCross() throws Exception { // See http://marc.info/?l=git&m=111463358500362&w=2 for a nice // description of what this test is creating. We don't have a |