Browse Source

PullCommandWithRebaseTest: Open RevWalk in try-with-resource

Change-Id: I16f4d219e8b103d30149b2a94d3484424f3de84b
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
tags/v4.3.0.201603230630-rc1
David Pursehouse 8 years ago
parent
commit
ad9b326e3f

+ 21
- 20
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java View File

@@ -273,26 +273,27 @@ public class PullCommandWithRebaseTest extends RepositoryTestCase {

// Get the HEAD and HEAD~1 commits
Repository targetRepo = target.getRepository();
RevWalk revWalk = new RevWalk(targetRepo);
ObjectId headId = targetRepo.resolve(Constants.HEAD);
RevCommit root = revWalk.parseCommit(headId);
revWalk.markStart(root);
// HEAD
RevCommit head = revWalk.next();
// HEAD~1
RevCommit beforeHead = revWalk.next();

// verify the commit message on the HEAD commit
assertEquals(TARGET_COMMIT_MESSAGE, head.getFullMessage());
// verify the commit just before HEAD
assertEquals(SOURCE_COMMIT_MESSAGE, beforeHead.getFullMessage());

// verify file states
assertFileContentsEqual(sourceFile, SOURCE_FILE_CONTENTS);
assertFileContentsEqual(newFile, NEW_FILE_CONTENTS);
// verify repository state
assertEquals(RepositoryState.SAFE, target
.getRepository().getRepositoryState());
try (RevWalk revWalk = new RevWalk(targetRepo)) {
ObjectId headId = targetRepo.resolve(Constants.HEAD);
RevCommit root = revWalk.parseCommit(headId);
revWalk.markStart(root);
// HEAD
RevCommit head = revWalk.next();
// HEAD~1
RevCommit beforeHead = revWalk.next();

// verify the commit message on the HEAD commit
assertEquals(TARGET_COMMIT_MESSAGE, head.getFullMessage());
// verify the commit just before HEAD
assertEquals(SOURCE_COMMIT_MESSAGE, beforeHead.getFullMessage());

// verify file states
assertFileContentsEqual(sourceFile, SOURCE_FILE_CONTENTS);
assertFileContentsEqual(newFile, NEW_FILE_CONTENTS);
// verify repository state
assertEquals(RepositoryState.SAFE, target
.getRepository().getRepositoryState());
}
}

@Override

Loading…
Cancel
Save