From 57c6ff94fbc464f5c10b57fe1e14b40d91d12b97 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 14 Mar 2018 13:35:50 +0900 Subject: [PATCH] RepoCommandSymlinkTest#testLinkFileBare: Use try-with-resource Change-Id: I72756d92dc5ea54ad009dddb9cebbcd6d1a0b4f8 Signed-off-by: David Pursehouse --- .../jgit/gitrepo/RepoCommandSymlinkTest.java | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java index 341cc4f215..548b9033bc 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java @@ -119,45 +119,47 @@ public class RepoCommandSymlinkTest extends RepositoryTestCase { .setURI(rootUri).call(); // Clone it File directory = createTempDirectory("testCopyFileBare"); - Repository localDb = Git.cloneRepository().setDirectory(directory) + try (Repository localDb = Git.cloneRepository() + .setDirectory(directory) .setURI(remoteDb.getDirectory().toURI().toString()).call() - .getRepository(); + .getRepository()) { - // The LinkedHello symlink should exist. - File linkedhello = new File(localDb.getWorkTree(), "LinkedHello"); - assertTrue("The LinkedHello file should exist", - localDb.getFS().exists(linkedhello)); - assertTrue("The LinkedHello file should be a symlink", - localDb.getFS().isSymLink(linkedhello)); - assertEquals("foo/hello.txt", - localDb.getFS().readSymLink(linkedhello)); + // The LinkedHello symlink should exist. + File linkedhello = new File(localDb.getWorkTree(), + "LinkedHello"); + assertTrue("The LinkedHello file should exist", + localDb.getFS().exists(linkedhello)); + assertTrue("The LinkedHello file should be a symlink", + localDb.getFS().isSymLink(linkedhello)); + assertEquals("foo/hello.txt", + localDb.getFS().readSymLink(linkedhello)); - // The foo/LinkedHello file should be skipped. - File linkedfoohello = new File(localDb.getWorkTree(), "foo/LinkedHello"); - assertFalse("The foo/LinkedHello file should be skipped", - localDb.getFS().exists(linkedfoohello)); + // The foo/LinkedHello file should be skipped. + File linkedfoohello = new File(localDb.getWorkTree(), + "foo/LinkedHello"); + assertFalse("The foo/LinkedHello file should be skipped", + localDb.getFS().exists(linkedfoohello)); - // The subdir/LinkedHello file should use a relative ../ - File linkedsubdirhello = new File(localDb.getWorkTree(), - "subdir/LinkedHello"); - assertTrue("The subdir/LinkedHello file should exist", - localDb.getFS().exists(linkedsubdirhello)); - assertTrue("The subdir/LinkedHello file should be a symlink", - localDb.getFS().isSymLink(linkedsubdirhello)); - assertEquals("../foo/hello.txt", - localDb.getFS().readSymLink(linkedsubdirhello)); + // The subdir/LinkedHello file should use a relative ../ + File linkedsubdirhello = new File(localDb.getWorkTree(), + "subdir/LinkedHello"); + assertTrue("The subdir/LinkedHello file should exist", + localDb.getFS().exists(linkedsubdirhello)); + assertTrue("The subdir/LinkedHello file should be a symlink", + localDb.getFS().isSymLink(linkedsubdirhello)); + assertEquals("../foo/hello.txt", + localDb.getFS().readSymLink(linkedsubdirhello)); - // The bar/foo/LinkedHello file should use a single relative ../ - File linkedbarfoohello = new File(localDb.getWorkTree(), - "bar/foo/LinkedHello"); - assertTrue("The bar/foo/LinkedHello file should exist", - localDb.getFS().exists(linkedbarfoohello)); - assertTrue("The bar/foo/LinkedHello file should be a symlink", - localDb.getFS().isSymLink(linkedbarfoohello)); - assertEquals("../baz/hello.txt", - localDb.getFS().readSymLink(linkedbarfoohello)); - - localDb.close(); + // The bar/foo/LinkedHello file should use a single relative ../ + File linkedbarfoohello = new File(localDb.getWorkTree(), + "bar/foo/LinkedHello"); + assertTrue("The bar/foo/LinkedHello file should exist", + localDb.getFS().exists(linkedbarfoohello)); + assertTrue("The bar/foo/LinkedHello file should be a symlink", + localDb.getFS().isSymLink(linkedbarfoohello)); + assertEquals("../baz/hello.txt", + localDb.getFS().readSymLink(linkedbarfoohello)); + } } } } -- 2.39.5