Skip to content

Commit

Permalink
Make all model test suites recursively filterable
Browse files Browse the repository at this point in the history
Signed-off-by: Rob Stryker <stryker@redhat.com>

Remove unused import

Signed-off-by: Rob Stryker <stryker@redhat.com>
  • Loading branch information
Rob Stryker committed Jan 15, 2025
1 parent 3d38ffa commit 6e81fe6
Show file tree
Hide file tree
Showing 41 changed files with 281 additions and 183 deletions.
3 changes: 2 additions & 1 deletion org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ 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.40.0,4.0.0)",
org.junit;bundle-version="3.8.1",
org.eclipse.test;bundle-version="[3.1.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.38.0,4.0.0)",
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)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,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;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand Down Expand Up @@ -51,7 +52,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand Down Expand Up @@ -51,7 +52,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand All @@ -40,7 +41,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
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;

Expand Down Expand Up @@ -56,7 +57,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import junit.framework.TestSuite;
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;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand Down Expand Up @@ -48,7 +49,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
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;
Expand Down Expand Up @@ -84,7 +85,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,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;

Expand Down Expand Up @@ -63,7 +64,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,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;

/**
* Runs minimal suite for reproducing bug 563501.
Expand All @@ -32,7 +33,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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.jdt.core.tests.builder.BuilderTests;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;

/**
* Runs all Java builder tests.
Expand All @@ -26,7 +27,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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;

/**
* Runs all compiler tests (including parser tests and evaluation tests) in all compliance mode.
Expand All @@ -38,7 +39,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++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.jdt.core.tests.formatter.*;
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;

/**
Expand All @@ -51,7 +52,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import junit.framework.TestSuite;
import org.eclipse.jdt.core.tests.compiler.regression.*;
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;
import org.eclipse.jdt.core.tests.util.AbstractCompilerTest;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand Down Expand Up @@ -49,7 +50,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
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;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand All @@ -43,7 +44,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;

@SuppressWarnings({"rawtypes", "unchecked"})
public class RunOnlyJava12Tests extends TestCase {
Expand All @@ -32,7 +33,7 @@ public static Class[] getAllTestClasses() {
}

public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava12Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava12Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;

@SuppressWarnings({"rawtypes", "unchecked"})
Expand All @@ -46,7 +47,7 @@ public static Class[] getConverterTestClasses() {
};
}
public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava13Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava13Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.CompletionTests14;
import org.eclipse.jdt.core.tests.model.JavaSearchBugs14SwitchExpressionTests;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;

@SuppressWarnings({"rawtypes", "unchecked"})
public class RunOnlyJava14Tests extends TestCase {
Expand All @@ -42,7 +43,7 @@ public static Class[] getConverterTestClasses() {
};
}
public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava14Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava14Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.jdt.core.tests.compiler.regression.RecordPatternTest;
import org.eclipse.jdt.core.tests.compiler.regression.SwitchPatternTest;
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;

@SuppressWarnings({"rawtypes", "unchecked"})
public class RunOnlyJava19Tests extends TestCase {
Expand All @@ -44,7 +45,7 @@ public static Class[] getConverterTestClasses() {
};
}
public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava19Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava19Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.eclipse.jdt.core.tests.compiler.regression.RecordPatternTest;
import org.eclipse.jdt.core.tests.compiler.regression.SwitchPatternTest;
import org.eclipse.jdt.core.tests.dom.ConverterTestSetup;
import org.eclipse.jdt.core.tests.model.RecursivelyFilterableTestSuite;


@SuppressWarnings({"rawtypes", "unchecked"})
public class RunOnlyJava20Tests extends TestCase {
Expand All @@ -42,7 +44,7 @@ public static Class[] getConverterTestClasses() {
};
}
public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava20Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava20Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
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;

Expand Down Expand Up @@ -108,7 +109,7 @@ public static Class[] getConverterTestClasses() {
};
}
public static Test suite() {
TestSuite ts = new TestSuite(RunOnlyJava8Tests.class.getName());
TestSuite ts = new RecursivelyFilterableTestSuite(RunOnlyJava8Tests.class.getName());

Class[] testClasses = getAllTestClasses();
addTestsToSuite(ts, testClasses);
Expand Down
Loading

0 comments on commit 6e81fe6

Please sign in to comment.