Skip to content

Commit f1bb343

Browse files
committed
Delete deprecated ParameterInfo interface
Follow-up on #4919 to fully resolve the package cycle. This change should not be backported to 5.x.
1 parent 0a96225 commit f1bb343

File tree

5 files changed

+4
-219
lines changed

5 files changed

+4
-219
lines changed

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-RC3.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ JUnit repository on GitHub.
4545
* `MediaType.APPLICATION_JSON_UTF_8` is now deprecated in favor of using
4646
`MediaType.APPLICATION_JSON`, since the industry considers UTF-8 to be the implicit
4747
default encoding for the `application/json` media type.
48-
* `org.junit.jupiter.params.support.ParameterInfo` is now deprecated in favor of
49-
`org.junit.jupiter.params.ParameterInfo`
48+
* Delete `org.junit.jupiter.params.support.ParameterInfo` in favor of
49+
`org.junit.jupiter.params.ParameterInfo`.
5050

5151
[[release-notes-6.0.0-RC3-junit-jupiter-new-features-and-improvements]]
5252
==== New Features and Improvements

junit-jupiter-params/src/main/java/org/junit/jupiter/params/DefaultParameterInfo.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
/**
1818
* @since 5.13
1919
*/
20-
@SuppressWarnings("removal")
21-
record DefaultParameterInfo(ParameterDeclarations declarations, ArgumentsAccessor arguments)
22-
implements org.junit.jupiter.params.support.ParameterInfo {
20+
record DefaultParameterInfo(ParameterDeclarations declarations, ArgumentsAccessor arguments) implements ParameterInfo {
2321

2422
@Override
2523
public ParameterDeclarations getDeclarations() {
@@ -32,10 +30,7 @@ public ArgumentsAccessor getArguments() {
3230
}
3331

3432
void store(ExtensionContext context) {
35-
context.getStore(org.junit.jupiter.params.ParameterInfo.NAMESPACE) //
36-
.put(org.junit.jupiter.params.ParameterInfo.KEY, this);
37-
context.getStore(org.junit.jupiter.params.support.ParameterInfo.NAMESPACE) //
38-
.put(org.junit.jupiter.params.support.ParameterInfo.KEY, this);
33+
context.getStore(ParameterInfo.NAMESPACE).put(ParameterInfo.KEY, this);
3934
}
4035

4136
}

junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/ParameterInfo.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

jupiter-tests/src/test/java/org/junit/jupiter/params/support/DeprecatedParameterInfoIntegrationTests.java

Lines changed: 0 additions & 116 deletions
This file was deleted.

platform-tooling-support-tests/src/archUnit/java/platform/tooling/support/tests/ArchUnitTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ void freeOfGroupCycles(JavaClasses classes) {
155155
slices().matching("org.junit.(*)..").should().beFreeOfCycles().check(classes);
156156
}
157157

158-
@SuppressWarnings("removal")
159158
@ArchTest
160159
void freeOfPackageCycles(JavaClasses classes) throws Exception {
161160
slices().matching("org.junit.(**)").should().beFreeOfCycles() //
@@ -173,10 +172,6 @@ void freeOfPackageCycles(JavaClasses classes) throws Exception {
173172
.ignoreDependency(Class.forName("org.junit.platform.commons.util.DefaultClasspathScanner"),
174173
Resource.class) //
175174

176-
// https://github.com/junit-team/junit-framework/issues/4919
177-
.ignoreDependency(org.junit.jupiter.params.support.ParameterInfo.class,
178-
org.junit.jupiter.params.ParameterInfo.class)
179-
180175
// Needs more investigation
181176
.ignoreDependency(OutputDirectoryProvider.class, TestDescriptor.class) //
182177

0 commit comments

Comments
 (0)