git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@1968 92a21009-5b66-0410-b83a-dc787c41c6e9

4 files changed, 8 insertions, 8 deletions

diff --git a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchAllTests.java b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchAllTests.java
index 6195a2961..de766bd35 100644
--- a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchAllTests.java
+++ b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchAllTests.java
@@ -42,9 +42,8 @@ public class BatchAllTests extends TestSuite {
 	 * @generated NOT
 	 */
 	public static Test suite() {
-		TestSuite suite = new BatchAllTests("STEM Jobs - Simulation Tests"); //$NON-NLS-1$
-		suite.addTestSuite(BatchTest.class);
-		suite.addTestSuite(BatchManagerTest.class);
+		TestSuite suite = new BatchAllTests("STEM Jobs - Batch Tests"); //$NON-NLS-1$
+		//suite.addTestSuite(BatchManagerTest.class);
 
 		return suite;
 	}
diff --git a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchManagerTest.java b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchManagerTest.java
index 5935cf1d2..dc44acc13 100644
--- a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchManagerTest.java
+++ b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchManagerTest.java
@@ -12,7 +12,7 @@ package org.eclipse.stem.jobs.batch;
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.stem.core.experiment.tests.ExperimentTest;
 import org.junit.Before;
@@ -21,7 +21,7 @@ import org.junit.Test;
 /**
  * This class is a JUnit4 test case for the the {@link BatchManager}.
  */
-public class BatchManagerTest extends TestCase {
+public class BatchManagerTest {
 
 	// The current BatchManager under test.
 	protected BatchManager fixture;
diff --git a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchTest.java b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchTest.java
index fc9062fc6..aaec7b95f 100644
--- a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchTest.java
+++ b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/jobs/batch/BatchTest.java
@@ -12,7 +12,8 @@ package org.eclipse.stem.jobs.batch;
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -20,7 +21,7 @@ import org.junit.Test;
 /**
  * This class is a JUnit4 test case for the {@link Batch} class.
  */
-abstract public class BatchTest extends TestCase  {
+abstract public class BatchTest {
 
 	/**
 	 * An integer to be used as a sequence number for testing.
diff --git a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/tests/jobs/JobsAllTests.java b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/tests/jobs/JobsAllTests.java
index 84426e103..62d2fdbb0 100644
--- a/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/tests/jobs/JobsAllTests.java
+++ b/org.eclipse.stem.tests.jobs/src/org/eclipse/stem/tests/jobs/JobsAllTests.java
@@ -47,7 +47,7 @@ public class JobsAllTests extends TestSuite {
 	public static Test suite() {
 		TestSuite suite = new JobsAllTests("Jobs Tests"); //$NON-NLS-1$
 		suite.addTest(SimulationAllTests.suite());
-		suite.addTest(BatchAllTests.suite());
+		//suite.addTest(BatchAllTests.suite());
 
 		return suite;
 	}