diff options
Diffstat (limited to 'org.eclipse.jgit.test')
4 files changed, 16 insertions, 14 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index a183a1ce73..efdaa7bd70 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -54,6 +54,7 @@ import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryTestCase; import org.eclipse.jgit.patch.FileHeader; import org.eclipse.jgit.patch.HunkHeader; @@ -79,13 +80,13 @@ public class DiffFormatterTest extends RepositoryTestCase { private DiffFormatter df; - private TestRepository testDb; + private TestRepository<Repository> testDb; @Override @Before public void setUp() throws Exception { super.setUp(); - testDb = new TestRepository(db); + testDb = new TestRepository<Repository>(db); df = new DiffFormatter(DisabledOutputStream.INSTANCE); df.setRepository(db); df.setAbbreviationLength(8); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java index 70e45444ac..6b35a2bd3b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java @@ -55,6 +55,7 @@ import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryTestCase; import org.junit.Before; import org.junit.Test; @@ -67,13 +68,13 @@ public class RenameDetectorTest extends RepositoryTestCase { private RenameDetector rd; - private TestRepository testDb; + private TestRepository<Repository> testDb; @Override @Before public void setUp() throws Exception { super.setUp(); - testDb = new TestRepository(db); + testDb = new TestRepository<Repository>(db); rd = new RenameDetector(db); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java index 9514aaa5ee..9cf01a98e5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java @@ -148,7 +148,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testTinyThinPack() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("a"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(1024); @@ -186,7 +186,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testPackWithTrailingGarbage() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("a"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(1024); @@ -213,7 +213,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testMaxObjectSizeFullBlob() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); final byte[] data = Constants.encode("0123456789"); d.blob(data); @@ -245,7 +245,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testMaxObjectSizeDeltaBlock() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("a"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(1024); @@ -276,7 +276,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testMaxObjectSizeDeltaResultSize() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("0123456789"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(1024); @@ -306,7 +306,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testNonMarkingInputStream() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("a"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(1024); @@ -344,7 +344,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testDataAfterPackFooterSingleRead() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); RevBlob a = d.blob("a"); TemporaryBuffer.Heap pack = new TemporaryBuffer.Heap(32*1024); @@ -402,7 +402,7 @@ public class PackParserTest extends RepositoryTestCase { @Test public void testDataAfterPackFooterSplitHeaderRead() throws Exception { - TestRepository d = new TestRepository(db); + TestRepository d = new TestRepository<Repository>(db); final byte[] data = Constants.encode("a"); RevBlob b = d.blob(data); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java index 5f17394e2e..9e52bcaa5f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java @@ -108,7 +108,7 @@ public class ReceivePackAdvertiseRefsHookTest extends LocalDiskRepositoryTestCas // Fill dst with a some common history. // - TestRepository d = new TestRepository(dst); + TestRepository<Repository> d = new TestRepository<Repository>(dst); a = d.blob("a"); A = d.commit(d.tree(d.file("a", a))); B = d.commit().parent(A).create(); @@ -201,7 +201,7 @@ public class ReceivePackAdvertiseRefsHookTest extends LocalDiskRepositoryTestCas // Now use b but in a different commit than what is hidden. // - TestRepository s = new TestRepository(src); + TestRepository<Repository> s = new TestRepository<Repository>(src); RevCommit N = s.commit().parent(B).add("q", b).create(); s.update(R_MASTER, N); |