Make all model tests recursively filterable

Signed-off-by: Rob Stryker <[email protected]>
robstryker · Sep 12, 2024 · 4c887bc · 4c887bc
1 parent a135144
commit 4c887bc
Show file tree

Hide file tree

Showing 45 changed files with 326 additions and 222 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
 					# Build and test without DOM-first to ensure no regression takes place
 					mvn -U clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 						-Ptest-on-javase-23 -Pbree-libs -Papi-check -Pjavadoc -Pp2-repo \
+						-DexcludedGroups=org.eclipse.jdt.core.tests.javac.JavacTestIgnore \
 						-Dmaven.test.failure.ignore=true \
 						-Dcompare-version-with-baselines.skip=false \
 						-Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 \

diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Export-Package: org.eclipse.jdt.core.tests,
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.38.0,4.0.0)",
- org.junit;bundle-version="3.8.1",
+ org.junit;bundle-version="4.13.2",
  org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jdt.core.tests.compiler;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jdt.compiler.apt.tests;bundle-version="[1.0.0,2.0.0)",

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava10Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava10Tests.java
@@ -20,6 +20,7 @@
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
 import org.eclipse.jdt.core.tests.model.CompletionTests10;
 import org.eclipse.jdt.core.tests.model.JavaSearchBugs10Tests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
 import junit.framework.Test;
@@ -53,7 +54,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava10Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava10Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava11Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava11Tests.java
@@ -19,6 +19,7 @@
 import org.eclipse.jdt.core.tests.builder.BuilderTests11;
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
 import org.eclipse.jdt.core.tests.model.CompletionTests11;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
 import junit.framework.Test;
@@ -53,7 +54,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava11Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava11Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava12Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava12Tests.java
@@ -16,6 +16,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
 import junit.framework.Test;
