TMF: Fix concurrency issue in TMF scheduler tests

Change-Id: I4b360b8d1e5e064e0a9470ed8f450f52b969d189
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/17971
Tested-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
IP-Clean: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

1 files changed, 13 insertions, 7 deletions

diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
index 291fca6de3..31cb73c565 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java
@@ -12,11 +12,13 @@
 
 package org.eclipse.linuxtools.tmf.core.tests.request;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -59,7 +61,7 @@ public class TmfSchedulerTest {
     private long fEndTime;
     private TmfTimeRange fForegroundTimeRange;
 
-    private final List<String> fOrderList = Collections.synchronizedList(new ArrayList<String>());
+    private final List<String> fOrderList = new ArrayList<String>();
     private int fForegroundId = 0;
     private int fBackgroundId = 0;
 
@@ -391,8 +393,10 @@ public class TmfSchedulerTest {
         @Override
         public void handleData(final ITmfEvent event) {
             super.handleData(event);
-            if (fOrderList.isEmpty() || !fOrderList.get(fOrderList.size() - 1).equals(backgroundName)) {
-                fOrderList.add(backgroundName);
+            synchronized (fOrderList) {
+                if (fOrderList.isEmpty() || !fOrderList.get(fOrderList.size() - 1).equals(backgroundName)) {
+                    fOrderList.add(backgroundName);
+                }
             }
             ++nbEvents;
         }
@@ -418,8 +422,10 @@ public class TmfSchedulerTest {
         @Override
         public void handleData(final ITmfEvent event) {
             super.handleData(event);
-            if (fOrderList.isEmpty() || !fOrderList.get(fOrderList.size() - 1).equals(foregroundName)) {
-                fOrderList.add(foregroundName);
+            synchronized (fOrderList) {
+                if (fOrderList.isEmpty() || !fOrderList.get(fOrderList.size() - 1).equals(foregroundName)) {
+                    fOrderList.add(foregroundName);
+                }
             }
             ++nbEvents;
         }