Revert "Bug 515274: JDT Core test freezes in Gerrit Hudson job"

This reverts commit 82a37a244511a78abb719184529dbacc5eee9f6c.

3 files changed, 262 insertions, 284 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunModelTests.java
index b49a93bbfa..af5dda7813 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunModelTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2017 IBM Corporation and others.
+ * Copyright (c) 2005 IBM Corporation and others.
  * 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
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests;
 
-import org.eclipse.jdt.core.tests.model.AllJavaModelTestsJUnit3;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.eclipse.jdt.core.tests.model.AllJavaModelTests;
+
 /**
  * Runs all Java model tests.
  */
@@ -25,7 +25,7 @@ public RunModelTests(String name) {
 }
 public static Test suite() {
 	TestSuite suite = new TestSuite(RunModelTests.class.getName());
-	suite.addTest(AllJavaModelTestsJUnit3.suite());
+	suite.addTest(AllJavaModelTests.suite());
 	return suite;
 }
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTests.java
index 6db5c9b38e..24aaeeee13 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * 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
@@ -12,11 +12,262 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests.model;
 
-import org.eclipse.test.TracingSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.eclipse.jdt.core.tests.junit.extension.TestCase;
+import org.eclipse.jdt.core.tests.nd.RunIndexTests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Run all java model tests.
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class AllJavaModelTests extends junit.framework.TestCase {
+public AllJavaModelTests(String name) {
+	super(name);
+}
+private static Class[] getAllTestClasses() {
+	Class[] classes = new Class[] {
+
+		// Enter each test here, grouping the tests that are related
+
+		// Binding key tests
+		BindingKeyTests.class,
+
+		// creation of method
+		CreateMembersTests.class,
+
+		// Java Naming convention tests
+		JavaConventionTests.class,
+
+		// Project & Root API unit tests
+		JavaProjectTests.class,
+
+		// Compilation unit tests
+		CompilationUnitTests.class,
+
+		// Source attachment tests
+		AttachSourceTests.class,
+
+		// Attached javadoc tests
+		AttachedJavadocTests.class,
+
+		// Java search tests
+		RunJavaSearchTests.class,
+
+		// Testss for the new index
+		RunIndexTests.class,
+
+		// Working copy tests
+		WorkingCopyTests.class,
+		WorkingCopyNotInClasspathTests.class,
+		HierarchyOnWorkingCopiesTests.class,
+
+		// test IJavaModel
+		JavaModelTests.class,
+
+		// tests to check the encoding
+		EncodingTests.class,
+
+		// test class name with special names like names containing '$'
+		ClassNameTests.class,
+
+		// IBuffer tests
+		BufferTests.class,
+
+		// Name lookup tests
+		NameLookupTests2.class,
+
+		// Classpath and output location tests
+		ClasspathTests.class,
+
+		// Delta tests
+		JavaElementDeltaTests.class,
+		ExternalJarDeltaTests.class,
+
+		// Java element existence tests
+		ExistenceTests.class,
+
+		// Support for "open on" feature tests
+		ResolveTests.class,
+		ResolveTests2.class,
+		ResolveTests_1_5.class,
+		ResolveTests18.class,
+		SelectionJavadocModelTests.class,
+
+		// Support for completion tests
+		RunCompletionModelTests.class,
+
+		// Prefix and suffix tests
+		NamingConventionTests.class,
+
+		// Code correction tests
+		CodeCorrectionTests.class,
+
+		// Options tests
+		OptionTests.class,
+
+		// Type hierarchy tests
+		TypeHierarchyTests.class,
+		TypeHierarchyNotificationTests.class,
+		TypeHierarchySerializationTests.class,
+
+		// Resolve type tests
+		TypeResolveTests.class,
+
+		// Reconciler tests
+		ReconcilerTests.class,
+		ReconcilerStatementsRecoveryTests.class,
+
+		// Copy and move operation tests
+		CopyMoveElementsTests.class,
+		CopyMoveResourcesTests.class,
+
+		// Rename tests
+		RenameTests.class,
+
+		// Exclusion patterns tests
+		ExclusionPatternsTests.class,
+
+		// Inclusion patterns tests
+		InclusionPatternsTests.class,
+
+		// Access restrictions tests
+		AccessRestrictionsTests.class,
+
+		// Ignore optional problems from source folders tests
+		IgnoreOptionalProblemsFromSourceFoldersTests.class,
+
+		// Signature tests
+		SignatureTests.class,
+
+		// Variable initializers and container initializers tests
+		ClasspathInitializerTests.class,
+
+		// Java Model Factory tests
+		FactoryTests.class,
+
+		// Java Element persistence tests
+		MementoTests.class,
+
+		// Java Element sorting tests
+		SortCompilationUnitElementsTests.class,
+
+		// Package fragment root manipulation tests
+		RootManipulationsTests.class,
+
+		// Owverflowing cache tests
+		OverflowingCacheTests.class,
+
+		// Working copy owner tests
+		WorkingCopyOwnerTests.class,
+
+		// Delete Java element tests
+		DeleteTests.class,
+
+		// Local element tests
+		LocalElementTests.class,
+
+		// Get source tests
+		GetSourceTests.class,
+
+		// Create packages tests
+		CreatePackageTests.class,
+
+		// Create compilation units tests
+		CreateCompilationUnitTests.class,
+
+		// Create search participant tests
+		SearchParticipantTests.class,
+
+		// Class file tests
+		ClassFileTests.class,
+
+		// Java-like extensions tests
+		JavaLikeExtensionsTests.class,
+
+		// Creation of imports
+		CreateImportsTests.class,
+		
+		// Util tests
+		UtilTests.class,
+		
+		JavaCoreOptionsTests.class,
+		JavaCorePreferenceModifyListenerTest.class,
+		
+		// Tests regarding null-annotations:
+		NullAnnotationModelTests.class,
+		ExternalAnnotations17Test.class,
+		ExternalAnnotations18Test.class,
+
+		// Java model changes related to Java 8
+		JavaElement8Tests.class,
+	};
+
+	Class[] deprecatedClasses = getDeprecatedJDOMTestClasses();
+
+	int classesLength = classes.length;
+	int deprecatedClassesLength = deprecatedClasses.length;
+	Class[] result = new Class[classesLength + deprecatedClassesLength];
+	System.arraycopy(classes, 0, result, 0, classesLength);
+	System.arraycopy(deprecatedClasses, 0, result, classesLength, deprecatedClassesLength);
+
+	return result;
+}
+
+/**
+ * @deprecated JDOM is obsolete
+ */
+private static Class[] getDeprecatedJDOMTestClasses() {
+	return new Class[] {
+		//Create type source tests
+		CreateTypeSourceExamplesTests.class,
+
+		//Create method source tests
+		CreateMethodSourceExamplesTests.class,
+	};
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite(AllJavaModelTests.class.getName());
+
+	// Hack to load all classes before computing their suite of test cases
+	// this allow to reset test cases subsets while running all Java Model tests...
+	Class[] classes = getAllTestClasses();
+
+	// Reset forgotten subsets of tests
+	TestCase.TESTS_PREFIX = null;
+	TestCase.TESTS_NAMES = null;
+	TestCase.TESTS_NUMBERS = null;
+	TestCase.TESTS_RANGE = null;
+	TestCase.RUN_ONLY_ID = null;
+
+	for (int i = 0, length = classes.length; i < length; i++) {
+		Class clazz = classes[i];
+		Method suiteMethod;
+		try {
+			suiteMethod = clazz.getDeclaredMethod("suite", new Class[0]);
+		} catch (NoSuchMethodException e) {
+			e.printStackTrace();
+			continue;
+		}
+		Object test;
+		try {
+			test = suiteMethod.invoke(null, new Object[0]);
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+			continue;
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+			continue;
+		}
+		suite.addTest((Test) test);
+	}
+
+	return suite;
+}
 
-@RunWith(TracingSuite.class)
-@SuiteClasses(AllJavaModelTestsJUnit3.class)
-public class AllJavaModelTests {
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTestsJUnit3.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTestsJUnit3.java
deleted file mode 100644
index 310636a660..0000000000
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AllJavaModelTestsJUnit3.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Stephan Herrmann - Contribution for
- *								Bug 440477 - [null] Infrastructure for feeding external annotations into compilation
- *******************************************************************************/
-package org.eclipse.jdt.core.tests.model;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.jdt.core.tests.junit.extension.TestCase;
-import org.eclipse.jdt.core.tests.nd.RunIndexTests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Run all java model tests.
- */
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class AllJavaModelTestsJUnit3 extends junit.framework.TestCase {
-public AllJavaModelTestsJUnit3(String name) {
-	super(name);
-}
-private static Class[] getAllTestClasses() {
-	Class[] classes = new Class[] {
-
-		// Enter each test here, grouping the tests that are related
-
-		// Binding key tests
-		BindingKeyTests.class,
-
-		// creation of method
-		CreateMembersTests.class,
-
-		// Java Naming convention tests
-		JavaConventionTests.class,
-
-		// Project & Root API unit tests
-		JavaProjectTests.class,
-
-		// Compilation unit tests
-		CompilationUnitTests.class,
-
-		// Source attachment tests
-		AttachSourceTests.class,
-
-		// Attached javadoc tests
-		AttachedJavadocTests.class,
-
-		// Java search tests
-		RunJavaSearchTests.class,
-
-		// Testss for the new index
-		RunIndexTests.class,
-
-		// Working copy tests
-		WorkingCopyTests.class,
-		WorkingCopyNotInClasspathTests.class,
-		HierarchyOnWorkingCopiesTests.class,
-
-		// test IJavaModel
-		JavaModelTests.class,
-
-		// tests to check the encoding
-		EncodingTests.class,
-
-		// test class name with special names like names containing '$'
-		ClassNameTests.class,
-
-		// IBuffer tests
-		BufferTests.class,
-
-		// Name lookup tests
-		NameLookupTests2.class,
-
-		// Classpath and output location tests
-		ClasspathTests.class,
-
-		// Delta tests
-		JavaElementDeltaTests.class,
-		ExternalJarDeltaTests.class,
-
-		// Java element existence tests
-		ExistenceTests.class,
-
-		// Support for "open on" feature tests
-		ResolveTests.class,
-		ResolveTests2.class,
-		ResolveTests_1_5.class,
-		ResolveTests18.class,
-		SelectionJavadocModelTests.class,
-
-		// Support for completion tests
-		RunCompletionModelTests.class,
-
-		// Prefix and suffix tests
-		NamingConventionTests.class,
-
-		// Code correction tests
-		CodeCorrectionTests.class,
-
-		// Options tests
-		OptionTests.class,
-
-		// Type hierarchy tests
-		TypeHierarchyTests.class,
-		TypeHierarchyNotificationTests.class,
-		TypeHierarchySerializationTests.class,
-
-		// Resolve type tests
-		TypeResolveTests.class,
-
-		// Reconciler tests
-		ReconcilerTests.class,
-		ReconcilerStatementsRecoveryTests.class,
-
-		// Copy and move operation tests
-		CopyMoveElementsTests.class,
-		CopyMoveResourcesTests.class,
-
-		// Rename tests
-		RenameTests.class,
-
-		// Exclusion patterns tests
-		ExclusionPatternsTests.class,
-
-		// Inclusion patterns tests
-		InclusionPatternsTests.class,
-
-		// Access restrictions tests
-		AccessRestrictionsTests.class,
-
-		// Ignore optional problems from source folders tests
-		IgnoreOptionalProblemsFromSourceFoldersTests.class,
-
-		// Signature tests
-		SignatureTests.class,
-
-		// Variable initializers and container initializers tests
-		ClasspathInitializerTests.class,
-
-		// Java Model Factory tests
-		FactoryTests.class,
-
-		// Java Element persistence tests
-		MementoTests.class,
-
-		// Java Element sorting tests
-		SortCompilationUnitElementsTests.class,
-
-		// Package fragment root manipulation tests
-		RootManipulationsTests.class,
-
-		// Owverflowing cache tests
-		OverflowingCacheTests.class,
-
-		// Working copy owner tests
-		WorkingCopyOwnerTests.class,
-
-		// Delete Java element tests
-		DeleteTests.class,
-
-		// Local element tests
-		LocalElementTests.class,
-
-		// Get source tests
-		GetSourceTests.class,
-
-		// Create packages tests
-		CreatePackageTests.class,
-
-		// Create compilation units tests
-		CreateCompilationUnitTests.class,
-
-		// Create search participant tests
-		SearchParticipantTests.class,
-
-		// Class file tests
-		ClassFileTests.class,
-
-		// Java-like extensions tests
-		JavaLikeExtensionsTests.class,
-
-		// Creation of imports
-		CreateImportsTests.class,
-		
-		// Util tests
-		UtilTests.class,
-		
-		JavaCoreOptionsTests.class,
-		JavaCorePreferenceModifyListenerTest.class,
-		
-		// Tests regarding null-annotations:
-		NullAnnotationModelTests.class,
-		ExternalAnnotations17Test.class,
-		ExternalAnnotations18Test.class,
-
-		// Java model changes related to Java 8
-		JavaElement8Tests.class,
-	};
-
-	Class[] deprecatedClasses = getDeprecatedJDOMTestClasses();
-
-	int classesLength = classes.length;
-	int deprecatedClassesLength = deprecatedClasses.length;
-	Class[] result = new Class[classesLength + deprecatedClassesLength];
-	System.arraycopy(classes, 0, result, 0, classesLength);
-	System.arraycopy(deprecatedClasses, 0, result, classesLength, deprecatedClassesLength);
-
-	return result;
-}
-
-/**
- * @deprecated JDOM is obsolete
- */
-private static Class[] getDeprecatedJDOMTestClasses() {
-	return new Class[] {
-		//Create type source tests
-		CreateTypeSourceExamplesTests.class,
-
-		//Create method source tests
-		CreateMethodSourceExamplesTests.class,
-	};
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite(AllJavaModelTestsJUnit3.class.getName());
-
-	// Hack to load all classes before computing their suite of test cases
-	// this allow to reset test cases subsets while running all Java Model tests...
-	Class[] classes = getAllTestClasses();
-
-	// Reset forgotten subsets of tests
-	TestCase.TESTS_PREFIX = null;
-	TestCase.TESTS_NAMES = null;
-	TestCase.TESTS_NUMBERS = null;
-	TestCase.TESTS_RANGE = null;
-	TestCase.RUN_ONLY_ID = null;
-
-	for (int i = 0, length = classes.length; i < length; i++) {
-		Class clazz = classes[i];
-		Method suiteMethod;
-		try {
-			suiteMethod = clazz.getDeclaredMethod("suite", new Class[0]);
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-			continue;
-		}
-		Object test;
-		try {
-			test = suiteMethod.invoke(null, new Object[0]);
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-			continue;
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-			continue;
-		}
-		suite.addTest((Test) test);
-	}
-
-	return suite;
-}
-
-}