Convert api.tools.tests ScannerTest to JUnit 4.x

These tests were using OrderedTestSuite but I think this is no longer
needed so dropped that too.
In case of issue we can use JUnit 4.x MethodSorters.

Change-Id: I44c905b35f25a7052a2d8cc4e737d2bbcb43b2b2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

3 files changed, 43 insertions, 113 deletions

diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
index 505fc77586..b602cc0348 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ClassFileScannerTests.java
@@ -13,15 +13,16 @@
  *******************************************************************************/
 package org.eclipse.pde.api.tools.model.tests;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.pde.api.tools.internal.provisional.builder.IReference;
-import org.eclipse.test.OrderedTestSuite;
-
-import junit.framework.Test;
+import org.junit.AfterClass;
+import org.junit.Test;
 
 /**
  * This class tests the class file scanner and the class file visitor
@@ -33,70 +34,21 @@ public class ClassFileScannerTests extends ScannerTest {
 	private static IPath WORKSPACE_ROOT = TestSuiteHelper.getPluginDirectoryPath().append("test_classes_workspace"); //$NON-NLS-1$
 	private static IPath ROOT_PATH = TestSuiteHelper.getPluginDirectoryPath().append("test-source").append("classes"); //$NON-NLS-1$ //$NON-NLS-2$;
 
-	/**
-	 * The ordered {@link Test} suite to run
-	 *
-	 * @return the {@link Test} suite
-	 */
-	public static Test suite() {
-		return new OrderedTestSuite(ClassFileScannerTests.class, new String[] { "testScanEmptyClass", //$NON-NLS-1$
-				"testScanEmptyGenericClass", //$NON-NLS-1$
-				"testScanInnerClass", //$NON-NLS-1$
-				"testScanInnerStaticClass", //$NON-NLS-1$
-				"testScanInnerStaticInnerClass", //$NON-NLS-1$
-				"testScanOuterClass", //$NON-NLS-1$
-				"testScanInnerOuterClass", //$NON-NLS-1$
-				"testScanInnerGenericClass", //$NON-NLS-1$
-				"testScanInnerStaticInnerGenericClass", //$NON-NLS-1$
-				"testScanClassExtendsImplements", //$NON-NLS-1$
-				"testScanGenericClassExtendsImplements", //$NON-NLS-1$
-				"testScanMethodDecl", //$NON-NLS-1$
-				"testScanMethodDeclArrayTypes", //$NON-NLS-1$
-				"testScanMethodDeclGenerics", //$NON-NLS-1$
-				"testScanFieldDecl", //$NON-NLS-1$
-				"testScanLocalVariableArrays", //$NON-NLS-1$
-				"testScanConstantPoolAccess", //$NON-NLS-1$
-				"testScanConstantPoolAccess1_4", //$NON-NLS-1$
-				"testScanMethodCalls", //$NON-NLS-1$
-				"testCleanup", //$NON-NLS-1$
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getWorkspaceRoot()
-	 */
 	@Override
 	protected IPath getWorkspaceRoot() {
 		return WORKSPACE_ROOT;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getPackageName()
-	 */
 	@Override
 	protected String getPackageName() {
 		return "classes"; //$NON-NLS-1$
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getSourcePath()
-	 */
 	@Override
 	protected IPath getSourcePath() {
 		return ROOT_PATH;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#doCompile()
-	 */
 	@Override
 	protected boolean doCompile() {
 		boolean result = true;
@@ -112,6 +64,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Tests scanning a simple class file that extends nothing, implements
 	 * nothing and has no members
 	 */
+	@Test
 	public void testScanEmptyClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test1"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test1", null, "java.lang.Object", null, IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -124,6 +77,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Test scanning a simple generic class file that extends nothing,
 	 * implements nothing and has no members
 	 */
+	@Test
 	public void testScanEmptyGenericClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test2"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test2", null, "java.lang.Object", null, IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -137,6 +91,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an empty inner class
 	 */
+	@Test
 	public void testScanInnerClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test3$Inner"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test3$Inner", null, "java.lang.Object", null, IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -149,6 +104,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning a empty static inner class
 	 */
+	@Test
 	public void testScanInnerStaticClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test3$Inner2"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test3$Inner2", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -161,6 +117,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an empty inner class of an empty inner static class
 	 */
+	@Test
 	public void testScanInnerStaticInnerClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test3$Inner2$Inner3"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test3$Inner2$Inner3", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -173,6 +130,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an empty outer class
 	 */
+	@Test
 	public void testScanOuterClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test3Outer"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test3Outer", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -185,6 +143,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an empty class of the inner class of an outer class
 	 */
+	@Test
 	public void testScanInnerOuterClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test3Outer$Inner"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test3Outer$Inner", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -197,6 +156,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an inner static generic type
 	 */
+	@Test
 	public void testScanInnerGenericClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test4$Inner"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test4$Inner", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -212,6 +172,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests scanning an inner class of a static class of a generic type
 	 */
+	@Test
 	public void testScanInnerStaticInnerGenericClass() throws CoreException {
 		List<IReference> refs = getRefSet("Test4$Inner$Inner2"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test4$Inner$Inner2", "java.lang.Object", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -228,6 +189,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Tests scanning a non-generic class that extends something and implements
 	 * interfaces
 	 */
+	@Test
 	public void testScanClassExtendsImplements() throws CoreException {
 		List<IReference> refs = getRefSet("Test5"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test5", "java.util.ArrayList", IReference.REF_EXTENDS, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -245,6 +207,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Tests scanning a generic class that extends something and implements
 	 * interfaces
 	 */
+	@Test
 	public void testScanGenericClassExtendsImplements() throws CoreException {
 		List<IReference> refs = getRefSet("Test6"); //$NON-NLS-1$
 		IReference ref = findReference("classes.Test6", "classes.Test6Abstract", IReference.REF_CONSTRUCTORMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -270,6 +233,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests a variety of method declarations
 	 */
+	@Test
 	public void testScanMethodDecl() throws CoreException {
 		List<IReference> refs = getRefSet("Test7"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test7", "m1", "java.lang.String", null, IReference.REF_RETURNTYPE, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -302,6 +266,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests a variety of method declarations with array types in them
 	 */
+	@Test
 	public void testScanMethodDeclArrayTypes() throws CoreException {
 		List<IReference> refs = getRefSet("Test7"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test7", "m4", "java.lang.Integer", null, IReference.REF_RETURNTYPE, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -333,6 +298,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests a variety of method declarations with generic types
 	 */
+	@Test
 	public void testScanMethodDeclGenerics() throws CoreException {
 		List<IReference> refs = getRefSet("Test8"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test8", "m1", "java.util.ArrayList", null, IReference.REF_RETURNTYPE, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -365,6 +331,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests a variety of field declarations
 	 */
+	@Test
 	public void testScanFieldDecl() throws CoreException {
 		List<IReference> refs = getRefSet("Test9"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test9", "strs", "java.lang.String", null, IReference.REF_FIELDDECL, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -382,6 +349,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Tests a variety of arrays that have been declared as local variables in
 	 * methods
 	 */
+	@Test
 	public void testScanLocalVariableArrays() throws CoreException {
 		List<IReference> refs = getRefSet("Test10"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test10", null, "java.lang.String", null, IReference.REF_ARRAYALLOC, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -398,6 +366,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * Tests a variety of LDC ops that load things like Integer.class onto the
 	 * stack
 	 */
+	@Test
 	public void testScanConstantPoolAccess() throws CoreException {
 		List<IReference> refs = getRefSet("Test11"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test11", null, "java.lang.Integer", null, IReference.REF_CONSTANTPOOL, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -413,6 +382,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	 * stack. This method uses a 1.4 code level class, and checks that the LDC
 	 * ref is actually processed via a Class.forName static method call
 	 */
+	@Test
 	public void testScanConstantPoolAccess1_4() throws CoreException {
 		List<IReference> refs = getRefSet("Test12"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test12", null, "java.lang.Integer", null, IReference.REF_CONSTANTPOOL, refs); //$NON-NLS-1$ //$NON-NLS-2$
@@ -426,6 +396,7 @@ public class ClassFileScannerTests extends ScannerTest {
 	/**
 	 * Tests a variety of method calls
 	 */
+	@Test
 	public void testScanMethodCalls() throws CoreException {
 		List<IReference> refs = getRefSet("Test13"); //$NON-NLS-1$
 		IReference ref = findMemberReference("classes.Test13", "m1", "classes.Test13", "m2", IReference.REF_VIRTUALMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -443,7 +414,8 @@ public class ClassFileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
-	public void testCleanup() throws Exception {
+	@AfterClass
+	public static void testCleanup() throws Exception {
 		cleanUp();
 		// remove workspace root
 		assertTrue(TestSuiteHelper.delete(new File(WORKSPACE_ROOT.toOSString())));
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/Java8ClassfileScannerTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/Java8ClassfileScannerTests.java
index 34dcbad362..c1d72cc9a5 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/Java8ClassfileScannerTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/Java8ClassfileScannerTests.java
@@ -13,14 +13,15 @@
  *******************************************************************************/
 package org.eclipse.pde.api.tools.model.tests;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.List;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.pde.api.tools.internal.provisional.builder.IReference;
-import org.eclipse.test.OrderedTestSuite;
-
-import junit.framework.Test;
+import org.junit.AfterClass;
+import org.junit.Test;
 
 /**
  * Tests reading JJava 8 classfiles and extracting specific references
@@ -32,55 +33,21 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	private static IPath WORKSPACE_ROOT = TestSuiteHelper.getPluginDirectoryPath().append("test_classes_workspace_java8"); //$NON-NLS-1$
 	private static IPath ROOT_PATH = TestSuiteHelper.getPluginDirectoryPath().append("test-source").append("invokedynamic"); //$NON-NLS-1$ //$NON-NLS-2$
 
-	/**
-	 * Returns the {@link Test} suite to run
-	 *
-	 * @return the {@link Test} suite
-	 */
-	public static Test suite() {
-		return new OrderedTestSuite(Java8ClassfileScannerTests.class, new String[] { "testStaticMethodRef", //$NON-NLS-1$
-				"testInstanceMethodRef", //$NON-NLS-1$
-				"testArbitraryObjectMethodRef", //$NON-NLS-1$
-				"testConstructorMethodRef", //$NON-NLS-1$
-				"testCleanup" //$NON-NLS-1$
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getWorkspaceRoot()
-	 */
 	@Override
 	protected IPath getWorkspaceRoot() {
 		return WORKSPACE_ROOT;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getSourcePath()
-	 */
 	@Override
 	protected IPath getSourcePath() {
 		return ROOT_PATH;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#getPackageName()
-	 */
 	@Override
 	protected String getPackageName() {
 		return "invokedynamic"; //$NON-NLS-1$
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.api.tools.model.tests.ScannerTest#doCompile()
-	 */
 	@Override
 	protected boolean doCompile() {
 		boolean result = true;
@@ -95,6 +62,7 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
+	@Test
 	public void testStaticMethodRef() throws Exception {
 		List<IReference> refs = getRefSet("test1"); //$NON-NLS-1$
 		IReference ref = findMemberReference("invokedynamic.test1", "m1", "invokedynamic.test1$MR", "mrCompare", IReference.REF_VIRTUALMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -106,6 +74,7 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
+	@Test
 	public void testInstanceMethodRef() throws Exception {
 		List<IReference> refs = getRefSet("test2"); //$NON-NLS-1$
 		IReference ref = findMemberReference("invokedynamic.test2", "m1", "invokedynamic.test2$MR", "mrCompare", IReference.REF_VIRTUALMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -118,6 +87,7 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
+	@Test
 	public void testArbitraryObjectMethodRef() throws Exception {
 		List<IReference> refs = getRefSet("test3"); //$NON-NLS-1$
 		IReference ref = findMemberReference("invokedynamic.test3", "m1", "java.lang.String", "compareToIgnoreCase", IReference.REF_VIRTUALMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -129,6 +99,7 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
+	@Test
 	public void testConstructorMethodRef() throws Exception {
 		List<IReference> refs = getRefSet("test4"); //$NON-NLS-1$
 		IReference ref = findMemberReference("invokedynamic.test4", "m1", "java.util.HashSet", "<init>", IReference.REF_VIRTUALMETHOD, refs); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -140,7 +111,8 @@ public class Java8ClassfileScannerTests extends ScannerTest {
 	 *
 	 * @throws Exception
 	 */
-	public void testCleanup() throws Exception {
+	@AfterClass
+	public static void testCleanup() throws Exception {
 		cleanUp();
 		// remove workspace root
 		assertTrue(TestSuiteHelper.delete(new File(WORKSPACE_ROOT.toOSString())));
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ScannerTest.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ScannerTest.java
index a7d98c5ea1..5e02e804c8 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ScannerTest.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/ScannerTest.java
@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.pde.api.tools.model.tests;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
@@ -25,15 +28,14 @@ import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiMember;
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiType;
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
-
-import junit.framework.TestCase;
+import org.junit.Before;
 
 /**
  * Root class for testing scanning classfiles
  *
  * @since 1.0.400
  */
-public abstract class ScannerTest extends TestCase {
+public abstract class ScannerTest {
 
 	private static DirectoryApiTypeContainer container = null;
 
@@ -65,13 +67,8 @@ public abstract class ScannerTest extends TestCase {
 	 */
 	protected abstract boolean doCompile();
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		IPath root = getWorkspaceRoot();
 		File file = root.toFile();
 		if (!file.exists()) {
@@ -84,17 +81,6 @@ public abstract class ScannerTest extends TestCase {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-
-	}
-
 	/**
 	 * Returns the container
 	 *
@@ -211,7 +197,7 @@ public abstract class ScannerTest extends TestCase {
 	 *
 	 * @throws Exception
 	 */
-	protected void cleanUp() throws Exception {
+	protected static void cleanUp() throws Exception {
 		if (container != null) {
 			container.close();
 			container = null;