motiejus
/
jgit
1
Fork 0
Code Releases Activity

FileRepositoryBuilderTest: Don't explicitly close BufferedWriter in try-with-resource 

The BufferedWriter is opened in a try-with-resource and thus will be
automatically closed.

Presumably the close was added to make sure it is closed before the
subsequent test statements are executed. Instead of explicitly closing
it, let the try-with-resource automatically close it, and move the
subsequent statements out of the try-block.

Change-Id: If5fada2f580ef9cbaad3a0b9216b5200b917781a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-09-27 18:01:03 +09:00
parent fa61fd6f61
commit b2ee02f53b
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java
View File

@ -124,17 +124,17 @@ public void absoluteGitDirRef() throws Exception {
File dotGit = new File(dir, Constants.DOT_GIT);
try (BufferedWriter writer = Files.newBufferedWriter(dotGit.toPath(),
UTF_8)) {
writer.append("gitdir: " + repo1.getDirectory().getAbsolutePath()).close();
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.setMustExist(true);
Repository repo2 = builder.build();
assertEquals(repo1.getDirectory().getAbsolutePath(), repo2
.getDirectory().getAbsolutePath());
assertEquals(dir, repo2.getWorkTree());
writer.append("gitdir: " + repo1.getDirectory().getAbsolutePath());
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.setMustExist(true);
Repository repo2 = builder.build();
assertEquals(repo1.getDirectory().getAbsolutePath(),
repo2.getDirectory().getAbsolutePath());
assertEquals(dir, repo2.getWorkTree());
}
@Test
@ -145,19 +145,18 @@ public void relativeGitDirRef() throws Exception {
File dotGit = new File(dir, Constants.DOT_GIT);
try (BufferedWriter writer = Files.newBufferedWriter(dotGit.toPath(),
UTF_8)) {
writer.append("gitdir: ../" + Constants.DOT_GIT).close();
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.setMustExist(true);
Repository repo2 = builder.build();
// The tmp directory may be a symlink so the actual path
// may not
assertEquals(repo1.getDirectory().getCanonicalPath(), repo2
.getDirectory().getCanonicalPath());
assertEquals(dir, repo2.getWorkTree());
writer.append("gitdir: ../" + Constants.DOT_GIT);
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.setMustExist(true);
Repository repo2 = builder.build();
// The tmp directory may be a symlink so the actual path
// may not
assertEquals(repo1.getDirectory().getCanonicalPath(),
repo2.getDirectory().getCanonicalPath());
assertEquals(dir, repo2.getWorkTree());
}
@Test
@ -168,20 +167,20 @@ public void scanWithGitDirRef() throws Exception {
try (BufferedWriter writer = Files.newBufferedWriter(dotGit.toPath(),
UTF_8)) {
writer.append(
"gitdir: " + repo1.getDirectory().getAbsolutePath()).close();
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.findGitDir(dir);
assertEquals(repo1.getDirectory().getAbsolutePath(), builder
.getGitDir().getAbsolutePath());
builder.setMustExist(true);
Repository repo2 = builder.build();
// The tmp directory may be a symlink
assertEquals(repo1.getDirectory().getCanonicalPath(), repo2
.getDirectory().getCanonicalPath());
assertEquals(dir, repo2.getWorkTree());
"gitdir: " + repo1.getDirectory().getAbsolutePath());
}
FileRepositoryBuilder builder = new FileRepositoryBuilder();
builder.setWorkTree(dir);
builder.findGitDir(dir);
assertEquals(repo1.getDirectory().getAbsolutePath(),
builder.getGitDir().getAbsolutePath());
builder.setMustExist(true);
Repository repo2 = builder.build();
// The tmp directory may be a symlink
assertEquals(repo1.getDirectory().getCanonicalPath(),
repo2.getDirectory().getCanonicalPath());
assertEquals(dir, repo2.getWorkTree());
}
}