From d34ac461026e30d8b6ce33a1349c1baae826dc2b Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 18 Aug 2016 20:25:16 +0200 Subject: [PATCH] Rename Java selector methods to align with test sources This commit picks up where d85ea4d98bbbaa9f52d524487cfaafacbf348dff left off by renaming the following Java "select" factory methods in DiscoverySelectors. - Renamed `selectPackage(*)` to `selectJavaPackage(*)` - Renamed `selectClass(*)` to `selectJavaClass(*)` - Renamed `selectMethod(*)` to `selectJavaMethod(*)` Issue: #472 --- .../docs/asciidoc/release-notes-5.0.0-M3.adoc | 15 +++++--- .../java/example/UsingTheLauncherDemo.java | 12 +++---- .../AbstractJupiterTestEngineTests.java | 4 +-- .../junit/jupiter/engine/DisabledTests.java | 8 +++-- .../engine/DynamicTestGenerationTests.java | 16 ++++----- .../engine/ExceptionHandlingTests.java | 18 +++++----- .../engine/NestedTestClassesTests.java | 7 ++-- .../engine/OverloadedTestMethodTests.java | 8 ++--- .../junit/jupiter/engine/ReportingTests.java | 4 +-- .../engine/StandardTestClassTests.java | 10 +++--- .../engine/TestCaseWithInheritanceTests.java | 8 ++--- .../DiscoverySelectorResolverTests.java | 35 ++++++++++--------- .../engine/discovery/DiscoveryTests.java | 13 +++---- .../extension/BeforeAndAfterAllTests.java | 4 +-- .../extension/BeforeAndAfterEachTests.java | 18 +++++----- ...oreAndAfterTestExecutionCallbackTests.java | 16 ++++----- .../extension/ExecutionConditionTests.java | 10 +++--- .../TestExecutionExceptionHandlerTests.java | 14 +++++--- .../TestInstancePostProcessorTests.java | 4 +-- .../tasks/DiscoveryRequestCreator.java | 12 +++---- .../engine/discovery/DiscoverySelectors.java | 20 +++++------ .../core/LauncherDiscoveryRequestBuilder.java | 18 +++++----- .../junit/platform/runner/JUnitPlatform.java | 8 ++--- .../provider/JUnitPlatformProvider.java | 4 +-- .../provider/TestPlanScannerFilter.java | 4 +-- .../VintageTestEngineDiscoveryTests.java | 35 ++++++++++--------- .../VintageTestEngineExecutionTests.java | 4 +-- .../VintageDiscoveryRequestResolverTests.java | 4 +-- .../discovery/DiscoverySelectorsTests.java | 16 ++++----- .../launcher/core/DefaultLauncherTests.java | 6 ++-- .../LauncherDiscoveryRequestBuilderTests.java | 18 +++++----- .../launcher/core/LauncherFactoryTests.java | 6 ++-- 32 files changed, 198 insertions(+), 181 deletions(-) diff --git a/documentation/src/docs/asciidoc/release-notes-5.0.0-M3.adoc b/documentation/src/docs/asciidoc/release-notes-5.0.0-M3.adoc index adaad029af4..badbcd68e38 100644 --- a/documentation/src/docs/asciidoc/release-notes-5.0.0-M3.adoc +++ b/documentation/src/docs/asciidoc/release-notes-5.0.0-M3.adoc @@ -31,10 +31,17 @@ on GitHub. ====== Deprecations and Breaking Changes -* `ClasspathSelector` has been renamed to `ClasspathRootSelector`. -* `PackageSelector` has been renamed to `JavaPackageSelector` to align with `JavaPackageSource`. -* `ClassSelector` has been renamed to `JavaClassSelector` to align with `JavaClassSource`. -* `MethodSelector` has been renamed to `JavaMethodSelector` to align with `JavaMethodSource`. +* `ClasspathSelector` has been renamed to `ClasspathRootSelector` to avoid confusion with + `ClasspathResourceSelector`. +* `PackageSelector` and `DiscoverySelectors.selectPackage()` have been renamed to + `JavaPackageSelector` and `DiscoverySelectors.selectJavaPackage()` to align with + `JavaPackageSource`. +* `ClassSelector` and `DiscoverySelectors.selectClass()` have been renamed to + `JavaClassSelector` and `DiscoverySelectors.selectJavaClass()` to align with + `JavaClassSource`. +* `MethodSelector` and `DiscoverySelectors.selectMethod()` have been renamed to + `JavaMethodSelector` and `DiscoverySelectors.selectJavaMethod()` to align with + `JavaMethodSource`. * The `-p` command-line option for configuring additional classpath entries for the `ConsoleLauncher` has been renamed to `-cp` in order to align with the option names for the standard `java` executable. In addition, a new `--class-path` alias has been diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java index 87cfe864e41..2002c592003 100644 --- a/documentation/src/test/java/example/UsingTheLauncherDemo.java +++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java @@ -12,8 +12,8 @@ // tag::imports[] import static org.junit.platform.engine.discovery.ClassFilter.includeClassNamePattern; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import org.junit.jupiter.api.Test; import org.junit.platform.launcher.Launcher; @@ -37,8 +37,8 @@ void discovery() { // tag::discovery[] LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request() .selectors( - selectPackage("com.example.mytests"), - selectClass(MyTestClass.class) + selectJavaPackage("com.example.mytests"), + selectJavaClass(MyTestClass.class) ) .filters(includeClassNamePattern(".*Test")) .build(); @@ -54,8 +54,8 @@ void execution() { // tag::execution[] LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request() .selectors( - selectPackage("com.example.mytests"), - selectClass(MyTestClass.class) + selectJavaPackage("com.example.mytests"), + selectJavaClass(MyTestClass.class) ) .filters(includeClassNamePattern(".*Test")) .build(); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java index 8250746a245..6959ad8706c 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java @@ -10,7 +10,7 @@ package org.junit.jupiter.engine; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.platform.engine.ExecutionRequest; @@ -29,7 +29,7 @@ public abstract class AbstractJupiterTestEngineTests { private final JupiterTestEngine engine = new JupiterTestEngine(); protected ExecutionEventRecorder executeTestsForClass(Class testClass) { - return executeTests(request().selectors(selectClass(testClass)).build()); + return executeTests(request().selectors(selectJavaClass(testClass)).build()); } protected ExecutionEventRecorder executeTests(LauncherDiscoveryRequest request) { diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java index 635b10978c5..4643b181b5a 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.jupiter.api.Disabled; @@ -29,7 +29,8 @@ public class DisabledTests extends AbstractJupiterTestEngineTests { @Test public void executeTestsWithDisabledTestClass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(DisabledTestClassTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaClass(DisabledTestClassTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); assertEquals(1, eventRecorder.getContainerSkippedCount(), "# container skipped"); @@ -38,7 +39,8 @@ public void executeTestsWithDisabledTestClass() { @Test public void executeTestsWithDisabledTestMethods() { - LauncherDiscoveryRequest request = request().selectors(selectClass(DisabledTestMethodsTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaClass(DisabledTestMethodsTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); assertEquals(1, eventRecorder.getTestStartedCount(), "# tests started"); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java index 32a13c7b1a3..bcb18816956 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java @@ -15,8 +15,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.DynamicTest.dynamicTest; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.engine.test.event.ExecutionEventConditions.assertRecordedExecutionEventsContainsExactly; import static org.junit.platform.engine.test.event.ExecutionEventConditions.container; import static org.junit.platform.engine.test.event.ExecutionEventConditions.dynamicTestRegistered; @@ -51,7 +51,7 @@ class DynamicTestGenerationTests extends AbstractJupiterTestEngineTests { @Test void testFactoryMethodsAreCorrectlyDiscoveredForClassSelector() { - LauncherDiscoveryRequest request = request().selectors(selectClass(MyDynamicTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(MyDynamicTestCase.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(5, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @@ -59,7 +59,7 @@ void testFactoryMethodsAreCorrectlyDiscoveredForClassSelector() { @Test void testFactoryMethodIsCorrectlyDiscoveredForMethodSelector() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(MyDynamicTestCase.class, "dynamicStream")).build(); + selectJavaMethod(MyDynamicTestCase.class, "dynamicStream")).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(2, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @@ -67,7 +67,7 @@ void testFactoryMethodIsCorrectlyDiscoveredForMethodSelector() { @Test void dynamicTestsAreExecutedFromStream() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(MyDynamicTestCase.class, "dynamicStream")).build(); + selectJavaMethod(MyDynamicTestCase.class, "dynamicStream")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -89,7 +89,7 @@ void dynamicTestsAreExecutedFromStream() { @Test void dynamicTestsAreExecutedFromCollection() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(MyDynamicTestCase.class, "dynamicCollection")).build(); + selectJavaMethod(MyDynamicTestCase.class, "dynamicCollection")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -105,7 +105,7 @@ void dynamicTestsAreExecutedFromCollection() { @Test void dynamicTestsAreExecutedFromIterator() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(MyDynamicTestCase.class, "dynamicIterator")).build(); + selectJavaMethod(MyDynamicTestCase.class, "dynamicIterator")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -121,7 +121,7 @@ void dynamicTestsAreExecutedFromIterator() { @Test void dynamicTestsAreExecutedFromIterable() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(MyDynamicTestCase.class, "dynamicIterable")).build(); + selectJavaMethod(MyDynamicTestCase.class, "dynamicIterable")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java index 12f270e72f1..a10f8c86acf 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.allOf; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.engine.test.event.ExecutionEventConditions.assertRecordedExecutionEventsContainsExactly; import static org.junit.platform.engine.test.event.ExecutionEventConditions.container; import static org.junit.platform.engine.test.event.ExecutionEventConditions.engine; @@ -50,7 +50,7 @@ public class ExceptionHandlingTests extends AbstractJupiterTestEngineTests { @Test public void failureInTestMethodIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("failingTest"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -65,7 +65,7 @@ public void failureInTestMethodIsRegistered() throws NoSuchMethodException { @Test public void uncheckedExceptionInTestMethodIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("testWithUncheckedException"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -80,7 +80,7 @@ public void uncheckedExceptionInTestMethodIsRegistered() throws NoSuchMethodExce @Test public void checkedExceptionInTestMethodIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("testWithCheckedException"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -95,7 +95,7 @@ public void checkedExceptionInTestMethodIsRegistered() throws NoSuchMethodExcept @Test public void checkedExceptionInBeforeEachIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("succeedingTest"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); FailureTestCase.exceptionToThrowInBeforeEach = Optional.of(new IOException("checked")); @@ -111,7 +111,7 @@ public void checkedExceptionInBeforeEachIsRegistered() throws NoSuchMethodExcept @Test public void checkedExceptionInAfterEachIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("succeedingTest"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); FailureTestCase.exceptionToThrowInAfterEach = Optional.of(new IOException("checked")); @@ -127,7 +127,7 @@ public void checkedExceptionInAfterEachIsRegistered() throws NoSuchMethodExcepti @Test public void checkedExceptionInAfterEachIsSuppressedByExceptionInTest() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("testWithUncheckedException"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); FailureTestCase.exceptionToThrowInAfterEach = Optional.of(new IOException("checked")); @@ -149,7 +149,7 @@ public void checkedExceptionInAfterEachIsSuppressedByExceptionInTest() throws No @Test public void checkedExceptionInBeforeAllIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("succeedingTest"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); FailureTestCase.exceptionToThrowInBeforeAll = Optional.of(new IOException("checked")); @@ -166,7 +166,7 @@ public void checkedExceptionInBeforeAllIsRegistered() throws NoSuchMethodExcepti @Test public void checkedExceptionInAfterAllIsRegistered() throws NoSuchMethodException { Method method = FailureTestCase.class.getDeclaredMethod("succeedingTest"); - LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(FailureTestCase.class, method)).build(); FailureTestCase.exceptionToThrowInAfterAll = Optional.of(new IOException("checked")); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java index 8fde88154eb..8b15e0e138a 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.jupiter.api.AfterEach; @@ -34,7 +34,7 @@ public class NestedTestClassesTests extends AbstractJupiterTestEngineTests { @Test public void nestedTestsAreCorrectlyDiscovered() { - LauncherDiscoveryRequest request = request().selectors(selectClass(TestCaseWithNesting.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(TestCaseWithNesting.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(5, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @@ -53,7 +53,8 @@ public void nestedTestsAreExecuted() { @Test public void doublyNestedTestsAreCorrectlyDiscovered() { - LauncherDiscoveryRequest request = request().selectors(selectClass(TestCaseWithDoubleNesting.class)).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaClass(TestCaseWithDoubleNesting.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(8, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java index 4239fd9699d..c4f241a7c76 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java @@ -13,8 +13,8 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; @@ -37,7 +37,7 @@ public class OverloadedTestMethodTests extends AbstractJupiterTestEngineTests { @Test void executeTestCaseWithOverloadedMethodsAndThenRerunOnlyOneOfTheMethodsSelectedByUniqueId() { - LauncherDiscoveryRequest request = request().selectors(selectClass(TestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(TestCase.class)).build(); ExecutionEventRecorder eventRecorder1 = executeTests(request); // @formatter:off @@ -71,7 +71,7 @@ void executeTestCaseWithOverloadedMethodsAndThenRerunOnlyOneOfTheMethodsSelected @Test void executeTestCaseWithOverloadedMethodsWithSingleMethodThatAcceptsArgumentsSelectedByFullyQualifedMethodName() { String fqmn = TestCase.class.getName() + "#test(" + TestInfo.class.getName() + ")"; - LauncherDiscoveryRequest request = request().selectors(selectMethod(fqmn)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(fqmn)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); // @formatter:off diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java index 19d85530a82..593d2bec9e2 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.HashMap; @@ -32,7 +32,7 @@ public class ReportingTests extends AbstractJupiterTestEngineTests { @Test void threeReportEntriesArePublished() { - LauncherDiscoveryRequest request = request().selectors(selectClass(MyReportingTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(MyReportingTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java index 87824f70a2a..c8a7ef1ef6d 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.jupiter.api.AfterEach; @@ -40,22 +40,22 @@ public void init() { @Test public void standardTestClassIsCorrectlyDiscovered() { - LauncherDiscoveryRequest request = request().selectors(selectClass(MyStandardTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(MyStandardTestCase.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(5, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @Test public void moreThanOneTestClassIsCorrectlyDiscovered() { - LauncherDiscoveryRequest request = request().selectors(selectClass(SecondOfTwoTestCases.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(SecondOfTwoTestCases.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(2 + 2, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @Test public void moreThanOneTestClassIsExecuted() { - LauncherDiscoveryRequest request = request().selectors(selectClass(FirstOfTwoTestCases.class), - selectClass(SecondOfTwoTestCases.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(FirstOfTwoTestCases.class), + selectJavaClass(SecondOfTwoTestCases.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestCaseWithInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestCaseWithInheritanceTests.java index dc8d33e4851..6b5e1d967ea 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestCaseWithInheritanceTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestCaseWithInheritanceTests.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.jupiter.api.AfterEach; @@ -58,7 +58,7 @@ public void executeAllTestsInClass() { @Test public void executeSingleTest() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(LocalTestCase.class, "alwaysPasses")).build(); + selectJavaMethod(LocalTestCase.class, "alwaysPasses")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -72,7 +72,7 @@ public void executeSingleTest() { @Test public void executeTestDeclaredInSuperClass() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(LocalTestCase.class, "superclassTest")).build(); + selectJavaMethod(LocalTestCase.class, "superclassTest")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -92,7 +92,7 @@ public void executeTestDeclaredInSuperClass() { @Test public void executeTestWithExceptionThrownInAfterMethod() { LauncherDiscoveryRequest request = request().selectors( - selectMethod(LocalTestCase.class, "throwExceptionInAfterMethod")).build(); + selectJavaMethod(LocalTestCase.class, "throwExceptionInAfterMethod")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java index 1481a59628a..4e4f43bb1aa 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java @@ -20,10 +20,10 @@ import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.uniqueIdForClass; import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.uniqueIdForMethod; import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.uniqueIdForTestFactoryMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; @@ -65,7 +65,7 @@ public class DiscoverySelectorResolverTests { @Test public void singleClassResolution() { - JavaClassSelector selector = selectClass(MyTestClass.class); + JavaClassSelector selector = selectJavaClass(MyTestClass.class); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -80,8 +80,8 @@ public void singleClassResolution() { @Test public void duplicateClassSelectorOnlyResolvesOnce() { resolver.resolveSelectors(request().selectors( // - selectClass(MyTestClass.class), // - selectClass(MyTestClass.class) // + selectJavaClass(MyTestClass.class), // + selectJavaClass(MyTestClass.class) // ).build(), engineDescriptor); assertEquals(4, engineDescriptor.getAllDescendants().size()); @@ -94,8 +94,8 @@ public void duplicateClassSelectorOnlyResolvesOnce() { @Test public void twoClassesResolution() { - JavaClassSelector selector1 = selectClass(MyTestClass.class); - JavaClassSelector selector2 = selectClass(YourTestClass.class); + JavaClassSelector selector1 = selectJavaClass(MyTestClass.class); + JavaClassSelector selector2 = selectJavaClass(YourTestClass.class); resolver.resolveSelectors(request().selectors(selector1, selector2).build(), engineDescriptor); @@ -112,7 +112,7 @@ public void twoClassesResolution() { @Test public void classResolutionOfStaticNestedClass() { - JavaClassSelector selector = selectClass(OtherTestClass.NestedTestClass.class); + JavaClassSelector selector = selectJavaClass(OtherTestClass.NestedTestClass.class); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -126,7 +126,7 @@ public void classResolutionOfStaticNestedClass() { @Test public void methodResolution() throws NoSuchMethodException { Method test1 = MyTestClass.class.getDeclaredMethod("test1"); - JavaMethodSelector selector = selectMethod(test1.getDeclaringClass(), test1); + JavaMethodSelector selector = selectJavaMethod(test1.getDeclaringClass(), test1); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -138,7 +138,8 @@ public void methodResolution() throws NoSuchMethodException { @Test public void methodResolutionFromInheritedMethod() throws NoSuchMethodException { - JavaMethodSelector selector = selectMethod(HerTestClass.class, MyTestClass.class.getDeclaredMethod("test1")); + JavaMethodSelector selector = selectJavaMethod(HerTestClass.class, + MyTestClass.class.getDeclaredMethod("test1")); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -151,7 +152,7 @@ public void methodResolutionFromInheritedMethod() throws NoSuchMethodException { @Test public void resolvingSelectorOfNonTestMethodResolvesNothing() throws NoSuchMethodException { Method notATest = MyTestClass.class.getDeclaredMethod("notATest"); - JavaMethodSelector selector = selectMethod(notATest.getDeclaringClass(), notATest); + JavaMethodSelector selector = selectJavaMethod(notATest.getDeclaringClass(), notATest); EngineDiscoveryRequest request = request().selectors(selector).build(); resolver.resolveSelectors(request, engineDescriptor); assertTrue(engineDescriptor.getAllDescendants().isEmpty()); @@ -343,7 +344,7 @@ public void resolvingTestFactoryMethodByUniqueId() { @Test public void packageResolution() { - JavaPackageSelector selector = selectPackage("org.junit.jupiter.engine.descriptor.subpackage"); + JavaPackageSelector selector = selectJavaPackage("org.junit.jupiter.engine.descriptor.subpackage"); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -383,7 +384,7 @@ public void classpathResolution() { @Test public void nestedTestResolutionFromBaseClass() { - JavaClassSelector selector = selectClass(TestCaseWithNesting.class); + JavaClassSelector selector = selectJavaClass(TestCaseWithNesting.class); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -401,7 +402,7 @@ public void nestedTestResolutionFromBaseClass() { @Test public void nestedTestResolutionFromNestedTestClass() { - JavaClassSelector selector = selectClass(TestCaseWithNesting.NestedTestCase.class); + JavaClassSelector selector = selectJavaClass(TestCaseWithNesting.NestedTestCase.class); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -435,7 +436,7 @@ public void nestedTestResolutionFromUniqueId() { @Test public void doubleNestedTestResolutionFromClass() { - JavaClassSelector selector = selectClass(TestCaseWithNesting.NestedTestCase.DoubleNestedTestCase.class); + JavaClassSelector selector = selectJavaClass(TestCaseWithNesting.NestedTestCase.DoubleNestedTestCase.class); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); @@ -451,7 +452,7 @@ public void doubleNestedTestResolutionFromClass() { @Test public void methodResolutionInDoubleNestedTestClass() throws NoSuchMethodException { - JavaMethodSelector selector = selectMethod(TestCaseWithNesting.NestedTestCase.DoubleNestedTestCase.class, + JavaMethodSelector selector = selectJavaMethod(TestCaseWithNesting.NestedTestCase.DoubleNestedTestCase.class, TestCaseWithNesting.NestedTestCase.DoubleNestedTestCase.class.getDeclaredMethod("testC")); resolver.resolveSelectors(request().selectors(selector).build(), engineDescriptor); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java index 63868b4cf4c..20eacc06ce4 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java @@ -11,8 +11,8 @@ package org.junit.jupiter.engine.discovery; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; @@ -36,14 +36,14 @@ public class DiscoveryTests extends AbstractJupiterTestEngineTests { @Test public void discoverTestClass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(LocalTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(LocalTestCase.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(7, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @Test public void doNotDiscoverAbstractTestClass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(AbstractTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(AbstractTestCase.class)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(0, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @@ -76,7 +76,8 @@ public void discoverMethodByUniqueIdForOverloadedMethodVariantThatAcceptsArgumen public void discoverMethodByMethodReference() throws NoSuchMethodException { Method testMethod = LocalTestCase.class.getDeclaredMethod("test3", new Class[0]); - LauncherDiscoveryRequest request = request().selectors(selectMethod(LocalTestCase.class, testMethod)).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaMethod(LocalTestCase.class, testMethod)).build(); TestDescriptor engineDescriptor = discoverTests(request); assertEquals(2, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); } @@ -85,7 +86,7 @@ public void discoverMethodByMethodReference() throws NoSuchMethodException { public void discoverCompositeSpec() { LauncherDiscoveryRequest spec = request().selectors( selectUniqueId(JupiterUniqueIdBuilder.uniqueIdForMethod(LocalTestCase.class, "test2()")), - selectClass(LocalTestCase.class)).build(); + selectJavaClass(LocalTestCase.class)).build(); TestDescriptor engineDescriptor = discoverTests(spec); assertEquals(7, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors"); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java index 531481267f8..73383731e7b 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java @@ -12,7 +12,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.ArrayList; @@ -132,7 +132,7 @@ private void assertBeforeAllAndAfterAllCallbacks(Class testClass, int testsSt String... expectedCalls) { callSequence.clear(); - LauncherDiscoveryRequest request = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(testClass)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); assertEquals(testsStarted, eventRecorder.getTestStartedCount(), "# tests started"); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java index 1f17a73abbe..0ada7329aad 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java @@ -13,7 +13,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.ArrayList; @@ -56,7 +56,7 @@ void resetCallSequence() { @Test public void beforeEachAndAfterEachCallbacks() { - LauncherDiscoveryRequest request = request().selectors(selectClass(OuterTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(OuterTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -97,7 +97,7 @@ public void beforeEachAndAfterEachCallbacks() { @Test public void beforeEachAndAfterEachCallbacksDeclaredOnSuperclassAndSubclass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(ChildTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(ChildTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -120,7 +120,7 @@ public void beforeEachAndAfterEachCallbacksDeclaredOnSuperclassAndSubclass() { @Test public void beforeEachAndAfterEachCallbacksDeclaredOnInterfaceAndClass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(TestInterfaceTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(TestInterfaceTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -154,7 +154,7 @@ public void beforeEachAndAfterEachCallbacksDeclaredOnInterfaceAndClass() { @Test public void beforeEachCallbackThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInBeforeEachCallbackTestCase.class)).build(); + selectJavaClass(ExceptionInBeforeEachCallbackTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -184,7 +184,7 @@ public void beforeEachCallbackThrowsAnException() { @Test public void afterEachCallbackThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInAfterEachCallbackTestCase.class)).build(); + selectJavaClass(ExceptionInAfterEachCallbackTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -214,7 +214,7 @@ public void afterEachCallbackThrowsAnException() { @Test public void beforeEachMethodThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInBeforeEachMethodTestCase.class)).build(); + selectJavaClass(ExceptionInBeforeEachMethodTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -260,7 +260,7 @@ public void beforeEachMethodThrowsAnException() { @Test public void afterEachMethodThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInAfterEachMethodTestCase.class)).build(); + selectJavaClass(ExceptionInAfterEachMethodTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -287,7 +287,7 @@ public void afterEachMethodThrowsAnException() { @Test public void testMethodThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInTestMethodTestCase.class)).build(); + selectJavaClass(ExceptionInTestMethodTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java index 445dfe393fd..eb67a286f1b 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.ArrayList; @@ -57,7 +57,7 @@ void resetCallSequence() { @Test public void beforeAndAfterTestExecutionCallbacks() { - LauncherDiscoveryRequest request = request().selectors(selectClass(OuterTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(OuterTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -98,7 +98,7 @@ public void beforeAndAfterTestExecutionCallbacks() { @Test public void beforeAndAfterTestExecutionCallbacksDeclaredOnSuperclassAndSubclass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(ChildTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(ChildTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -121,7 +121,7 @@ public void beforeAndAfterTestExecutionCallbacksDeclaredOnSuperclassAndSubclass( @Test public void beforeAndAfterTestExecutionCallbacksDeclaredOnInterfaceAndClass() { - LauncherDiscoveryRequest request = request().selectors(selectClass(TestInterfaceTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(TestInterfaceTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -155,7 +155,7 @@ public void beforeAndAfterTestExecutionCallbacksDeclaredOnInterfaceAndClass() { @Test public void beforeEachMethodThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInBeforeEachMethodTestCase.class)).build(); + selectJavaClass(ExceptionInBeforeEachMethodTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -182,7 +182,7 @@ public void beforeEachMethodThrowsAnException() { @Test public void beforeTestExecutionCallbackThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInBeforeTestExecutionCallbackTestCase.class)).build(); + selectJavaClass(ExceptionInBeforeTestExecutionCallbackTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -213,7 +213,7 @@ public void beforeTestExecutionCallbackThrowsAnException() { @Test public void afterTestExecutionCallbackThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInAfterTestExecutionCallbackTestCase.class)).build(); + selectJavaClass(ExceptionInAfterTestExecutionCallbackTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -244,7 +244,7 @@ public void afterTestExecutionCallbackThrowsAnException() { @Test public void testMethodThrowsAnException() { LauncherDiscoveryRequest request = request().selectors( - selectClass(ExceptionInTestMethodTestCase.class)).build(); + selectJavaClass(ExceptionInTestMethodTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java index 6d2e9ef78ee..4c270e2e1fc 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.engine.Constants.DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import org.junit.jupiter.api.AfterEach; @@ -54,7 +54,7 @@ public void tearDown() { @Test public void conditionWorksOnContainer() { LauncherDiscoveryRequest request = request().selectors( - selectClass(TestCaseWithContainerExecutionCondition.class)).build(); + selectJavaClass(TestCaseWithContainerExecutionCondition.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); assertEquals(1, eventRecorder.getContainerSkippedCount(), "# container skipped"); @@ -64,7 +64,7 @@ public void conditionWorksOnContainer() { @Test public void conditionWorksOnTest() { LauncherDiscoveryRequest request = request().selectors( - selectClass(TestCaseWithTestExecutionCondition.class)).build(); + selectJavaClass(TestCaseWithTestExecutionCondition.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); assertEquals(2, eventRecorder.getTestStartedCount(), "# tests started"); @@ -115,7 +115,7 @@ private void assertContainerExecutionConditionOverride(String deactivatePattern, int testFailedCount) { // @formatter:off LauncherDiscoveryRequest request = request() - .selectors(selectClass(TestCaseWithContainerExecutionCondition.class)) + .selectors(selectJavaClass(TestCaseWithContainerExecutionCondition.class)) .configurationParameter(DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME, deactivatePattern) .build(); // @formatter:on @@ -132,7 +132,7 @@ private void assertTestExecutionConditionOverride(String deactivatePattern, int int failed) { // @formatter:off LauncherDiscoveryRequest request = request() - .selectors(selectClass(TestCaseWithTestExecutionCondition.class)) + .selectors(selectJavaClass(TestCaseWithTestExecutionCondition.class)) .configurationParameter(DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME, deactivatePattern) .build(); // @formatter:on diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java index d2d846125e2..3ad2f1a4208 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; import static org.junit.platform.engine.test.event.ExecutionEventConditions.assertRecordedExecutionEventsContainsExactly; import static org.junit.platform.engine.test.event.ExecutionEventConditions.container; import static org.junit.platform.engine.test.event.ExecutionEventConditions.engine; @@ -61,7 +61,8 @@ void resetStatics() { @Test void exceptionHandlerRethrowsException() { - LauncherDiscoveryRequest request = request().selectors(selectMethod(ATestCase.class, "testRethrow")).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaMethod(ATestCase.class, "testRethrow")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -78,7 +79,8 @@ void exceptionHandlerRethrowsException() { @Test void exceptionHandlerSwallowsException() { - LauncherDiscoveryRequest request = request().selectors(selectMethod(ATestCase.class, "testSwallow")).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaMethod(ATestCase.class, "testSwallow")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -95,7 +97,8 @@ void exceptionHandlerSwallowsException() { @Test void exceptionHandlerConvertsException() { - LauncherDiscoveryRequest request = request().selectors(selectMethod(ATestCase.class, "testConvert")).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaMethod(ATestCase.class, "testConvert")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); @@ -112,7 +115,8 @@ void exceptionHandlerConvertsException() { @Test void severalHandlersAreCalledInOrder() { - LauncherDiscoveryRequest request = request().selectors(selectMethod(ATestCase.class, "testSeveral")).build(); + LauncherDiscoveryRequest request = request().selectors( + selectJavaMethod(ATestCase.class, "testSeveral")).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java index 2f96650818e..5cf96186b5f 100644 --- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java +++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java @@ -12,7 +12,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.ArrayList; @@ -39,7 +39,7 @@ public class TestInstancePostProcessorTests extends AbstractJupiterTestEngineTes @Test public void instancePostProcessorsInNestedClasses() { - LauncherDiscoveryRequest request = request().selectors(selectClass(OuterTestCase.class)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(OuterTestCase.class)).build(); ExecutionEventRecorder eventRecorder = executeTests(request); diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java index aacde4e29b5..3e5119b0681 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java @@ -13,10 +13,10 @@ import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toList; import static org.junit.platform.engine.discovery.ClassFilter.includeClassNamePattern; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.launcher.EngineFilter.excludeEngines; import static org.junit.platform.launcher.EngineFilter.includeEngines; import static org.junit.platform.launcher.TagFilter.excludeTags; @@ -138,7 +138,7 @@ private static DiscoverySelector selectName(String name) throws PreconditionViol try { Optional> classOptional = ReflectionUtils.loadClass(name); if (classOptional.isPresent()) { - return selectClass(classOptional.get()); + return selectJavaClass(classOptional.get()); } } catch (Exception ex) { @@ -149,7 +149,7 @@ private static DiscoverySelector selectName(String name) throws PreconditionViol Optional methodOptional = ReflectionUtils.loadMethod(name); if (methodOptional.isPresent()) { Method method = methodOptional.get(); - return selectMethod(method.getDeclaringClass(), method); + return selectJavaMethod(method.getDeclaringClass(), method); } } catch (Exception ex) { @@ -157,7 +157,7 @@ private static DiscoverySelector selectName(String name) throws PreconditionViol } if (ReflectionUtils.isPackage(name)) { - return selectPackage(name); + return selectJavaPackage(name); } throw new PreconditionViolationException( diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java index 370390f8deb..e528f7d10b2 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java @@ -219,7 +219,7 @@ public static ClasspathResourceSelector selectClasspathResource(String classpath * @param packageName the package name to select; never {@code null} or blank * @see JavaPackageSelector */ - public static JavaPackageSelector selectPackage(String packageName) { + public static JavaPackageSelector selectJavaPackage(String packageName) { Preconditions.notBlank(packageName, "Package name must not be null or blank"); return new JavaPackageSelector(packageName); } @@ -230,7 +230,7 @@ public static JavaPackageSelector selectPackage(String packageName) { * @param clazz the class to select; never {@code null} * @see JavaClassSelector */ - public static JavaClassSelector selectClass(Class clazz) { + public static JavaClassSelector selectJavaClass(Class clazz) { Preconditions.notNull(clazz, "Class must not be null"); return new JavaClassSelector(clazz); } @@ -242,7 +242,7 @@ public static JavaClassSelector selectClass(Class clazz) { * never {@code null} or blank * @see JavaClassSelector */ - public static JavaClassSelector selectClass(String className) { + public static JavaClassSelector selectJavaClass(String className) { Preconditions.notBlank(className, "Class name must not be null or blank"); return new JavaClassSelector(loadClass(className)); } @@ -278,14 +278,14 @@ public static JavaClassSelector selectClass(String className) { * blank, or does not specify a unique method * @see JavaMethodSelector */ - public static JavaMethodSelector selectMethod(String name) throws PreconditionViolationException { + public static JavaMethodSelector selectJavaMethod(String name) throws PreconditionViolationException { Preconditions.notBlank(name, "Method name must not be null or blank"); Optional methodOptional = ReflectionUtils.loadMethod(name); Method method = methodOptional.orElseThrow(() -> new PreconditionViolationException( String.format("'%s' could not be resolved to a unique method", name))); - return selectMethod(method.getDeclaringClass(), method); + return selectJavaMethod(method.getDeclaringClass(), method); } /** @@ -296,11 +296,11 @@ public static JavaMethodSelector selectMethod(String name) throws PreconditionVi * @param methodName the name of the method to select; never {@code null} or blank * @see JavaMethodSelector */ - public static JavaMethodSelector selectMethod(String className, String methodName) { + public static JavaMethodSelector selectJavaMethod(String className, String methodName) { Preconditions.notBlank(className, "Class name must not be null or blank"); Preconditions.notBlank(methodName, "Method name must not be null or blank"); Class clazz = loadClass(className); - return selectMethod(clazz, findMethod(clazz, methodName)); + return selectJavaMethod(clazz, findMethod(clazz, methodName)); } /** @@ -311,10 +311,10 @@ public static JavaMethodSelector selectMethod(String className, String methodNam * @param methodName the name of the method to select; never {@code null} or blank * @see JavaMethodSelector */ - public static JavaMethodSelector selectMethod(Class clazz, String methodName) { + public static JavaMethodSelector selectJavaMethod(Class clazz, String methodName) { Preconditions.notNull(clazz, "Class must not be null"); Preconditions.notBlank(methodName, "Method name must not be null or blank"); - return selectMethod(clazz, findMethod(clazz, methodName)); + return selectJavaMethod(clazz, findMethod(clazz, methodName)); } /** @@ -325,7 +325,7 @@ public static JavaMethodSelector selectMethod(Class clazz, String methodName) * @param method the method to select; never {@code null} * @see JavaMethodSelector */ - public static JavaMethodSelector selectMethod(Class clazz, Method method) { + public static JavaMethodSelector selectJavaMethod(Class clazz, Method method) { Preconditions.notNull(clazz, "Class must not be null"); Preconditions.notNull(method, "Method must not be null"); return new JavaMethodSelector(clazz, method); diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java index 82dcbdfa52e..ce36076c18d 100644 --- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java +++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java @@ -44,15 +44,15 @@ * * LauncherDiscoveryRequestBuilder.request() * .selectors( - * selectPackage("org.example.user"), - * selectClass("org.example.payment.PaymentTests"), - * selectClass(ShippingTests.class), - * selectMethod("org.example.order.OrderTests#test1"), - * selectMethod("org.example.order.OrderTests#test2()"), - * selectMethod("org.example.order.OrderTests#test3(java.lang.String)"), - * selectMethod("org.example.order.OrderTests", "test4"), - * selectMethod(OrderTests.class, "test5"), - * selectMethod(OrderTests.class, testMethod), + * selectJavaPackage("org.example.user"), + * selectJavaClass("org.example.payment.PaymentTests"), + * selectJavaClass(ShippingTests.class), + * selectJavaMethod("org.example.order.OrderTests#test1"), + * selectJavaMethod("org.example.order.OrderTests#test2()"), + * selectJavaMethod("org.example.order.OrderTests#test3(java.lang.String)"), + * selectJavaMethod("org.example.order.OrderTests", "test4"), + * selectJavaMethod(OrderTests.class, "test5"), + * selectJavaMethod(OrderTests.class, testMethod), * selectClasspathRoots(Collections.singleton(new File("/my/local/path1"))), * selectUniqueId("unique-id-1"), * selectUniqueId("unique-id-2") diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java index 6f4091aa103..3b2b0669977 100644 --- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java +++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java @@ -14,7 +14,7 @@ import static java.util.stream.Collectors.toList; import static org.junit.platform.commons.meta.API.Usage.Maintained; import static org.junit.platform.engine.discovery.ClassFilter.includeClassNamePattern; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.EngineFilter.excludeEngines; import static org.junit.platform.launcher.EngineFilter.includeEngines; import static org.junit.platform.launcher.TagFilter.excludeTags; @@ -119,7 +119,7 @@ private LauncherDiscoveryRequest createDiscoveryRequest() { // Allows to simply add @RunWith(JUnitPlatform.class) to any test case if (selectors.isEmpty()) { - selectors.add(selectClass(this.testClass)); + selectors.add(selectJavaClass(this.testClass)); } LauncherDiscoveryRequestBuilder requestBuilder = request().selectors(selectors); @@ -140,8 +140,8 @@ private void addFiltersFromAnnotations(LauncherDiscoveryRequestBuilder requestBu private List getSelectorsFromAnnotations() { List selectors = new ArrayList<>(); - selectors.addAll(transform(getSelectedClasses(), DiscoverySelectors::selectClass)); - selectors.addAll(transform(getSelectedPackageNames(), DiscoverySelectors::selectPackage)); + selectors.addAll(transform(getSelectedClasses(), DiscoverySelectors::selectJavaClass)); + selectors.addAll(transform(getSelectedPackageNames(), DiscoverySelectors::selectJavaPackage)); return selectors; } diff --git a/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/JUnitPlatformProvider.java b/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/JUnitPlatformProvider.java index 0e4896c7eb1..d2473221c07 100644 --- a/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/JUnitPlatformProvider.java +++ b/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/JUnitPlatformProvider.java @@ -10,7 +10,7 @@ package org.junit.platform.surefire.provider; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.lang.reflect.InvocationTargetException; @@ -97,7 +97,7 @@ private void invokeSingleClass(Class testClass, RunListener runListener) { SimpleReportEntry classEntry = new SimpleReportEntry(getClass().getName(), testClass.getName()); runListener.testSetStarting(classEntry); - LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest discoveryRequest = request().selectors(selectJavaClass(testClass)).build(); launcher.execute(discoveryRequest); runListener.testSetCompleted(classEntry); diff --git a/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/TestPlanScannerFilter.java b/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/TestPlanScannerFilter.java index 83f81835c74..adb394612c7 100644 --- a/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/TestPlanScannerFilter.java +++ b/junit-platform-surefire-provider/src/main/java/org/junit/platform/surefire/provider/TestPlanScannerFilter.java @@ -10,7 +10,7 @@ package org.junit.platform.surefire.provider; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.function.Predicate; @@ -38,7 +38,7 @@ public TestPlanScannerFilter(Launcher launcher) { @Override @SuppressWarnings("rawtypes") public boolean accept(Class testClass) { - LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest discoveryRequest = request().selectors(selectJavaClass(testClass)).build(); TestPlan testPlan = launcher.discover(discoveryRequest); return testPlan.countTestIdentifiers(hasTests) > 0; } diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java index 7398cec3523..dfda469fbbb 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java @@ -21,10 +21,10 @@ import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement; import static org.junit.platform.commons.util.FunctionUtils.where; import static org.junit.platform.engine.discovery.ClassFilter.includeClassNamePattern; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; @@ -246,7 +246,7 @@ void resolvesPackageSelectorForJUnit4SamplesPackage() { Class testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( - selectPackage(testClass.getPackage().getName())).build(); + selectJavaPackage(testClass.getPackage().getName())).build(); TestDescriptor engineDescriptor = discoverTests(discoveryRequest); @@ -263,7 +263,7 @@ void resolvesPackageSelectorForJUnit3SamplesPackage() { Class testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( - selectPackage(testClass.getPackage().getName())).build(); + selectJavaPackage(testClass.getPackage().getName())).build(); TestDescriptor engineDescriptor = discoverTests(discoveryRequest); @@ -323,7 +323,7 @@ void resolvesCategoriesIntoTags() { void resolvesMethodSelectorForSingleMethod() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( - selectMethod(testClass, testClass.getMethod("failingTest"))).build(); + selectJavaMethod(testClass, testClass.getMethod("failingTest"))).build(); TestDescriptor engineDescriptor = discoverTests(discoveryRequest); @@ -339,8 +339,8 @@ void resolvesMethodSelectorForSingleMethod() throws Exception { void resolvesMethodSelectorForTwoMethodsOfSameClass() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( - selectMethod(testClass, testClass.getMethod("failingTest")), - selectMethod(testClass, testClass.getMethod("successfulTest"))).build(); + selectJavaMethod(testClass, testClass.getMethod("failingTest")), + selectJavaMethod(testClass, testClass.getMethod("successfulTest"))).build(); TestDescriptor engineDescriptor = discoverTests(discoveryRequest); @@ -469,8 +469,9 @@ void doesNotResolveMissingUniqueIdSelectorForSingleClass() throws Exception { void ignoresMoreFineGrainedSelectorsWhenClassIsSelectedAsWell() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( // - selectMethod(testClass, testClass.getMethod("failingTest")), // - selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "abortedTest")), selectClass(testClass) // + selectJavaMethod(testClass, testClass.getMethod("failingTest")), // + selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "abortedTest")), + selectJavaClass(testClass) // ).build(); TestDescriptor engineDescriptor = discoverTests(discoveryRequest); @@ -485,7 +486,7 @@ void ignoresMoreFineGrainedSelectorsWhenClassIsSelectedAsWell() throws Exception void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( // - selectMethod(testClass, testClass.getMethod("failingTest")), // + selectJavaMethod(testClass, testClass.getMethod("failingTest")), // selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "abortedTest") // )).build(); @@ -506,7 +507,7 @@ void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception { void ignoresRedundantSelector() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; LauncherDiscoveryRequest discoveryRequest = request().selectors( // - selectMethod(testClass, testClass.getMethod("failingTest")), // + selectJavaMethod(testClass, testClass.getMethod("failingTest")), // selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "failingTest") // )).build(); @@ -525,7 +526,7 @@ void doesNotResolveMethodOfClassNotAcceptedByClassFilter() throws Exception { Class testClass = PlainJUnit4TestCaseWithFiveTestMethods.class; // @formatter:off LauncherDiscoveryRequest request = request() - .selectors(selectMethod(testClass, testClass.getMethod("failingTest"))) + .selectors(selectJavaMethod(testClass, testClass.getMethod("failingTest"))) .filters(includeClassNamePattern("Foo")) .build(); // @formatter:on @@ -538,7 +539,7 @@ void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() throws Exce Class testClass = IgnoredJUnit4TestCase.class; // @formatter:off LauncherDiscoveryRequest request = request() - .selectors(selectMethod(testClass, testClass.getMethod("test"))) + .selectors(selectJavaMethod(testClass, testClass.getMethod("test"))) .build(); // @formatter:on @@ -553,7 +554,7 @@ void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() throws Exce @Test void usesCustomUniqueIdsWhenPresent() throws Exception { Class testClass = JUnit4TestCaseWithRunnerWithCustomUniqueIds.class; - LauncherDiscoveryRequest request = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(testClass)).build(); TestDescriptor engineDescriptor = discoverTests(request); @@ -573,7 +574,7 @@ void usesCustomUniqueIdsWhenPresent() throws Exception { @Test void resolvesTestSourceForParameterizedTests() throws Exception { Class testClass = ParameterizedTestCase.class; - LauncherDiscoveryRequest request = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest request = request().selectors(selectJavaClass(testClass)).build(); TestDescriptor engineDescriptor = discoverTests(request); @@ -680,6 +681,6 @@ private static void assertMethodSource(Method expectedMethod, TestDescriptor tes } private static LauncherDiscoveryRequest discoveryRequestForClass(Class testClass) { - return request().selectors(selectClass(testClass)).build(); + return request().selectors(selectJavaClass(testClass)).build(); } } diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java index 908402573c3..3b5c0bab56d 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java @@ -11,7 +11,7 @@ package org.junit.vintage.engine; import static org.assertj.core.api.Assertions.allOf; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.engine.test.event.ExecutionEventConditions.abortedWithReason; import static org.junit.platform.engine.test.event.ExecutionEventConditions.assertRecordedExecutionEventsContainsExactly; import static org.junit.platform.engine.test.event.ExecutionEventConditions.container; @@ -456,7 +456,7 @@ public void executesJUnit4TestCaseWithRunnerWithCustomUniqueIds() { private static List execute(Class testClass) { VintageTestEngine engine = new VintageTestEngine(); - LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClass(testClass)).build(); + LauncherDiscoveryRequest discoveryRequest = request().selectors(selectJavaClass(testClass)).build(); return ExecutionEventRecorder.execute(engine, discoveryRequest); } } diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscoveryRequestResolverTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscoveryRequestResolverTests.java index 79ec3810da4..35b010f9de9 100644 --- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscoveryRequestResolverTests.java +++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscoveryRequestResolverTests.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement; import static org.junit.platform.engine.FilterResult.includedIf; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import static org.junit.vintage.engine.VintageUniqueIdBuilder.engineId; @@ -40,7 +40,7 @@ void logsWarningWhenFilterExcludesClass() { ClassFilter filter = testClass -> includedIf(Foo.class.equals(testClass), () -> "match", () -> "no match"); // @formatter:off EngineDiscoveryRequest request = request() - .selectors(selectClass(Foo.class), selectClass(Bar.class)) + .selectors(selectJavaClass(Foo.class), selectJavaClass(Bar.class)) .filters(filter) .build(); // @formatter:on diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java index 8e04ee74941..8ed6ee9311a 100644 --- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java +++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java @@ -12,12 +12,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectDirectory; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectFile; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri; import java.io.File; @@ -140,32 +140,32 @@ void selectClasspathResources() { @Test void selectPackageByName() { - JavaPackageSelector selector = selectPackage(getClass().getPackage().getName()); + JavaPackageSelector selector = selectJavaPackage(getClass().getPackage().getName()); assertEquals(getClass().getPackage().getName(), selector.getPackageName()); } @Test void selectClassByName() { - JavaClassSelector selector = selectClass(getClass().getName()); + JavaClassSelector selector = selectJavaClass(getClass().getName()); assertEquals(getClass(), selector.getJavaClass()); } @Test void selectMethodByFullyQualifiedName() { - JavaMethodSelector selector = selectMethod(fullyQualifiedMethodName); + JavaMethodSelector selector = selectJavaMethod(fullyQualifiedMethodName); assertEquals(fullyQualifiedMethod, selector.getJavaMethod()); } @Test void selectMethodByFullyQualifiedNameWithParameters() { - JavaMethodSelector selector = selectMethod(fullyQualifiedMethodNameWithParameters); + JavaMethodSelector selector = selectJavaMethod(fullyQualifiedMethodNameWithParameters); assertEquals(fullyQualifiedMethodWithParameters, selector.getJavaMethod()); } @Test void selectMethodWithParametersByMethodReference() throws Exception { Method method = getClass().getDeclaredMethod("myTest", String.class); - JavaMethodSelector selector = selectMethod(getClass(), method); + JavaMethodSelector selector = selectJavaMethod(getClass(), method); assertEquals(method, selector.getJavaMethod()); assertEquals(method, selector.getJavaMethod()); } diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java index 27893b92423..484ac99a27d 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.expectThrows; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.EngineFilter.excludeEngines; import static org.junit.platform.launcher.EngineFilter.includeEngines; @@ -103,7 +103,7 @@ void discoverTestPlanForSingleEngine() { DefaultLauncher launcher = createLauncher(engine); - TestPlan testPlan = launcher.discover(request().selectors(selectPackage("any")).build()); + TestPlan testPlan = launcher.discover(request().selectors(selectJavaPackage("any")).build()); assertThat(testPlan.getRoots()).hasSize(1); TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next(); @@ -255,7 +255,7 @@ void launcherAppliesPostDiscoveryFilters() { TestPlan testPlan = launcher.discover( // request() // - .selectors(selectPackage("any")) // + .selectors(selectJavaPackage("any")) // .filters(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) // .build()); diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java index f97e7972271..c6c41de4321 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java @@ -16,10 +16,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.expectThrows; import static org.junit.platform.engine.FilterResult.excluded; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; import static org.junit.platform.launcher.EngineFilter.includeEngines; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; @@ -62,7 +62,7 @@ public void packagesAreStoredInDiscoveryRequest() throws Exception { // @formatter:off LauncherDiscoveryRequest discoveryRequest = request() .selectors( - selectPackage("org.junit.platform.engine") + selectJavaPackage("org.junit.platform.engine") ).build(); // @formatter:on @@ -76,8 +76,8 @@ public void classesAreStoredInDiscoveryRequest() throws Exception { // @formatter:off LauncherDiscoveryRequest discoveryRequest = request() .selectors( - selectClass(LauncherDiscoveryRequestBuilderTests.class.getName()), - selectClass(SampleTestClass.class) + selectJavaClass(LauncherDiscoveryRequestBuilderTests.class.getName()), + selectJavaClass(SampleTestClass.class) ) .build(); // @formatter:on @@ -91,7 +91,7 @@ public void classesAreStoredInDiscoveryRequest() throws Exception { public void methodsByFullyQualifiedNameAreStoredInDiscoveryRequest() throws Exception { // @formatter:off LauncherDiscoveryRequest discoveryRequest = request() - .selectors(selectMethod(fullyQualifiedMethodName())) + .selectors(selectJavaMethod(fullyQualifiedMethodName())) .build(); // @formatter:on @@ -110,7 +110,7 @@ public void methodsByNameAreStoredInDiscoveryRequest() throws Exception { // @formatter:off LauncherDiscoveryRequest discoveryRequest = request() - .selectors(selectMethod(SampleTestClass.class.getName(), "test")) + .selectors(selectJavaMethod(SampleTestClass.class.getName(), "test")) .build(); // @formatter:on @@ -130,7 +130,7 @@ public void methodsByClassAreStoredInDiscoveryRequest() throws Exception { // @formatter:off DefaultDiscoveryRequest discoveryRequest = (DefaultDiscoveryRequest) request() .selectors( - selectMethod(SampleTestClass.class, "test") + selectJavaMethod(SampleTestClass.class, "test") ).build(); // @formatter:on diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java index d5c7d65a453..75d42240cae 100644 --- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java +++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java @@ -12,7 +12,7 @@ import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass; import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; import java.util.List; @@ -56,8 +56,8 @@ void testCreate() { private LauncherDiscoveryRequest createLauncherDiscoveryRequestForBothStandardEngineExampleClasses() { // @formatter:off return request() - .selectors(selectClass(JUnit4Example.class)) - .selectors(selectClass(JUnit5Example.class)) + .selectors(selectJavaClass(JUnit4Example.class)) + .selectors(selectJavaClass(JUnit5Example.class)) .build(); // @formatter:on }