@@ -42,7 +43,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava12Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava12Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava13Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava13Tests.java
@@ -16,18 +16,19 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.jdt.core.tests.compiler.parser.ComplianceDiagnoseTest;
 import org.eclipse.jdt.core.tests.compiler.regression.SwitchExpressionsYieldTest;
 import org.eclipse.jdt.core.tests.dom.ASTConverter14Test;
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
 import org.eclipse.jdt.core.tests.model.JavaSearchBugs13Tests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.rewrite.describing.ASTRewritingTest;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class RunAllJava13Tests extends TestCase {
 
@@ -58,7 +59,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava13Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava13Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava14Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava14Tests.java
@@ -18,6 +18,7 @@
 
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
 import org.eclipse.jdt.core.tests.model.JavaSearchBugs14SwitchExpressionTests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
 import junit.framework.Test;
@@ -50,7 +51,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava14Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava14Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava8Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava8Tests.java
@@ -18,10 +18,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.jdt.core.tests.builder.IncrementalTests18;
 import org.eclipse.jdt.core.tests.compiler.parser.ComplianceDiagnoseTest;
 import org.eclipse.jdt.core.tests.dom.ASTConverter15JLS8Test;
@@ -39,10 +35,15 @@
 import org.eclipse.jdt.core.tests.model.CompletionTests18;
 import org.eclipse.jdt.core.tests.model.JavaElement8Tests;
 import org.eclipse.jdt.core.tests.model.JavaSearchBugs8Tests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.model.ResolveTests18;
 import org.eclipse.jdt.core.tests.rewrite.describing.ASTRewritingTest;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class RunAllJava8Tests extends TestCase {
 
@@ -86,7 +87,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava8Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava8Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava9Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava9Tests.java
@@ -25,6 +25,7 @@
 import org.eclipse.jdt.core.tests.model.ModuleBuilderTests;
 import org.eclipse.jdt.core.tests.model.ModuleOptionsTests;
 import org.eclipse.jdt.core.tests.model.ReconcilerTests9;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.model.ResolveTests9;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
@@ -65,7 +66,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunAllJava9Tests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunAllJava9Tests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunBug563501Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunBug563501Tests.java
@@ -16,6 +16,7 @@
 import org.eclipse.jdt.core.tests.builder.Bug549646Test;
 import org.eclipse.jdt.core.tests.compiler.regression.ModuleCompilationTests;
 import org.eclipse.jdt.core.tests.model.ModuleBuilderTests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -33,7 +34,7 @@ public static Test suite() {
 		org.eclipse.jdt.core.tests.junit.extension.TestCase.TESTS_NAMES = new String[] {
 					"testCompilerRegression", "testReleaseOption10", "testConvertToModule"
 				};
-		TestSuite suite = new TestSuite(RunBug563501Tests.class.getName());
+		TestSuite suite = new RecursivelyFilterableTestSuite(RunBug563501Tests.class.getName());
 		suite.addTest(Bug549646Test.suite());
 		suite.addTest(ModuleCompilationTests.suite());
 		suite.addTest(ModuleBuilderTests.suite());

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunBuilderTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunBuilderTests.java
@@ -14,6 +14,7 @@
 package org.eclipse.jdt.core.tests;
 
 import org.eclipse.jdt.core.tests.builder.BuilderTests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -27,7 +28,7 @@ public RunBuilderTests(String name) {
 	super(name);
 }
 public static Test suite() {
-	TestSuite suite = new TestSuite(RunBuilderTests.class.getName());
+	TestSuite suite = new RecursivelyFilterableTestSuite(RunBuilderTests.class.getName());
 	suite.addTest(BuilderTests.suite());
 	return suite;
 }

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunCompilerTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunCompilerTests.java
@@ -16,6 +16,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -39,7 +41,7 @@ public static Class[] getAllTestClasses() {
 	};
 }
 public static Test suite() {
-	TestSuite ts = new TestSuite(RunCompilerTests.class.getName());
+	TestSuite ts = new RecursivelyFilterableTestSuite(RunCompilerTests.class.getName());
 
 	Class[] testClasses = getAllTestClasses();
 	for (int i = 0; i < testClasses.length; i++) {

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunDOMTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunDOMTests.java
@@ -13,12 +13,13 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests;
 
+import org.eclipse.jdt.core.tests.dom.RunAllTests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.eclipse.jdt.core.tests.dom.RunAllTests;
-
 /**
  * Runs all DOM AST tests.
  */
@@ -28,7 +29,7 @@ public RunDOMTests(String name) {
 	super(name);
 }
 public static Test suite() {
-	TestSuite suite = new TestSuite(RunDOMTests.class.getName());
+	TestSuite suite = new RecursivelyFilterableTestSuite(RunDOMTests.class.getName());
 	suite.addTest(RunAllTests.suite());
 	return suite;
 }

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunFormatterTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunFormatterTests.java
@@ -21,14 +21,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.tests.formatter.*;
+import org.eclipse.jdt.core.tests.formatter.FormatterBugs18Tests;
+import org.eclipse.jdt.core.tests.formatter.FormatterBugsTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterCommentsBugsTest;
+import org.eclipse.jdt.core.tests.formatter.FormatterCommentsClearBlankLinesTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterCommentsTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterJSR308Tests;
+import org.eclipse.jdt.core.tests.formatter.FormatterJSR335Tests;
+import org.eclipse.jdt.core.tests.formatter.FormatterJavadocDontIndentTagsDescriptionTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterJavadocDontIndentTagsTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterOldBugsGistTests;
+import org.eclipse.jdt.core.tests.formatter.FormatterRegressionTests;
 import org.eclipse.jdt.core.tests.formatter.comment.CommentsTestSuite;
 import org.eclipse.jdt.core.tests.junit.extension.TestCase;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.CleanupAfterSuiteTests;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * Runs all formatter tests.
  */
@@ -53,7 +64,7 @@ public static Class[] getTestClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunFormatterTests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunFormatterTests.class.getName());
 
 		// Store test classes with same "JavaSearch"project
 		FormatterCommentsTests.ALL_TEST_SUITES = new ArrayList(TEST_SUITES);

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunJDTCoreTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunJDTCoreTests.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests;
 
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -25,7 +27,7 @@ public RunJDTCoreTests(String name) {
 	super(name);
 }
 public static Test suite() {
-	TestSuite suite = new TestSuite(RunJDTCoreTests.class.getName());
+	TestSuite suite = new RecursivelyFilterableTestSuite(RunJDTCoreTests.class.getName());
 	suite.addTest(RunBuilderTests.suite());
 	suite.addTest(RunCompilerTests.suite());
 	suite.addTest(RunDOMTests.suite());

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
@@ -13,12 +13,13 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests;
 
+import org.eclipse.jdt.core.tests.model.AllJavaModelTests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
+
 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.
  */
@@ -27,7 +28,7 @@ public RunModelTests(String name) {
 	super(name);
 }
 public static Test suite() {
-	TestSuite suite = new TestSuite(RunModelTests.class.getName());
+	TestSuite suite = new RecursivelyFilterableTestSuite(RunModelTests.class.getName());
 	suite.addTest(AllJavaModelTests.suite());
 	return suite;
 }

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunOnly335CompilerTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunOnly335CompilerTests.java
@@ -16,10 +16,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.jdt.core.tests.compiler.regression.GenericTypeTest;
 import org.eclipse.jdt.core.tests.compiler.regression.GenericsRegressionTest;
 import org.eclipse.jdt.core.tests.compiler.regression.GenericsRegressionTest_1_7;
@@ -31,8 +27,13 @@
 import org.eclipse.jdt.core.tests.compiler.regression.NullTypeAnnotationTest;
 import org.eclipse.jdt.core.tests.compiler.regression.OverloadResolutionTest8;
 import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class RunOnly335CompilerTests extends TestCase {
 
@@ -60,7 +61,7 @@ public static Class[] getCompilerClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunOnly335CompilerTests.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunOnly335CompilerTests.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);

diff --git a/...clipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunOnlyAssistModelTests18.java b/...clipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunOnlyAssistModelTests18.java
@@ -16,17 +16,18 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.jdt.core.tests.compiler.parser.CompletionParserTest18;
 import org.eclipse.jdt.core.tests.compiler.parser.SelectionParserTest18;
 import org.eclipse.jdt.core.tests.model.CompletionTests18;
 import org.eclipse.jdt.core.tests.model.JavaElement8Tests;
 import org.eclipse.jdt.core.tests.model.JavaSearchBugs8Tests;
+import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
 import org.eclipse.jdt.core.tests.model.ResolveTests18;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class RunOnlyAssistModelTests18 extends TestCase {
 
@@ -45,7 +46,7 @@ public static Class[] getAllTestClasses() {
 	}
 
 	public static Test suite() {
-		TestSuite ts = new TestSuite(RunOnlyAssistModelTests18.class.getName());
+		TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyAssistModelTests18.class.getName());
 
 		Class[] testClasses = getAllTestClasses();
 		addTestsToSuite(ts, testClasses);