Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ repository on GitHub.
the `ConsoleLauncher`. Prior to this release, the created class loader was closed prior
to JVM shutdown hooks being invoked, which caused hooks to fail with a
`ClassNotFoundException` when loading classes during shutdown.
* Fix support of `--uid` and `--select-unique-id` options in the console launcher.

[[release-notes-5.13.0-junit-platform-deprecations-and-breaking-changes]]
==== Deprecations and Breaking Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ The following discovery selectors are provided out of the box:
| `{NestedClassSelector}` | `{DiscoverySelectors_selectNestedClass}` | `{Select}("<identifier>")` | `--select <identifier>` | `nested-class:com.acme.Foo/Bar`
| `{NestedMethodSelector}` | `{DiscoverySelectors_selectNestedMethod}` | `{Select}("<identifier>")` | `--select <identifier>` | `nested-method:com.acme.Foo/Bar#m`
| `{PackageSelector}` | `{DiscoverySelectors_selectPackage}` | `{SelectPackages}` | `--select-package com.acme.foo` | `package:com.acme.foo`
| `{UniqueIdSelector}` | `{DiscoverySelectors_selectUniqueId}` | `{Select}("<identifier>")` | `--select <identifier>` | `uid:...`
| `{UniqueIdSelector}` | `{DiscoverySelectors_selectUniqueId}` | `{Select}("<identifier>")` | `--select-unique-id <identifier>` | `uid:[engine:Foo]/[segment:Bar]`
| `{UriSelector}` | `{DiscoverySelectors_selectUri}` | `{SelectUris}` | `--select-uri \file:///foo.txt` | `uri:file:///foo.txt`
|===

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ public void setSelectorIdentifiers(List<DiscoverySelectorIdentifier> selectorIde

public List<DiscoverySelector> getExplicitSelectors() {
List<DiscoverySelector> selectors = new ArrayList<>();
selectors.addAll(getSelectedUniqueIds());
selectors.addAll(getSelectedUris());
selectors.addAll(getSelectedFiles());
selectors.addAll(getSelectedDirectories());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
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.selectUniqueId;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri;

import java.io.File;
Expand All @@ -36,6 +37,7 @@
import org.junit.platform.commons.PreconditionViolationException;
import org.junit.platform.console.options.TestDiscoveryOptions;
import org.junit.platform.engine.Filter;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.discovery.ClassNameFilter;
import org.junit.platform.engine.discovery.ClassSelector;
import org.junit.platform.engine.discovery.ClasspathResourceSelector;
Expand All @@ -46,6 +48,7 @@
import org.junit.platform.engine.discovery.MethodSelector;
import org.junit.platform.engine.discovery.PackageNameFilter;
import org.junit.platform.engine.discovery.PackageSelector;
import org.junit.platform.engine.discovery.UniqueIdSelector;
import org.junit.platform.engine.discovery.UriSelector;
import org.junit.platform.launcher.LauncherDiscoveryRequest;

Expand Down Expand Up @@ -218,6 +221,21 @@ void convertsEngineOptions() {
assertThat(engineFilters.get(1).toString()).contains("excludes", "[engine2]");
}

@Test
void propagatesUniqueIdSelectors() {
options.setSelectedUniqueId(List.of(selectUniqueId("[engine:a]/[1:1]"), selectUniqueId("[engine:b]/[2:2]")));

var request = convert();
var uriSelectors = request.getSelectorsByType(UniqueIdSelector.class);

assertThat(uriSelectors) //
.extracting(UniqueIdSelector::getUniqueId) //
.containsExactly( //
UniqueId.parse("[engine:a]/[1:1]"), //, //
UniqueId.parse("[engine:b]/[2:2]") //
);
}

@Test
void propagatesUriSelectors() {
options.setSelectedUris(List.of(selectUri("a"), selectUri("b")));
Expand Down