Skip to content

Commit

Permalink
Issue #489: Renamed DiscoverySelectors
Browse files Browse the repository at this point in the history 
- JavaMethodSelector to MethodSelector
- JavaClassSelector to ClassSelector
- JavaPackageSelector to PackageSelector
- JavaClassSource to ClassSource
- JavaMethodSource to MethodSource
- JavaPackageSource to PackageSource
  • Loading branch information
@bechte
bechte committed Oct 13, 2016
1 parent 92bf0c6 commit e804be5
Show file tree
Hide file tree
Showing 61 changed files with 458 additions and 470 deletions.
12 changes: 6 additions & 6 deletions documentation/src/test/java/example/UsingTheLauncherDemo.java
View file
Expand Up @@ -12,8 +12,8 @@

// tag::imports[]
import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNamePatterns;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaPackage;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;

import org.junit.jupiter.api.Test;
import org.junit.platform.launcher.Launcher;
Expand All @@ -37,8 +37,8 @@ void discovery() {
// tag::discovery[]
LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
.selectors(
selectJavaPackage("com.example.mytests"),
selectJavaClass(MyTestClass.class)
selectPackage("com.example.mytests"),
selectClass(MyTestClass.class)
)
.filters(includeClassNamePatterns(".*Test"))
.build();
Expand All @@ -54,8 +54,8 @@ void execution() {
// tag::execution[]
LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
.selectors(
selectJavaPackage("com.example.mytests"),
selectJavaClass(MyTestClass.class)
selectPackage("com.example.mytests"),
selectClass(MyTestClass.class)
)
.filters(includeClassNamePatterns(".*Test"))
.build();
Expand Down
4 changes: 2 additions & 2 deletions ...jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
View file
Expand Up @@ -47,7 +47,7 @@
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestTag;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.support.descriptor.JavaClassSource;
import org.junit.platform.engine.support.descriptor.ClassSource;

/**
* {@link TestDescriptor} for tests based on Java classes.
Expand Down Expand Up @@ -90,7 +90,7 @@ protected ClassTestDescriptor(UniqueId uniqueId, Function<Class<?>, String> defa
this.beforeEachMethods = findBeforeEachMethods(testClass);
this.afterEachMethods = findAfterEachMethods(testClass);

setSource(new JavaClassSource(testClass));
setSource(new ClassSource(testClass));
}

// --- TestDescriptor ------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ...upiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodTestDescriptor.java
View file
Expand Up @@ -40,7 +40,7 @@
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestTag;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.support.descriptor.JavaMethodSource;
import org.junit.platform.engine.support.descriptor.MethodSource;

/**
* {@link TestDescriptor} for tests based on Java methods.
Expand Down Expand Up @@ -76,7 +76,7 @@ public MethodTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMe
this.testClass = Preconditions.notNull(testClass, "Class must not be null");
this.testMethod = testMethod;

setSource(new JavaMethodSource(testMethod));
setSource(new MethodSource(testMethod));
}

// --- TestDescriptor ------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions ...er-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
View file
Expand Up @@ -24,10 +24,10 @@
import org.junit.platform.commons.meta.API;
import org.junit.platform.engine.EngineDiscoveryRequest;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.discovery.ClassSelector;
import org.junit.platform.engine.discovery.ClasspathRootSelector;
import org.junit.platform.engine.discovery.JavaClassSelector;
import org.junit.platform.engine.discovery.JavaMethodSelector;
import org.junit.platform.engine.discovery.JavaPackageSelector;
import org.junit.platform.engine.discovery.MethodSelector;
import org.junit.platform.engine.discovery.PackageSelector;
import org.junit.platform.engine.discovery.UniqueIdSelector;

/**
Expand All @@ -52,14 +52,14 @@ public void resolveSelectors(EngineDiscoveryRequest request, TestDescriptor engi
findAllClassesInClasspathRoot(Paths.get(selector.getClasspathRoot()), isScannableTestClass,
classNamePredicate).forEach(javaElementsResolver::resolveClass);
});
request.getSelectorsByType(JavaPackageSelector.class).forEach(selector -> {
request.getSelectorsByType(PackageSelector.class).forEach(selector -> {
findAllClassesInPackage(selector.getPackageName(), isScannableTestClass, classNamePredicate).forEach(
javaElementsResolver::resolveClass);
});
request.getSelectorsByType(JavaClassSelector.class).forEach(selector -> {
request.getSelectorsByType(ClassSelector.class).forEach(selector -> {
javaElementsResolver.resolveClass(selector.getJavaClass());
});
request.getSelectorsByType(JavaMethodSelector.class).forEach(selector -> {
request.getSelectorsByType(MethodSelector.class).forEach(selector -> {
javaElementsResolver.resolveMethod(selector.getJavaClass(), selector.getJavaMethod());
});
request.getSelectorsByType(UniqueIdSelector.class).forEach(selector -> {
Expand Down
4 changes: 2 additions & 2 deletions ...jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
View file
Expand Up @@ -10,7 +10,7 @@

package org.junit.jupiter.engine;

import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;

import org.junit.platform.engine.ExecutionRequest;
Expand All @@ -29,7 +29,7 @@ public abstract class AbstractJupiterTestEngineTests {
private final JupiterTestEngine engine = new JupiterTestEngine();

protected ExecutionEventRecorder executeTestsForClass(Class<?> testClass) {
return executeTests(request().selectors(selectJavaClass(testClass)).build());
return executeTests(request().selectors(selectClass(testClass)).build());
}

protected ExecutionEventRecorder executeTests(LauncherDiscoveryRequest request) {
Expand Down
5 changes: 2 additions & 3 deletions junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
View file
Expand Up @@ -12,10 +12,9 @@

import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.platform.engine.test.event.ExecutionEventRecorder;
import org.junit.platform.launcher.LauncherDiscoveryRequest;
Expand All @@ -31,7 +30,7 @@ public class DefaultMethodTests extends AbstractJupiterTestEngineTests {
@Test
void executeTestCaseWithDefaultMethodFromInterfaceSelectedByFullyQualifedMethodName() {
String fqmn = TestCaseWithDefaultMethod.class.getName() + "#test";
LauncherDiscoveryRequest request = request().selectors(selectJavaMethod(fqmn)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(fqmn)).build();
ExecutionEventRecorder eventRecorder = executeTests(request);

// @formatter:off
Expand Down
8 changes: 3 additions & 5 deletions junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
View file
Expand Up @@ -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.selectJavaClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;

import org.junit.jupiter.api.Disabled;
Expand All @@ -29,8 +29,7 @@ public class DisabledTests extends AbstractJupiterTestEngineTests {

@Test
public void executeTestsWithDisabledTestClass() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaClass(DisabledTestClassTestCase.class)).build();
LauncherDiscoveryRequest request = request().selectors(selectClass(DisabledTestClassTestCase.class)).build();
ExecutionEventRecorder eventRecorder = executeTests(request);

assertEquals(1, eventRecorder.getContainerSkippedCount(), "# container skipped");
Expand All @@ -39,8 +38,7 @@ public void executeTestsWithDisabledTestClass() {

@Test
public void executeTestsWithDisabledTestMethods() throws Exception {
LauncherDiscoveryRequest request = request().selectors(
selectJavaClass(DisabledTestMethodsTestCase.class)).build();
LauncherDiscoveryRequest request = request().selectors(selectClass(DisabledTestMethodsTestCase.class)).build();
ExecutionEventRecorder eventRecorder = executeTests(request);

assertEquals(1, eventRecorder.getTestStartedCount(), "# tests started");
Expand Down
17 changes: 9 additions & 8 deletions junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java
View file
Expand Up @@ -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.selectJavaClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectJavaMethod;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
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;
Expand All @@ -39,6 +39,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.discovery.DiscoverySelectors;
import org.junit.platform.engine.test.event.ExecutionEventRecorder;
import org.junit.platform.launcher.LauncherDiscoveryRequest;

Expand All @@ -51,23 +52,23 @@ class DynamicTestGenerationTests extends AbstractJupiterTestEngineTests {

@Test
void testFactoryMethodsAreCorrectlyDiscoveredForClassSelector() {
LauncherDiscoveryRequest request = request().selectors(selectJavaClass(MyDynamicTestCase.class)).build();
LauncherDiscoveryRequest request = request().selectors(selectClass(MyDynamicTestCase.class)).build();
TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(5, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors");
}

@Test
void testFactoryMethodIsCorrectlyDiscoveredForMethodSelector() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaMethod(MyDynamicTestCase.class, "dynamicStream")).build();
DiscoverySelectors.selectMethod(MyDynamicTestCase.class, "dynamicStream")).build();
TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(2, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors");
}

@Test
void dynamicTestsAreExecutedFromStream() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaMethod(MyDynamicTestCase.class, "dynamicStream")).build();
DiscoverySelectors.selectMethod(MyDynamicTestCase.class, "dynamicStream")).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -89,7 +90,7 @@ void dynamicTestsAreExecutedFromStream() {
@Test
void dynamicTestsAreExecutedFromCollection() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaMethod(MyDynamicTestCase.class, "dynamicCollection")).build();
DiscoverySelectors.selectMethod(MyDynamicTestCase.class, "dynamicCollection")).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -105,7 +106,7 @@ void dynamicTestsAreExecutedFromCollection() {
@Test
void dynamicTestsAreExecutedFromIterator() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaMethod(MyDynamicTestCase.class, "dynamicIterator")).build();
DiscoverySelectors.selectMethod(MyDynamicTestCase.class, "dynamicIterator")).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -121,7 +122,7 @@ void dynamicTestsAreExecutedFromIterator() {
@Test
void dynamicTestsAreExecutedFromIterable() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaMethod(MyDynamicTestCase.class, "dynamicIterable")).build();
DiscoverySelectors.selectMethod(MyDynamicTestCase.class, "dynamicIterable")).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand Down
18 changes: 9 additions & 9 deletions junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
View file
Expand Up @@ -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.selectJavaMethod;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
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;
Expand Down Expand Up @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

ExecutionEventRecorder eventRecorder = executeTests(request);

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

FailureTestCase.exceptionToThrowInBeforeEach = Optional.of(new IOException("checked"));

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

FailureTestCase.exceptionToThrowInAfterEach = Optional.of(new IOException("checked"));

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

FailureTestCase.exceptionToThrowInAfterEach = Optional.of(new IOException("checked"));

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

FailureTestCase.exceptionToThrowInBeforeAll = Optional.of(new IOException("checked"));

Expand All @@ -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(selectJavaMethod(FailureTestCase.class, method)).build();
LauncherDiscoveryRequest request = request().selectors(selectMethod(FailureTestCase.class, method)).build();

FailureTestCase.exceptionToThrowInAfterAll = Optional.of(new IOException("checked"));

Expand Down
7 changes: 3 additions & 4 deletions junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
View file
Expand Up @@ -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.selectJavaClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;

import org.junit.jupiter.api.AfterEach;
Expand All @@ -34,7 +34,7 @@ public class NestedTestClassesTests extends AbstractJupiterTestEngineTests {

@Test
public void nestedTestsAreCorrectlyDiscovered() {
LauncherDiscoveryRequest request = request().selectors(selectJavaClass(TestCaseWithNesting.class)).build();
LauncherDiscoveryRequest request = request().selectors(selectClass(TestCaseWithNesting.class)).build();
TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(5, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors");
}
Expand All @@ -53,8 +53,7 @@ public void nestedTestsAreExecuted() {

@Test
public void doublyNestedTestsAreCorrectlyDiscovered() {
LauncherDiscoveryRequest request = request().selectors(
selectJavaClass(TestCaseWithDoubleNesting.class)).build();
LauncherDiscoveryRequest request = request().selectors(selectClass(TestCaseWithDoubleNesting.class)).build();
TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(8, engineDescriptor.getAllDescendants().size(), "# resolved test descriptors");
}
Expand Down

0 comments on commit e804be5

Please sign in to comment.