Skip to content

Fix console launcher's --uid option #4589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 27, 2025
Merged

Fix console launcher's --uid option #4589

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26e72fe
Fix console launcher's `--uid` option
sormuras May 27, 2025
f2689ca
Update platform-tests/src/test/java/org/junit/platform/console/tasks/…
sormuras May 27, 2025
e578e50
Add release note and update selector table in User Guide
sormuras May 27, 2025
9f86c8e
Move release note to 5.13.0's document
sormuras May 27, 2025
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
2 changes: 1 addition & 1 deletion documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ repository on GitHub.
[[release-notes-6.0.0-M1-junit-platform-bug-fixes]]
==== Bug Fixes

* ❓
* Fix support of `--uid`/`--select-unique-id` options in the console launcher.
Copy link
Member

@marcphilipp marcphilipp May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go to the 5.13.0 release notes


[[release-notes-6.0.0-M1-junit-platform-deprecations-and-breaking-changes]]
==== Deprecations and Breaking Changes
Expand Down
2 changes: 1 addition & 1 deletion documentation/src/docs/asciidoc/user-guide/running-tests.adoc
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...atform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java
View file
Open in desktop
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
18 changes: 18 additions & 0 deletions ...rm-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
View file
Open in desktop
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