From 9c0cef561b6f76393d5d386ae0b004c0ed36f8b8 Mon Sep 17 00:00:00 2001
From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Thu, 6 Aug 2015 13:51:08 -0400
Subject: [PATCH] ctf: Update CtfTmfContextTest

- Dispose the trace after the test
- Remove unused array
- Avoid extra expected value due to math rounding

Change-Id: I46e8fdff95dd3e39d12b786d5efc4560b46fefe5
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/53357
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 .../core/tests/context/CtfTmfContextTest.java | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java
index 1e1bba68e1..3c879975da 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java
@@ -26,6 +26,7 @@ import org.eclipse.tracecompass.tmf.ctf.core.context.CtfTmfContext;
 import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent;
 import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace;
 import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -67,6 +68,16 @@ public class CtfTmfContextTest {
         trace.initTrace((IResource) null, path, CtfTmfEvent.class);
     }
 
+    /**
+     * Post-test clean-up.
+     */
+    @After
+    public void tearDown() {
+        if (trace != null) {
+            trace.dispose();
+        }
+    }
+
     /**
      * Index all the events in the test trace.
      */
@@ -95,9 +106,9 @@ public class CtfTmfContextTest {
         double increment = (end - begin) / lwcCount;
         final ArrayList<Long> vals = new ArrayList<>();
         final ArrayList<Thread> threads = new ArrayList<>();
-        final ArrayList<CtfTmfContext> tooManyContexts = new ArrayList<>();
 
-        for (double i = begin; i < end; i += increment) {
+        double time = begin;
+        for (int i = 0; i < lwcCount; i++) {
             SeekerThread thread = new SeekerThread() {
                 @Override
                 public void run() {
@@ -108,19 +119,19 @@ public class CtfTmfContextTest {
                         if (lwc.getCurrentEvent() != null) {
                             vals.add(lwc.getCurrentEvent().getTimestamp().getValue());
                         }
-                        tooManyContexts.add(lwc);
                     }
                 }
             };
-            thread.setVal((long) i);
+            thread.setVal((long) time);
             threads.add(thread);
             thread.start();
+            time += increment;
         }
 
         for (Thread t : threads) {
             t.join();
         }
-        assertEquals("seeks done ", lwcCount + 1, vals.size());
+        assertEquals("seeks done ", lwcCount, vals.size());
         for (long val : vals) {
             assertTrue("val >= begin, " + val + " " + begin, val >= begin);
             assertTrue("val >= end, " + val + " " + end, val <= end);
-- 
2.34.1