tmf: Fix missing dispose of traces in TmfTraceTest and TmfExperimentTest

Change-Id: Iaae97ccb2b953327c35a651dc86b654a87a5de7e
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/61351
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfExperimentTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfExperimentTest.java
index e3f70bd2fce744225c7d27c31975475116ae97b4..87b48e6b7ce1538434f763f47693660c1ff42fe3 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfExperimentTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfExperimentTest.java
@@ -29,6 +29,7 @@ import java.util.Vector;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.tracecompass.internal.tmf.core.component.TmfProviderManager;
 import org.eclipse.tracecompass.internal.tmf.core.trace.experiment.TmfExperimentContext;
 import org.eclipse.tracecompass.internal.tmf.core.trace.experiment.TmfExperimentLocation;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
@@ -51,6 +52,7 @@ import org.eclipse.tracecompass.tmf.core.trace.location.TmfLongLocation;
 import org.eclipse.tracecompass.tmf.tests.stubs.analysis.TestExperimentAnalysis;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfExperimentStub;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfTraceStub;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -111,6 +113,14 @@ public class TmfExperimentTest {
         setupExperiment();
     }
 
+    @After
+    public void tearDown() {
+        if (fExperiment != null) {
+            fExperiment.dispose();
+        }
+        assertEquals(0, TmfProviderManager.getProviders(ITmfEvent.class).length);
+    }
+
     // ------------------------------------------------------------------------
     // Constructor
     // ------------------------------------------------------------------------
@@ -170,6 +180,8 @@ public class TmfExperimentTest {
         final TmfTimeRange timeRange = fExperiment.getTimeRange();
         assertEquals("getStartTime", 1, timeRange.getStartTime().getValue());
         assertEquals("getEndTime", NB_EVENTS, timeRange.getEndTime().getValue());
+
+        experiment.dispose();
     }
 
     // ------------------------------------------------------------------------

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
index 10a5811380c45e9cc2e5eff624b04e87577a0ccf..53745b17b9d000c6a8d977f5ee8b4f8b0fab2a3d 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
@@ -105,6 +105,7 @@ public class TmfTraceTest {
     public void tearDown() {
         fTrace.dispose();
         fTrace = null;
+        assertEquals(0, TmfProviderManager.getProviders(ITmfEvent.class).length);
     }
 
     // ------------------------------------------------------------------------
@@ -132,6 +133,7 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -161,6 +163,7 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -190,6 +193,8 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            original.dispose();
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -251,6 +256,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   Long.MIN_VALUE, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   Long.MIN_VALUE, trace.getStartTime().getValue());
         assertEquals("getEndTime",     Long.MIN_VALUE, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     @Test
@@ -279,6 +286,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   Long.MIN_VALUE, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   Long.MIN_VALUE, trace.getStartTime().getValue());
         assertEquals("getEndTime",     Long.MIN_VALUE, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     @Test
@@ -326,6 +335,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   NB_EVENTS, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   1,         trace.getStartTime().getValue());
         assertEquals("getEndTime",     NB_EVENTS, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     // ------------------------------------------------------------------------
@@ -1378,6 +1389,7 @@ public class TmfTraceTest {
             TmfTimestamp initRange = new TmfTimestamp(5, ITmfTimestamp.MILLISECOND_SCALE);
             assertEquals("getInitialRangeOffset", initRange, trace.getInitialRangeOffset());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {