diff options
| author | David Pursehouse | 2017-03-13 02:44:11 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2017-03-16 20:13:19 +0000 |
| commit | 6b025671a8ab3dba438aa16a004ee378c1863bce (patch) | |
| tree | 0bdb5bd831c38433a4a0cd31b4b23afb06aa55ca /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview | |
| parent | 4c829541d483ea6b94d0bb40c8106fb5e3dca281 (diff) | |
| download | egit-6b025671a8ab3dba438aa16a004ee378c1863bce.tar.gz egit-6b025671a8ab3dba438aa16a004ee378c1863bce.tar.xz egit-6b025671a8ab3dba438aa16a004ee378c1863bce.zip | |
Open Git instances in try-with-resource in tests
Change-Id: I881cab412475d692f02e2d5bf76677c08fb3ac54
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview')
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java index e8155b833b..7047e0b8ec 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java @@ -108,14 +108,15 @@ public class StagingViewTest extends LocalRepositoryTestCase { @Test public void testMergeConflict() throws Exception { - Git git = new Git(repository); - git.checkout().setCreateBranch(true).setName("side").call(); - commitOneFileChange("on side"); + try (Git git = new Git(repository)) { + git.checkout().setCreateBranch(true).setName("side").call(); + commitOneFileChange("on side"); - git.checkout().setName("master").call(); - commitOneFileChange("on master"); + git.checkout().setName("master").call(); + commitOneFileChange("on master"); - git.merge().include(repository.findRef("side")).call(); + git.merge().include(repository.findRef("side")).call(); + } assertEquals(RepositoryState.MERGING, repository.getRepositoryState()); StagingViewTester stagingView = StagingViewTester |