motiejus
/
jgit
1
Fork 0
Code Releases Activity

LockFileTest: Open Git instance in try-with-resource 

Change-Id: Ie2b0e55e606f50c46e21227f23de74dbea8388e5
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
David Pursehouse 2016-02-15 14:48:02 +09:00
parent 3a6ed050a4
commit 6d33322df4
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/LockFileTest.java
View File

@ -61,25 +61,26 @@ public class LockFileTest extends RepositoryTestCase {
@Test
public void lockFailedExceptionRecovery() throws Exception {
Git git = new Git(db);
writeTrashFile("file.txt", "content");
git.add().addFilepattern("file.txt").call();
RevCommit commit1 = git.commit().setMessage("create file").call();
try (Git git = new Git(db)) {
writeTrashFile("file.txt", "content");
git.add().addFilepattern("file.txt").call();
RevCommit commit1 = git.commit().setMessage("create file").call();
assertNotNull(commit1);
writeTrashFile("file.txt", "content2");
git.add().addFilepattern("file.txt").call();
assertNotNull(git.commit().setMessage("edit file").call());
assertNotNull(commit1);
writeTrashFile("file.txt", "content2");
git.add().addFilepattern("file.txt").call();
assertNotNull(git.commit().setMessage("edit file").call());
LockFile lf = new LockFile(db.getIndexFile(), db.getFS());
assertTrue(lf.lock());
try {
git.checkout().setName(commit1.name()).call();
fail("JGitInternalException not thrown");
} catch (JGitInternalException e) {
assertTrue(e.getCause() instanceof LockFailedException);
lf.unlock();
git.checkout().setName(commit1.name()).call();
LockFile lf = new LockFile(db.getIndexFile(), db.getFS());
assertTrue(lf.lock());
try {
git.checkout().setName(commit1.name()).call();
fail("JGitInternalException not thrown");
} catch (JGitInternalException e) {
assertTrue(e.getCause() instanceof LockFailedException);
lf.unlock();
git.checkout().setName(commit1.name()).call();
}
}
}
}