pcap: Remove AutoCloseable from PcapTrace

Change-Id: Ide58410feef5b85bbe7c2c2a274b200bf614045b
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/51543
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
index 0bc479a310c229bc8bd5e8c56a317558062fbe04..533b896a7cf330bc64e0b2190f330cad3db05dc3 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
@@ -63,14 +63,15 @@ public class StreamListAnalysisTest {
         PcapTestTrace trace = PcapTestTrace.MOSTLY_TCP;
         assumeTrue(trace.exists());
         String path = trace.getPath().toString();
-        try (PcapTrace pcapTrace = new PcapTrace();) {
-            StreamListAnalysis analysis = new StreamListAnalysis();
-            analysis.setId(StreamListAnalysis.ID);
-            pcapTrace.initTrace(null, path, null);
-            assertTrue(analysis.canExecute(pcapTrace));
+        PcapTrace pcapTrace = new PcapTrace();
+        StreamListAnalysis analysis = new StreamListAnalysis();
 
-            analysis.dispose();
-        }
+        analysis.setId(StreamListAnalysis.ID);
+        pcapTrace.initTrace(null, path, null);
+        assertTrue(analysis.canExecute(pcapTrace));
+
+        analysis.dispose();
+        pcapTrace.dispose();
     }
 
     /**
@@ -87,46 +88,46 @@ public class StreamListAnalysisTest {
         PcapTestTrace trace = PcapTestTrace.MOSTLY_TCP;
         assumeTrue(trace.exists());
         String path = trace.getPath().toString();
-        try (PcapTrace pcapTrace = new PcapTrace();) {
-            StreamListAnalysis analysis = new StreamListAnalysis();
-
-            pcapTrace.initTrace(null, path, null);
-            analysis.setId(StreamListAnalysis.ID);
-            analysis.setTrace(pcapTrace);
-            analysis.schedule();
-            analysis.waitForCompletion();
-
-            // Verify that builders are not empty.
-            TmfPacketStreamBuilder builder = analysis.getBuilder(TmfPcapProtocol.ETHERNET_II);
-            if (builder == null) {
-                fail("The PacketStreamBuilder is null!");
-                return;
-            }
-            assertEquals(1, builder.getNbStreams());
+        PcapTrace pcapTrace = new PcapTrace();
+        StreamListAnalysis analysis = new StreamListAnalysis();
 
-            builder = analysis.getBuilder(TmfPcapProtocol.IPV4);
-            if (builder == null) {
-                fail("The PacketStreamBuilder is null!");
-                return;
-            }
-            assertEquals(3, builder.getNbStreams());
+        pcapTrace.initTrace(null, path, null);
+        analysis.setId(StreamListAnalysis.ID);
+        analysis.setTrace(pcapTrace);
+        analysis.schedule();
+        analysis.waitForCompletion();
+
+        // Verify that builders are not empty.
+        TmfPacketStreamBuilder builder = analysis.getBuilder(TmfPcapProtocol.ETHERNET_II);
+        if (builder == null) {
+            fail("The PacketStreamBuilder is null!");
+            return;
+        }
+        assertEquals(1, builder.getNbStreams());
 
-            builder = analysis.getBuilder(TmfPcapProtocol.TCP);
-            if (builder == null) {
-                fail("The PacketStreamBuilder is null!");
-                return;
-            }
-            assertEquals(2, builder.getNbStreams());
+        builder = analysis.getBuilder(TmfPcapProtocol.IPV4);
+        if (builder == null) {
+            fail("The PacketStreamBuilder is null!");
+            return;
+        }
+        assertEquals(3, builder.getNbStreams());
 
-            builder = analysis.getBuilder(TmfPcapProtocol.UDP);
-            if (builder == null) {
-                fail("The PacketStreamBuilder is null!");
-                return;
-            }
-            assertEquals(1, builder.getNbStreams());
+        builder = analysis.getBuilder(TmfPcapProtocol.TCP);
+        if (builder == null) {
+            fail("The PacketStreamBuilder is null!");
+            return;
+        }
+        assertEquals(2, builder.getNbStreams());
 
-            analysis.dispose();
+        builder = analysis.getBuilder(TmfPcapProtocol.UDP);
+        if (builder == null) {
+            fail("The PacketStreamBuilder is null!");
+            return;
         }
+        assertEquals(1, builder.getNbStreams());
+
+        analysis.dispose();
+        pcapTrace.dispose();
     }
 
 }

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/event/PcapEventTest.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/event/PcapEventTest.java
index c9e80a49b3eb3ff58a656381005ea057d9273e72..2a2b3dcef3e11b4e00ab646f6877ff06bff0cd95 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/event/PcapEventTest.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/event/PcapEventTest.java
@@ -60,10 +60,11 @@ public class PcapEventTest {
 
         PcapTestTrace trace = PcapTestTrace.MOSTLY_TCP;
         assumeTrue(trace.exists());
-        try (PcapFile pcap = new PcapFile(trace.getPath());
-                PcapTrace pcapTrace = new PcapTrace();) {
+        try (PcapFile pcap = new PcapFile(trace.getPath());) {
+            PcapTrace pcapTrace = new PcapTrace();
             pcapTrace.initTrace(null, trace.getPath().toString(), PcapEvent.class);
             fEvent = pcapTrace.parseEvent(new TmfContext(new TmfLongLocation(3), 3));
+            pcapTrace.dispose();
         }
 
         // Initialize protocol list.

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/trace/PcapTraceTest.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/trace/PcapTraceTest.java
index cce04a17f984da62d5c8be43562d910f35749c02..2c897baaf83601253631e0f0921218e86e17881c 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/trace/PcapTraceTest.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core.tests/src/org/eclipse/tracecompass/tmf/pcap/core/tests/trace/PcapTraceTest.java
@@ -74,14 +74,16 @@ public class PcapTraceTest {
      */
     @Test
     public void testPcapTrace() {
-        try (PcapTrace result = new PcapTrace();) {
-            assertNotNull(result);
-            assertEquals(1000, result.getCacheSize());
-            assertEquals(0L, result.getNbEvents());
-            assertEquals(0L, result.getStreamingInterval());
-            assertNull(result.getResource());
-            assertNull(result.getType());
-        }
+        PcapTrace result = new PcapTrace();
+
+        assertNotNull(result);
+        assertEquals(1000, result.getCacheSize());
+        assertEquals(0L, result.getNbEvents());
+        assertEquals(0L, result.getStreamingInterval());
+        assertNull(result.getResource());
+        assertNull(result.getType());
+
+        result.dispose();
     }
 
     /**
@@ -104,24 +106,15 @@ public class PcapTraceTest {
         fFixture.broadcast(signal);
     }
 
-    /**
-     * Run the void dispose() method test.
-     */
-    @Test
-    public void testClose() {
-        try (PcapTrace emptyFixture = new PcapTrace();) {
-        }
-    }
-
     /**
      * Run the int getCacheSize() method test.
      */
     @Test
     public void testGetCacheSize() {
-        try (PcapTrace emptyFixture = new PcapTrace();) {
-            int result = emptyFixture.getCacheSize();
-            assertEquals(1000, result);
-        }
+        PcapTrace emptyFixture = new PcapTrace();
+        int result = emptyFixture.getCacheSize();
+        assertEquals(1000, result);
+        emptyFixture.dispose();
     }
 
     /**

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
index 42e30d995596ed1f73d6c2fa114f480f2ff884d3..25387d8bd6488b907a3648d1fe371a363bce9733 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
@@ -63,7 +63,7 @@ import com.google.common.collect.ImmutableMap;
  *
  * @author Vincent Perot
  */
