Bug 335098: JUnit tests don't always use the DSF executor when they should

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java

@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.tests.dsf.gdb.framework;
 
+import java.util.concurrent.ExecutionException;
+
 import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin;
@@ -58,13 +60,31 @@ public class ServiceEventWaitor<V> {
 		fSession = session;
 		fEventTypeClass = eventClass;
 		fEvent = null;
-		fSession.addServiceEventListener(this, null);
+        Runnable runnable = new Runnable() {
+            public void run() {
+            	fSession.addServiceEventListener(ServiceEventWaitor.this, null);
+            }
+        };
+        try {
+			fSession.getExecutor().submit(runnable).get();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		} catch (ExecutionException e) {
+			e.printStackTrace();
+		}
 	}
 	
 	@Override
 	protected void finalize() throws Throwable {
 		super.finalize();
-		if (fEventTypeClass != null) fSession.removeServiceEventListener(this);
+		if (fEventTypeClass != null) {
+			Runnable runnable = new Runnable() {
+				public void run() {
+					fSession.removeServiceEventListener(ServiceEventWaitor.this);
+				}
+			};
+			fSession.getExecutor().submit(runnable).get();
+		}
 	}
 
 	/*

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java

@@ -21,6 +21,7 @@ import junit.framework.Assert;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.Query;
 import org.eclipse.cdt.dsf.concurrent.ThreadSafeAndProhibitedFromDsfExecutor;
+import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
 import org.eclipse.cdt.dsf.debug.service.IExpressions;
@@ -28,7 +29,8 @@ import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.IFormattedDataDMContext;
-import org.eclipse.cdt.dsf.debug.service.IProcesses;
+import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext;
+import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.StepType;
@@ -37,7 +39,8 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;
 import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
 import org.eclipse.cdt.dsf.mi.service.IMICommandControl;
 import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
-import org.eclipse.cdt.dsf.mi.service.MIRunControl;
+import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
+import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
 import org.eclipse.cdt.dsf.mi.service.MIStack;
 import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
 import org.eclipse.cdt.dsf.mi.service.command.events.MIRunningEvent;
@@ -59,7 +62,7 @@ import org.eclipse.core.runtime.Status;
 public class SyncUtil {
     
     private static ICommandControlService fCommandControl;
-    private static MIRunControl fRunControl;
+    private static IMIRunControl fRunControl;
     private static MIStack fStack;
     private static IExpressions fExpressions;
     private static DsfSession fSession;
@@ -67,31 +70,32 @@ public class SyncUtil {
     private static CommandFactory fCommandFactory;
 
     private static IBreakpointsTargetDMContext fBreakpointsDmc;
-	private static IProcesses fProcessesService;
+	private static IMIProcesses fProcessesService;
-    
-    public static final int WAIT_FOREVER = ServiceEventWaitor.WAIT_FOREVER;
     
     // Initialize some common things, once the session has been established
-    public static void initialize(DsfSession session) {
+    public static void initialize(DsfSession session) throws Exception {
     	fSession = session;
     	
+        Runnable runnable = new Runnable() {
+            public void run() {
 	        	DsfServicesTracker tracker = 
 	        		new DsfServicesTracker(TestsPlugin.getBundleContext(), 
 	        				fSession.getId());
 	        	
 	        	fCommandControl = tracker.getService(ICommandControlService.class);		   		
+	        	fRunControl = tracker.getService(IMIRunControl.class);
+	        	fStack = tracker.getService(MIStack.class);
+	        	fExpressions = tracker.getService(IExpressions.class);
+	        	fProcessesService = tracker.getService(IMIProcesses.class);
+	        	fCommandFactory = tracker.getService(IMICommandControl.class).getCommandFactory();
 	        	
 	        	fBreakpointsDmc = (IBreakpointsTargetDMContext)fCommandControl.getContext();
 	        	
-		fRunControl = tracker.getService(MIRunControl.class);
-		fStack = tracker.getService(MIStack.class);
-		fExpressions = tracker.getService(IExpressions.class);
-		fProcessesService = tracker.getService(IProcesses.class);
-		
-		fCommandFactory = tracker.getService(IMICommandControl.class).getCommandFactory();
-
 	        	tracker.dispose();
             }
+	    };
+	    fSession.getExecutor().submit(runnable).get();
+	}
 
 	public static MIStoppedEvent step(int numSteps, final StepType stepType) throws Throwable {
 	    MIStoppedEvent retVal = null;
@@ -429,7 +433,10 @@ public class SyncUtil {
     public static IMIExecutionDMContext createExecutionContext(final IContainerDMContext parentCtx, final int threadId) throws Throwable {
 	    Callable<IMIExecutionDMContext> callable = new Callable<IMIExecutionDMContext>() {
 	        public IMIExecutionDMContext call() throws Exception {
-	            return fRunControl.createMIExecutionContext(parentCtx, threadId);
+	        	String threadIdStr = Integer.toString(threadId);
+	        	IProcessDMContext processDmc = DMContexts.getAncestorOfType(parentCtx, IProcessDMContext.class);
+	        	IThreadDMContext threadDmc = fProcessesService.createThreadContext(processDmc, threadIdStr);
+	            return fProcessesService.createExecutionContext(parentCtx, threadDmc, threadIdStr);
 	        }
 	    };
 	    return fSession.getExecutor().submit(callable).get();

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java

@@ -65,12 +65,14 @@ public class GDBProcessesTest extends BaseTestCase {
 	@Before
 	public void init() throws Exception {
 	    fSession = getGDBLaunch().getSession();
+        Runnable runnable = new Runnable() {
+            public void run() {
             	fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
-        /*
-         *  Get the GDBProcesses & MIRunControl service.
-         */
             	fProcService = fServicesTracker.getService(IMIProcesses.class);
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+	}
 
 	@After
 	public void tearDown() {

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java

@@ -96,6 +96,7 @@ public class MIBreakpointsTest extends BaseTestCase {
     protected DsfServicesTracker  fServicesTracker;
     protected MIRunControl        fRunControl;
     protected IBreakpoints        fBreakpointService;
+    protected IExpressions        fExpressionService;
 
     // Event Management
     protected static Boolean lock = true;
@@ -176,10 +177,12 @@ public class MIBreakpointsTest extends BaseTestCase {
     }
 
     @Before
-    public void testCaseInitialization() {
+    public void testCaseInitialization() throws Exception {
 
         // Get a reference to the breakpoint service
         fSession = getGDBLaunch().getSession();
+        Runnable runnable = new Runnable() {
+            public void run() {
                 fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
                 assert(fServicesTracker != null);
 
@@ -193,17 +196,28 @@ public class MIBreakpointsTest extends BaseTestCase {
                 fBreakpointService = fServicesTracker.getService(IBreakpoints.class);
                 assert(fBreakpointService != null);
 
+                fExpressionService = fServicesTracker.getService(IExpressions.class);
+                assert(fExpressionService != null);
+
                 // Register to breakpoint events
                 fRunControl.getSession().addServiceEventListener(MIBreakpointsTest.this, null);
 
                 clearEventCounters();
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+    }
 
     @After
-    public void testCaseCleanup() {
+    public void testCaseCleanup() throws Exception {
 
 		// Clear the references (not strictly necessary)
+        Runnable runnable = new Runnable() {
+            public void run() {
             	fRunControl.getSession().removeServiceEventListener(MIBreakpointsTest.this);
+            }
+        };
+        fSession.getExecutor().submit(runnable).get();
         fBreakpointService = null;
         fRunControl = null;
         fServicesTracker.dispose();
@@ -361,9 +375,6 @@ public class MIBreakpointsTest extends BaseTestCase {
      */
     private BigInteger evaluateExpression(IDMContext ctx, String expression) throws Throwable {
 
-        final IExpressions fExpressionService = fServicesTracker.getService(IExpressions.class);
-        assert (fExpressionService != null);
-
         // Get a stack context (temporary - should be an MIcontainerDMC)
 		final IExpressionDMContext expressionDMC = SyncUtil.createExpression(ctx, expression);
 		final FormattedValueDMContext formattedValueDMC = SyncUtil.getFormattedValue(fExpressionService,

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java

@@ -99,6 +99,7 @@ public class MICatchpointsTest extends BaseTestCase {
     private DsfServicesTracker  fServicesTracker;
     private MIRunControl        fRunControl;
     private IBreakpoints        fBreakpointService;
+    private IExpressions        fExpressionService;
     
     // Event Management
     private static Boolean fEventHandlerLock = true;
@@ -157,10 +158,12 @@ public class MICatchpointsTest extends BaseTestCase {
     }
 
     @Before
-    public void testCaseInitialization() {
+    public void testCaseInitialization() throws Exception {
 
         // Get a reference to the breakpoint service
         fSession = getGDBLaunch().getSession();
+        Runnable runnable = new Runnable() {
+            public void run() {
                 fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
                 assertNotNull(fServicesTracker);
 
@@ -174,17 +177,29 @@ public class MICatchpointsTest extends BaseTestCase {
                 fBreakpointService = fServicesTracker.getService(IBreakpoints.class);
                 assertNotNull(fBreakpointService);
 
+                fExpressionService = fServicesTracker.getService(IExpressions.class);
+                assertNotNull(fExpressionService);
+
+
                 // Register to receive breakpoint events
                 fRunControl.getSession().addServiceEventListener(MICatchpointsTest.this, null);
 
                 clearEventCounters();
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+    }
 
     @After
-    public void testCaseCleanup() {
+    public void testCaseCleanup() throws Exception {
+        Runnable runnable = new Runnable() {
+            public void run() {
+            	fRunControl.getSession().removeServiceEventListener(MICatchpointsTest.this);
+            }
+        };
+        fSession.getExecutor().submit(runnable).get();
 
 		// Clear the references (not strictly necessary)
-        fRunControl.getSession().removeServiceEventListener(MICatchpointsTest.this);
         fBreakpointService = null;
         fRunControl = null;
         fServicesTracker.dispose();
@@ -316,9 +331,6 @@ public class MICatchpointsTest extends BaseTestCase {
      */
     private BigInteger evaluateExpression(IDMContext ctx, String expression) throws Throwable {
 
-        final IExpressions fExpressionService = fServicesTracker.getService(IExpressions.class);
-        assert (fExpressionService != null);
-
         // Get a stack context (temporary - should be an MIcontainerDMC)
 		final IExpressionDMContext expressionDMC = SyncUtil.createExpression(ctx, expression);
 		final FormattedValueDMContext formattedValueDMC = SyncUtil.getFormattedValue(fExpressionService,

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java

@@ -19,14 +19,14 @@ import java.math.BigInteger;
 import org.eclipse.cdt.core.IAddress;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.cdt.dsf.debug.service.IExpressions;
-import org.eclipse.cdt.dsf.debug.service.IFormattedValues;
-import org.eclipse.cdt.dsf.debug.service.IInstruction;
-import org.eclipse.cdt.dsf.debug.service.IMixedInstruction;
 import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext;
+import org.eclipse.cdt.dsf.debug.service.IExpressions;
 import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext;
+import org.eclipse.cdt.dsf.debug.service.IFormattedValues;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMData;
+import org.eclipse.cdt.dsf.debug.service.IInstruction;
+import org.eclipse.cdt.dsf.debug.service.IMixedInstruction;
 import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext;
 import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;
 import org.eclipse.cdt.dsf.mi.service.MIDisassembly;
@@ -88,9 +88,10 @@ public class MIDisassemblyTest extends BaseTestCase {
     }
 
     @Before
-    public void testCaseInitialization() {
+    public void testCaseInitialization() throws Exception {
         fSession = getGDBLaunch().getSession();
-
+        Runnable runnable = new Runnable() {
+            public void run() {
                // Get a reference to the memory service
                 fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
                 assert(fServicesTracker != null);
@@ -104,14 +105,13 @@ public class MIDisassemblyTest extends BaseTestCase {
 
                 fExpressionService = fServicesTracker.getService(IExpressions.class);
                 assert(fExpressionService != null);
-
+            }
-//        fSession.addServiceEventListener(MIDisassemblyTest.this, null);
+        };
+        fSession.getExecutor().submit(runnable).get();
     }
 
     @After
     public void testCaseCleanup() {
-        // Clear the references (not strictly necessary)
-//        fSession.removeServiceEventListener(MIDisassemblyTest.this);
         fExpressionService = null;
         fDisassembly = null;
         fServicesTracker.dispose();

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java

@@ -77,18 +77,28 @@ public class MIExpressionsTest extends BaseTestCase {
     }
 
     @Before
-    public void init() {
+    public void init() throws Exception {
         fSession = getGDBLaunch().getSession();
+        Runnable runnable = new Runnable() {
+            public void run() {
            	fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
             	
             	fExpService = fServicesTracker.getService(IExpressions.class);
-        fSession.addServiceEventListener(this, null);
+            	fSession.addServiceEventListener(MIExpressionsTest.this, null);
             	clearExprChangedData();
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+    }
 
     @After
-    public void shutdown() {
+    public void shutdown() throws Exception {
-        fSession.removeServiceEventListener(this);
+        Runnable runnable = new Runnable() {
+            public void run() {
+            	fSession.removeServiceEventListener(MIExpressionsTest.this);
+            }
+        };
+        fSession.getExecutor().submit(runnable).get();
         fExpService = null;
         fServicesTracker.dispose();
     }

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java

@@ -94,14 +94,15 @@ public class MIMemoryTest extends BaseTestCase {
 	@Before
 	public void testCaseInitialization() throws Throwable {
 	    fSession = getGDBLaunch().getSession();
+	    fMemoryDmc = (IMemoryDMContext)SyncUtil.getContainerContext();
+	    assert(fMemoryDmc != null);
 
+	    Runnable runnable = new Runnable() {
+            public void run() {
        	    // Get a reference to the memory service
         		fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
         		assert(fServicesTracker != null);
 
-   		fMemoryDmc = (IMemoryDMContext)SyncUtil.getContainerContext();
-        assert(fMemoryDmc != null);
-		    
         		fRunControl = fServicesTracker.getService(MIRunControl.class);
         		assert(fRunControl != null);
 
@@ -115,12 +116,21 @@ public class MIMemoryTest extends BaseTestCase {
         		fBaseAddress = null;
         		clearEventCounters();
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+	}
 
 	@After
-	public void testCaseCleanup() {
+	public void testCaseCleanup() throws Exception {
 		// Clear the references (not strictly necessary)
-		fBaseAddress = null;
+        Runnable runnable = new Runnable() {
+            public void run() {
             	fSession.removeServiceEventListener(MIMemoryTest.this);
+            }
+        };
+        fSession.getExecutor().submit(runnable).get();
+        
+        fBaseAddress = null;
 		fExpressionService = null;
 		fMemoryService = null;
 		fRunControl = null;

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java

@@ -11,8 +11,8 @@
 package org.eclipse.cdt.tests.dsf.gdb.tests;
 
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -28,10 +28,10 @@ import org.eclipse.cdt.dsf.datamodel.CompositeDMContext;
 import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues;
-import org.eclipse.cdt.dsf.debug.service.IRegisters;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMData;
 import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext;
+import org.eclipse.cdt.dsf.debug.service.IRegisters;
 import org.eclipse.cdt.dsf.debug.service.IRegisters.IRegisterDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRegisters.IRegisterDMData;
 import org.eclipse.cdt.dsf.debug.service.IRegisters.IRegisterGroupDMContext;
@@ -95,6 +95,9 @@ public class MIRegistersTest extends BaseTestCase {
 	@Before
 	public void init() throws Exception {
 	    fSession = getGDBLaunch().getSession();
+	    
+        Runnable runnable = new Runnable() {
+            public void run() {
 	    		// We obtain the services we need after the new
 	    		// launch has been performed
 	    		fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
@@ -104,10 +107,12 @@ public class MIRegistersTest extends BaseTestCase {
 	       		IProcessDMContext procDmc = procService.createProcessContext(commandControl.getContext(), MIProcesses.UNIQUE_GROUP_ID);
 	       		fContainerDmc = procService.createContainerContext(procDmc, MIProcesses.UNIQUE_GROUP_ID);
 	    		
-		
 	    		fRegService = fServicesTracker.getService(IRegisters.class);
 	    		fRunControl = fServicesTracker.getService(IRunControl.class);
             }
+	    };
+	    fSession.getExecutor().submit(runnable).get();
+	}
 	
 	@BeforeClass
 	public static void beforeClassMethod() {

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java

@@ -43,6 +43,7 @@ import org.eclipse.cdt.dsf.mi.service.MIRunControl;
 import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent;
 import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
 import org.eclipse.cdt.dsf.service.DsfServicesTracker;
+import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.cdt.tests.dsf.gdb.framework.AsyncCompletionWaitor;
 import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;
 import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase;
@@ -99,9 +100,13 @@ public class MIRunControlTest extends BaseTestCase {
 	
 	@Before
 	public void init() throws Exception {
+		final DsfSession session = getGDBLaunch().getSession();
+		
+        Runnable runnable = new Runnable() {
+            public void run() {
            	fServicesTracker = 
             		new DsfServicesTracker(TestsPlugin.getBundleContext(), 
-                     			   getGDBLaunch().getSession().getId());
+            				session.getId());
             	fGDBCtrl = fServicesTracker.getService(IGDBControl.class);
             	
             	IMIProcesses procService = fServicesTracker.getService(IMIProcesses.class);
@@ -112,6 +117,9 @@ public class MIRunControlTest extends BaseTestCase {
             	
             	fRunCtrl = fServicesTracker.getService(IMIRunControl.class);
             }
+        };
+        session.getExecutor().submit(runnable).get();
+	}
 
 
 	@After

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java

@@ -119,8 +119,10 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase {
 //	}
 
 	 @Before
-	 public void initialTest() throws Throwable {
+	 public void initialTest() throws Exception {
 		fSession = getGDBLaunch().getSession();
+        Runnable runnable = new Runnable() {
+            public void run() {
         		fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId());
 
         		ICommandControlService commandControl = fServicesTracker.getService(ICommandControlService.class);
@@ -131,7 +133,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase {
                 
         		fBreakpointService = fServicesTracker.getService(IBreakpoints.class);
 //        		fTraceService = fServicesTracker.getService(ITraceControl.class);
-		fSession.addServiceEventListener(this, null);
+        		fSession.addServiceEventListener(GDBRemoteTracepointsTest_7_0.this, null);
         		
         		// Create a large array to make sure we don't run out
         		fTracepoints = new IBreakpointDMContext[100];
@@ -139,10 +141,18 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase {
         		// Run an initial test to check that everything is ok with GDB
         		checkTraceInitialStatus();
             }
+        };
+        fSession.getExecutor().submit(runnable).get();
+	}
 	
 	@After
-	public void shutdown() {
+	public void shutdown() throws Exception {
-		fSession.removeServiceEventListener(this);
+        Runnable runnable = new Runnable() {
+            public void run() {
+            	fSession.removeServiceEventListener(GDBRemoteTracepointsTest_7_0.this);
+            }
+        };
+        fSession.getExecutor().submit(runnable).get();
 		fBreakpointService = null;
 		fServicesTracker.dispose();
 	}
@@ -604,7 +614,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase {
 	 * by the @Before method; this allows to verify every launch of GDB. 
 	 */
 	@Test
-	public void checkTraceInitialStatus() throws Throwable {
+	public void checkTraceInitialStatus() {
 //		checkTraceStatus(true, false, 0);
 	}