From 28e80032cf418f7c0662ca3e35a159593fbc8844 Mon Sep 17 00:00:00 2001
From: Marc Khouzam
Date: Fri, 9 Jan 2009 16:30:10 +0000
Subject: [251185] TestClassRunner JUnit class no longer exists.  Replace it
 with BlockJUnit4ClassRunner

---
 .../org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'dsf-gdb')

diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java
index 15767dea4d3..d63cd893c5d 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java
@@ -17,15 +17,15 @@ import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.junit.internal.runners.InitializationError;
 import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
 
 /**
  * This runner starts an eclipse job ro run the tests, so as
  * to release the UI thread.
  */
-@SuppressWarnings("restriction")
-public class BackgroundRunner extends TestClassRunner {
+public class BackgroundRunner extends BlockJUnit4ClassRunner {
 
 	public BackgroundRunner(Class<?> klass) throws InitializationError {
 		super(klass);
@@ -126,7 +126,7 @@ public class BackgroundRunner extends TestClassRunner {
 		
 		// Signal the interrupt condition that we are done here
 		// and it can cleanup whatever necessary.
-		condition.dispose();
+		if (condition != null) condition.dispose();
 		
 		return isTimedOut;
 	}
-- 
cgit v1.2.1