MergeGitAttributeTest: Open FileInputStream in try-with-resource
Change-Id: Iec85eea044c46a199b5b6f6bdbb3191d817dd441 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
8212924ede
commit
c2ff87e786
|
@ -313,7 +313,6 @@ public void mergeBinaryFile_NoAttr_Conflict() throws IllegalStateException,
|
|||
WrongRepositoryStateException, NoMessageException, GitAPIException {
|
||||
|
||||
RevCommit disableCheckedCommit;
|
||||
FileInputStream mergeResultFile = null;
|
||||
// Set up a git with conflict commits on images
|
||||
try (Git git = new Git(db)) {
|
||||
// First commit
|
||||
|
@ -352,15 +351,12 @@ public void mergeBinaryFile_NoAttr_Conflict() throws IllegalStateException,
|
|||
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
|
||||
|
||||
// Check that the image was not modified (no conflict marker added)
|
||||
mergeResultFile = new FileInputStream(
|
||||
try (FileInputStream mergeResultFile = new FileInputStream(
|
||||
db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
|
||||
.toFile());
|
||||
assertTrue(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
} finally {
|
||||
if (mergeResultFile != null) {
|
||||
mergeResultFile.close();
|
||||
.toFile())) {
|
||||
assertTrue(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -373,7 +369,6 @@ public void mergeBinaryFile_UnsetMerge_Conflict()
|
|||
WrongRepositoryStateException, NoMessageException, GitAPIException {
|
||||
|
||||
RevCommit disableCheckedCommit;
|
||||
FileInputStream mergeResultFile = null;
|
||||
// Set up a git whith conflict commits on images
|
||||
try (Git git = new Git(db)) {
|
||||
// First commit
|
||||
|
@ -412,14 +407,12 @@ public void mergeBinaryFile_UnsetMerge_Conflict()
|
|||
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
|
||||
|
||||
// Check that the image was not modified (not conflict marker added)
|
||||
mergeResultFile = new FileInputStream(db.getWorkTree().toPath()
|
||||
.resolve(ENABLED_CHECKED_GIF).toFile());
|
||||
assertTrue(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
} finally {
|
||||
if (mergeResultFile != null) {
|
||||
mergeResultFile.close();
|
||||
try (FileInputStream mergeResultFile = new FileInputStream(
|
||||
db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
|
||||
.toFile())) {
|
||||
assertTrue(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -432,7 +425,6 @@ public void mergeBinaryFile_SetMerge_Conflict()
|
|||
NoMessageException, GitAPIException {
|
||||
|
||||
RevCommit disableCheckedCommit;
|
||||
FileInputStream mergeResultFile = null;
|
||||
// Set up a git whith conflict commits on images
|
||||
try (Git git = new Git(db)) {
|
||||
// First commit
|
||||
|
@ -471,14 +463,12 @@ public void mergeBinaryFile_SetMerge_Conflict()
|
|||
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
|
||||
|
||||
// Check that the image was not modified (not conflict marker added)
|
||||
mergeResultFile = new FileInputStream(db.getWorkTree().toPath()
|
||||
.resolve(ENABLED_CHECKED_GIF).toFile());
|
||||
assertFalse(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
} finally {
|
||||
if (mergeResultFile != null) {
|
||||
mergeResultFile.close();
|
||||
try (FileInputStream mergeResultFile = new FileInputStream(
|
||||
db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
|
||||
.toFile())) {
|
||||
assertFalse(contentEquals(
|
||||
getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
|
||||
mergeResultFile));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue