From 649ad06586705b25905f805544cadcfad08efc07 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 3 Aug 2015 13:58:39 -0700 Subject: [PATCH] NoteMapTest: Add missing @Test annotations The RepositoryTestCase hierarchy no longer comes from TestCase, so all test methods must have @Test. Fix one test that was broken but never run; fortunately this was just a typo in the test code. Change-Id: I3ac8ccdab5e2d5539c63d7b0a88d8bdb0c5ff66e Signed-off-by: Matthias Sohn --- .../tst/org/eclipse/jgit/notes/NoteMapTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java index 47b08a7e16..325c9e2eba 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/notes/NoteMapTest.java @@ -449,11 +449,13 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals("empty tree", empty, n.getTree()); } + @Test public void testIteratorEmptyMap() { Iterator it = NoteMap.newEmptyMap().iterator(); assertFalse(it.hasNext()); } + @Test public void testIteratorFlatTree() throws Exception { RevBlob a = tr.blob("a"); RevBlob b = tr.blob("b"); @@ -472,6 +474,7 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals(2, count(it)); } + @Test public void testIteratorFanoutTree2_38() throws Exception { RevBlob a = tr.blob("a"); RevBlob b = tr.blob("b"); @@ -490,6 +493,7 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals(2, count(it)); } + @Test public void testIteratorFanoutTree2_2_36() throws Exception { RevBlob a = tr.blob("a"); RevBlob b = tr.blob("b"); @@ -508,6 +512,7 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals(2, count(it)); } + @Test public void testIteratorFullyFannedOut() throws Exception { RevBlob a = tr.blob("a"); RevBlob b = tr.blob("b"); @@ -526,12 +531,13 @@ public class NoteMapTest extends RepositoryTestCase { assertEquals(2, count(it)); } + @Test public void testShorteningNoteRefName() throws Exception { String expectedShortName = "review"; String noteRefName = Constants.R_NOTES + expectedShortName; assertEquals(expectedShortName, NoteMap.shortenRefName(noteRefName)); String nonNoteRefName = Constants.R_HEADS + expectedShortName; - assertEquals(nonNoteRefName, NoteMap.shortenRefName(expectedShortName)); + assertEquals(nonNoteRefName, NoteMap.shortenRefName(nonNoteRefName)); } private RevCommit commitNoteMap(NoteMap map) throws IOException { -- 2.39.5