Skip to content

Commit daee9f1

Browse files
committed
Reinstate the @⁠Inject Technology Compatibility Kit (TCK)
In commit 05ebca8, the `public` modifier was removed from the SpringAtInjectTckTests class, which prevents it from being run as a JUnit 3 test class. To address that, this commit adds the missing `public` modifier as well as a a code comment to help prevent this from happening again. In addition, this commit updates spring-context.gradle to ensure that the JUnit Vintage test engine is always applied. However, that Gradle configuration is unfortunately ignored due to how our TestConventions class has been implemented. Thus, that issue will have to be addressed separately. Closes gh-34800 (cherry picked from commit e384389)
1 parent 89ae20b commit daee9f1

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

spring-context/spring-context.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,10 @@ dependencies {
5858
testRuntimeOnly("org.javamoney:moneta")
5959
testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
6060
}
61+
62+
test {
63+
description = "Runs JUnit Jupiter tests and the @Inject TCK via JUnit Vintage."
64+
useJUnitPlatform {
65+
includeEngines "junit-jupiter", "junit-vintage"
66+
}
67+
}

spring-context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTckTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -38,7 +38,8 @@
3838
* @author Juergen Hoeller
3939
* @since 3.0
4040
*/
41-
class SpringAtInjectTckTests {
41+
// WARNING: This class MUST be public, since it is based on JUnit 3.
42+
public class SpringAtInjectTckTests {
4243

4344
@SuppressWarnings("unchecked")
4445
public static Test suite() {

0 commit comments

Comments
 (0)