Skip to content

Commit b9d40b2

Browse files
sbrannenmarcphilipp
authored andcommitted
Polish contribution
See #3693 (cherry picked from commit 2a5c6b2)
1 parent 92f02b6 commit b9d40b2

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

documentation/src/docs/asciidoc/release-notes/release-notes-5.10.3.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on GitHub.
1515

1616
==== Bug Fixes
1717

18-
* The `junit-platform-suite-engine` now includes configuration provided by
18+
* The `junit-platform-suite-engine` now includes configuration provided via
1919
`@ConfigurationParameter` when selecting tests by `UniqueId`.
2020

2121
==== Deprecations and Breaking Changes

junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
* )
9898
* .configurationParameter("key", "value")
9999
* .enableImplicitConfigurationParameters(true)
100-
* .suite(File.class)
100+
* .applyConfigurationParametersFromSuite(MySuite.class)
101+
* .applySelectorsAndFiltersFromSuite(MySuite.class)
101102
* .build();
102103
* }</pre>
103104
*
@@ -254,14 +255,15 @@ public SuiteLauncherDiscoveryRequestBuilder enableImplicitConfigurationParameter
254255
}
255256

256257
/**
257-
* Apply a suites annotation based configuration, selectors and filters to this builder.
258+
* Apply a suite's annotation-based configuration, selectors, and filters to
259+
* this builder.
258260
*
259-
* @param suiteClass the class to apply the annotations from;
260-
* never {@code null}
261+
* @param suiteClass the class to apply the annotations from; never {@code null}
261262
* @return this builder for method chaining
262-
* @since 1.11
263263
* @see org.junit.platform.suite.api.Suite
264-
* @deprecated use {@link #applyConfigurationParametersFromSuite} and/or {@link #applySelectorsAndFiltersFromSuite} instead.
264+
* @deprecated as of JUnit Platform 1.11 in favor of
265+
* {@link #applyConfigurationParametersFromSuite} and
266+
* {@link #applySelectorsAndFiltersFromSuite}
265267
*/
266268
@Deprecated
267269
public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
@@ -272,15 +274,16 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
272274
}
273275

274276
/**
275-
* Apply a suites annotation based configuration to this builder.
276-
* <p>
277-
* This will apply the configuration from:
277+
* Apply a suite's annotation-based configuration to this builder.
278+
*
279+
* <p>This will apply the configuration from the following annotations.
278280
* <ul>
279281
* <li>{@link ConfigurationParameter}</li>
280282
* <li>{@link DisableParentConfigurationParameters}</li>
281283
* </ul>
282284
*
283-
* @param suiteClass the class to apply the configuration annotations from; never {@code null}
285+
* @param suiteClass the class to apply the configuration annotations from;
286+
* never {@code null}
284287
* @return this builder for method chaining
285288
* @since 1.11
286289
* @see org.junit.platform.suite.api.Suite
@@ -298,9 +301,10 @@ public SuiteLauncherDiscoveryRequestBuilder applyConfigurationParametersFromSuit
298301
}
299302

300303
/**
301-
* Apply a suites annotation based discovery selectors and filters to this builder.
302-
* <p>
303-
* This will apply the configuration from:
304+
* Apply a suite's annotation-based discovery selectors and filters to this
305+
* builder.
306+
*
307+
* <p>This will apply the configuration from the following annotations.
304308
* <ul>
305309
* <li>{@link ExcludeClassNamePatterns}</li>
306310
* <li>{@link ExcludeEngines}</li>
@@ -320,7 +324,8 @@ public SuiteLauncherDiscoveryRequestBuilder applyConfigurationParametersFromSuit
320324
* <li>{@link SelectPackages}</li>
321325
* </ul>
322326
*
323-
* @param suiteClass the class to apply the discovery selectors and filter annotations from; never {@code null}
327+
* @param suiteClass the class to apply the discovery selectors and filter
328+
* annotations from; never {@code null}
324329
* @return this builder for method chaining
325330
* @since 1.11
326331
* @see org.junit.platform.suite.api.Suite

platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ void selectMethodsInTestPlanByUniqueId() {
275275
}
276276

277277
@Test
278-
void selectConfigurationSensitiveMethodsInTestPlanByUnique() {
278+
void selectConfigurationSensitiveMethodsInTestPlanByUniqueId() {
279279
// @formatter:off
280280
var uniqueId1 = UniqueId.forEngine(ENGINE_ID)
281281
.append(SuiteTestDescriptor.SEGMENT_TYPE, ConfigurationSuite.class.getName())

platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/ConfigurationSensitiveTestCase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.junit.jupiter.api.TestMethodOrder;
1818

1919
/**
20-
* @since 1.10.2
20+
* @since 1.11
2121
*/
2222
@TestMethodOrder(MethodName.class)
2323
public class ConfigurationSensitiveTestCase {
@@ -31,6 +31,8 @@ void test1() {
3131

3232
@Test
3333
void test2() {
34+
// This will fail unless the test instance lifecycle is set to per_class,
35+
// which is configured via @ConfigurationParameter in ConfigurationSuite.
3436
assertTrue(shared);
3537
}
3638

0 commit comments

Comments
 (0)