]> source.dussan.org Git - jgit.git/commitdiff
RepoCommandSymlinkTest#testLinkFileBare: Use try-with-resource 85/119385/4
authorDavid Pursehouse <david.pursehouse@gmail.com>
Wed, 14 Mar 2018 04:35:50 +0000 (13:35 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Thu, 15 Mar 2018 01:28:14 +0000 (10:28 +0900)
Change-Id: I72756d92dc5ea54ad009dddb9cebbcd6d1a0b4f8
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java

index 341cc4f21572a6368026c04decfa521d2329ba6c..548b9033bc0ac05003020944cd8d8d162c1fa61b 100644 (file)
@@ -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));
+                       }
                }
        }
 }