-public class PcapTrace extends TmfTrace implements ITmfTraceProperties, AutoCloseable {
+public class PcapTrace extends TmfTrace implements ITmfTraceProperties {
 
     /** pcap trace type id as defined in plugin.xml */
     public static final String TRACE_TYPE_ID = "org.eclipse.linuxtools.tmf.pcap.core.pcaptrace"; //$NON-NLS-1$
@@ -265,9 +265,4 @@ public class PcapTrace extends TmfTrace implements ITmfTraceProperties, AutoClos
 
         return properties;
     }
-
-    @Override
-    public void close() {
-        dispose();
-    }
 }

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java
index 1486e32586198b8b0814ad80e0e32fbe9aa243b3..8a0d70c906985e13ee5cbcfe5eed4026bb7e1b7d 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java
@@ -229,14 +229,14 @@ public class ImportAndReadPcapTest {
     }
 
     private static ITmfEvent getEvent(int rank) {
-        try (PcapTrace trace = pttt.getTrace()) {
-            ITmfContext ctx = trace.seekEvent(0);
-            for (int i = 0; i < rank; i++) {
-                trace.getNext(ctx);
-            }
-            return trace.getNext(ctx);
+        PcapTrace trace = pttt.getTrace();
+        ITmfContext ctx = trace.seekEvent(0);
+        for (int i = 0; i < rank; i++) {
+            trace.getNext(ctx);
         }
-
+        ITmfEvent ret = trace.getNext(ctx);
+        trace.dispose();
+        return ret;
     }
 
     private static IViewPart getViewPart(final String viewTile) {