diff options
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit')
3 files changed, 10 insertions, 11 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java index d701d66242..9a984b58d2 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java @@ -23,9 +23,9 @@ import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.ArrayList; import org.eclipse.core.resources.IFile; @@ -138,17 +138,16 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase { test.create(new ByteArrayInputStream(new byte[0]), false, null); File testFile = new File(test.getLocation().toString()); assertTrue(testFile.exists()); - FileInputStream fis = new FileInputStream(testFile); - try { + try (InputStream fis = Files.newInputStream(testFile.toPath())) { FileUtils.delete(testFile); return; } catch (IOException e) { // the test makes sense only if deletion of // a file with open stream fails } finally { - fis.close(); - if (testFile.exists()) + if (testFile.exists()) { FileUtils.delete(testFile); + } } final Image folderImage = PlatformUI.getWorkbench().getSharedImages() .getImage(ISharedImages.IMG_OBJ_FOLDER); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java index cb5fe6f141..990baf6116 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java @@ -29,8 +29,8 @@ import static org.junit.Assert.assertTrue; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.OutputStreamWriter; +import java.nio.file.Files; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -257,7 +257,7 @@ public class SynchronizeViewGitChangeSetModelTest extends File root = new File(getTestDirectory(), REPO1); File nonWorkspace = new File(root, name); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(nonWorkspace), "UTF-8")); + Files.newOutputStream(nonWorkspace.toPath()), "UTF-8")); writer.append("file content"); writer.close(); @@ -283,7 +283,7 @@ public class SynchronizeViewGitChangeSetModelTest extends File root = new File(getTestDirectory(), REPO1); File nonWorkspace = new File(root, name); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(nonWorkspace), "UTF-8")); + Files.newOutputStream(nonWorkspace.toPath()), "UTF-8")); writer.append(content); writer.close(); // TODO Synchronize currently shows "No changes" when the only thing that has diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewWorkspaceModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewWorkspaceModelTest.java index 2449d28fac..0d247919a5 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewWorkspaceModelTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewWorkspaceModelTest.java @@ -27,8 +27,8 @@ import static org.junit.Assert.assertTrue; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.OutputStreamWriter; +import java.nio.file.Files; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -297,7 +297,7 @@ public class SynchronizeViewWorkspaceModelTest extends AbstractSynchronizeViewTe File root = new File(getTestDirectory(), REPO1); File nonWorkspace = new File(root, name); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(nonWorkspace), "UTF-8")); + Files.newOutputStream(nonWorkspace.toPath()), "UTF-8")); writer.append("file content"); writer.close(); @@ -320,7 +320,7 @@ public class SynchronizeViewWorkspaceModelTest extends AbstractSynchronizeViewTe File root = new File(getTestDirectory(), REPO1); File nonWorkspace = new File(root, name); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(nonWorkspace), "UTF-8")); + Files.newOutputStream(nonWorkspace.toPath()), "UTF-8")); writer.append(content); writer.close(); |