github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

MergeGitAttributeTest: Open FileInputStream in try-with-resource 

Change-Id: Iec85eea044c46a199b5b6f6bdbb3191d817dd441
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
8212924ede
commit
c2ff87e786
1 changed files with 17 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java

44
org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java
Unescape View File

@ -313,7 +313,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
WrongRepositoryStateException, NoMessageException, GitAPIException { WrongRepositoryStateException, NoMessageException, GitAPIException {
RevCommit disableCheckedCommit; RevCommit disableCheckedCommit;
FileInputStream mergeResultFile = null;
// Set up a git with conflict commits on images // Set up a git with conflict commits on images
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
// First commit // First commit
@ -352,15 +351,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus()); assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
// Check that the image was not modified (no conflict marker added) // 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) db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
.toFile()); .toFile())) {
assertTrue(contentEquals( assertTrue(contentEquals(
getClass().getResourceAsStream(ENABLED_CHECKED_GIF), getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
mergeResultFile)); mergeResultFile));
} finally {
if (mergeResultFile != null) {
mergeResultFile.close();
} }
} }
} }
@ -373,7 +369,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
WrongRepositoryStateException, NoMessageException, GitAPIException { WrongRepositoryStateException, NoMessageException, GitAPIException {
RevCommit disableCheckedCommit; RevCommit disableCheckedCommit;
FileInputStream mergeResultFile = null;
// Set up a git whith conflict commits on images // Set up a git whith conflict commits on images
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
// First commit // First commit
@ -412,14 +407,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus()); assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
// Check that the image was not modified (not conflict marker added) // Check that the image was not modified (not conflict marker added)
mergeResultFile = new FileInputStream(db.getWorkTree().toPath() try (FileInputStream mergeResultFile = new FileInputStream(
.resolve(ENABLED_CHECKED_GIF).toFile()); db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
assertTrue(contentEquals( .toFile())) {
getClass().getResourceAsStream(ENABLED_CHECKED_GIF), assertTrue(contentEquals(
mergeResultFile)); getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
} finally { mergeResultFile));
if (mergeResultFile != null) {
mergeResultFile.close();
} }
} }
} }
@ -432,7 +425,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
NoMessageException, GitAPIException { NoMessageException, GitAPIException {
RevCommit disableCheckedCommit; RevCommit disableCheckedCommit;
FileInputStream mergeResultFile = null;
// Set up a git whith conflict commits on images // Set up a git whith conflict commits on images
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
// First commit // First commit
@ -471,14 +463,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus()); assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
// Check that the image was not modified (not conflict marker added) // Check that the image was not modified (not conflict marker added)
mergeResultFile = new FileInputStream(db.getWorkTree().toPath() try (FileInputStream mergeResultFile = new FileInputStream(
.resolve(ENABLED_CHECKED_GIF).toFile()); db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
assertFalse(contentEquals( .toFile())) {
getClass().getResourceAsStream(ENABLED_CHECKED_GIF), assertFalse(contentEquals(
mergeResultFile)); getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
} finally { mergeResultFile));
if (mergeResultFile != null) {
mergeResultFile.close();
} }
} }
} }

Write Preview
Loading…
Cancel
Save