Switch the suite class to junit 4.

Using the annotation is one step further in phasing out junit 3.

Change-Id: I31acb311a3b5dcd28e0d8e1d1aee97aa83d3e56f
Reviewed-on: https://git.eclipse.org/r/7314
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
IP-Clean: Roland Grunberg <rgrunber@redhat.com>
Tested-by: Roland Grunberg <rgrunber@redhat.com>

1 files changed, 10 insertions, 25 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
index 0f77b38b12..1e09e3897c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,33 +7,18 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *    Alexander Kurtakov <akurtako@redhat.com> - migrate to junit 4 with annotations.
  *******************************************************************************/
 package org.eclipse.linuxtools.internal.valgrind.memcheck.tests;
 
-import org.eclipse.linuxtools.internal.valgrind.memcheck.MemcheckPlugin;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ BasicMemcheckTest.class, DoubleClickTest.class,
+		LaunchConfigTabTest.class, MarkerTest.class,
+		LinkedResourceDoubleClickTest.class, LinkedResourceMarkerTest.class,
+		MultiProcessTest.class, ExpandCollapseTest.class, ShortcutTest.class,
+		SignalTest.class, MinVersionTest.class })
 public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Tests for " + MemcheckPlugin.PLUGIN_ID); //$NON-NLS-1$
-		// $JUnit-BEGIN$
-		suite.addTestSuite(BasicMemcheckTest.class);
-		suite.addTestSuite(DoubleClickTest.class);
-		suite.addTestSuite(LaunchConfigTabTest.class);
-		suite.addTestSuite(MarkerTest.class);
-		suite.addTestSuite(LinkedResourceDoubleClickTest.class);
-		suite.addTestSuite(LinkedResourceMarkerTest.class);
-		suite.addTestSuite(MultiProcessTest.class);
-		suite.addTestSuite(ExpandCollapseTest.class);
-		suite.addTestSuite(ShortcutTest.class);
-		suite.addTestSuite(SignalTest.class);
-		suite.addTestSuite(MinVersionTest.class);
-		// $JUnit-END$
-		return suite;
-	}
-
 }