diff options
| author | Christian Halstrick | 2011-11-29 16:35:34 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2014-11-29 01:16:05 +0000 |
| commit | c3add24ee76c654a15bb8952989c587dece9a2f4 (patch) | |
| tree | 05fa3ac97c8977d9895f7559a2a63c6afdb24eae | |
| parent | c5b568b15863919090c2c2b198e4e731b4382619 (diff) | |
| download | egit-c3add24ee76c654a15bb8952989c587dece9a2f4.tar.gz egit-c3add24ee76c654a15bb8952989c587dece9a2f4.tar.xz egit-c3add24ee76c654a15bb8952989c587dece9a2f4.zip | |
Dispose RevWalk in TagOperationTest
Change-Id: I736f6bed07c8f6ab8cce265dc1d4e86bbad9100e
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/DualRepositoryTestCase.java | 4 | ||||
| -rw-r--r-- | org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java | 31 |
2 files changed, 20 insertions, 15 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/DualRepositoryTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/DualRepositoryTestCase.java index 641f9f7fd7..8387956601 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/DualRepositoryTestCase.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/DualRepositoryTestCase.java @@ -43,8 +43,10 @@ public abstract class DualRepositoryTestCase { repository1.dispose(); if (repository2 != null) repository2.dispose(); - if (testProject != null) + if (testProject != null) { + testProject.close(null); testProject.delete(false, false, null); + } testUtils.deleteTempDirs(); } diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java index e5f633e3b1..6f515d3da3 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/TagOperationTest.java @@ -59,9 +59,8 @@ public class TagOperationTest extends DualRepositoryTestCase { public void tearDown() throws Exception { project.close(null); project.delete(false, false, null); - repository1.dispose(); - repository1 = null; - testUtils.deleteTempDirs(); + project = null; + // repositories and tempDirs are deleted in superclass } @Test @@ -96,17 +95,21 @@ public class TagOperationTest extends DualRepositoryTestCase { } Ref tagRef = repository1.getRepository().getTags().get("TheNewTag"); RevWalk walk = new RevWalk(repository1.getRepository()); - RevTag tag = walk.parseTag( - repository1.getRepository().resolve(tagRef.getName())); - - newTag.setMessage("Another message"); - assertFalse("Messages should differ", tag.getFullMessage().equals( - newTag.getMessage())); - top.execute(null); - tag = walk.parseTag( - repository1.getRepository().resolve(tagRef.getName())); - assertTrue("Messages be same", tag.getFullMessage().equals( - newTag.getMessage())); + try { + RevTag tag = walk.parseTag(repository1.getRepository().resolve( + tagRef.getName())); + + newTag.setMessage("Another message"); + assertFalse("Messages should differ", + tag.getFullMessage().equals(newTag.getMessage())); + top.execute(null); + tag = walk.parseTag(repository1.getRepository().resolve( + tagRef.getName())); + assertTrue("Messages be same", + tag.getFullMessage().equals(newTag.getMessage())); + } finally { + walk.dispose(); + } } } |