BundleWriterTest: Open RevWalk in try-with-resource
Change-Id: Ie25770a73b19d6522bad9fdc0966f48370f96265 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
2a7b3ff00b
commit
7e8e4ec019
|
@ -126,24 +126,26 @@ public void testIncrementalBundle() throws Exception {
|
|||
assertNull(newRepo.resolve("refs/heads/a"));
|
||||
|
||||
// Next an incremental bundle
|
||||
bundle = makeBundle("refs/heads/cc", db.resolve("c").name(),
|
||||
new RevWalk(db).parseCommit(db.resolve("a").toObjectId()));
|
||||
fetchResult = fetchFromBundle(newRepo, bundle);
|
||||
advertisedRef = fetchResult.getAdvertisedRef("refs/heads/cc");
|
||||
assertEquals(db.resolve("c").name(), advertisedRef.getObjectId().name());
|
||||
assertEquals(db.resolve("c").name(), newRepo.resolve("refs/heads/cc")
|
||||
.name());
|
||||
assertNull(newRepo.resolve("refs/heads/c"));
|
||||
assertNull(newRepo.resolve("refs/heads/a")); // still unknown
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
bundle = makeBundle("refs/heads/cc", db.resolve("c").name(),
|
||||
rw.parseCommit(db.resolve("a").toObjectId()));
|
||||
fetchResult = fetchFromBundle(newRepo, bundle);
|
||||
advertisedRef = fetchResult.getAdvertisedRef("refs/heads/cc");
|
||||
assertEquals(db.resolve("c").name(), advertisedRef.getObjectId().name());
|
||||
assertEquals(db.resolve("c").name(), newRepo.resolve("refs/heads/cc")
|
||||
.name());
|
||||
assertNull(newRepo.resolve("refs/heads/c"));
|
||||
assertNull(newRepo.resolve("refs/heads/a")); // still unknown
|
||||
|
||||
try {
|
||||
// Check that we actually needed the first bundle
|
||||
Repository newRepo2 = createBareRepository();
|
||||
fetchResult = fetchFromBundle(newRepo2, bundle);
|
||||
fail("We should not be able to fetch from bundle with prerequisites that are not fulfilled");
|
||||
} catch (MissingBundlePrerequisiteException e) {
|
||||
assertTrue(e.getMessage()
|
||||
.indexOf(db.resolve("refs/heads/a").name()) >= 0);
|
||||
try {
|
||||
// Check that we actually needed the first bundle
|
||||
Repository newRepo2 = createBareRepository();
|
||||
fetchResult = fetchFromBundle(newRepo2, bundle);
|
||||
fail("We should not be able to fetch from bundle with prerequisites that are not fulfilled");
|
||||
} catch (MissingBundlePrerequisiteException e) {
|
||||
assertTrue(e.getMessage()
|
||||
.indexOf(db.resolve("refs/heads/a").name()) >= 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue