Rename Java selector methods to align with test sources

This commit picks up where d85ea4d
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

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

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();

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) {

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");

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,23 +51,23 @@ 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");
 	}
 
 	@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");
 	}
 
 	@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);
 

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"));
 

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");
 	}

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

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);
 

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);