tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Spring Framework
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28548 Commits
19 Branches
274 Tags
318 MiB
Branch: main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
src-spring-framework/spring-test/spring-test.gradle

116 lines
5.0 KiB
Raw Permalink Normal View History Unescape

Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
description = "Spring TestContext Framework"
Move modules to independent build files The main `build.gradle` file contains now only the common build infrastructure; all module-specific build configurations have been moved to their own build file. Issue: SPR-15885
7 years ago
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
apply plugin: "kotlin"
Move modules to independent build files The main `build.gradle` file contains now only the common build infrastructure; all module-specific build configurations have been moved to their own build file. Issue: SPR-15885
7 years ago
dependencies {
Upgrade to Gradle 7.2 This commit upgrades Gradle to 7.2. Gradle configuration names are updated accordingly. This also upgrades Gradle build plugins. See gh-26870
4 years ago
api(project(":spring-core"))
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
optional(project(":spring-aop"))
optional(project(":spring-beans"))
optional(project(":spring-context"))
optional(project(":spring-jdbc"))
optional(project(":spring-orm"))
optional(project(":spring-tx"))
optional(project(":spring-web"))
optional(project(":spring-webflux"))
optional(project(":spring-webmvc"))
optional(project(":spring-websocket"))
Polishing
1 year ago
optional("com.jayway.jsonpath:json-path")
optional("io.micrometer:context-propagation")
optional("io.micrometer:micrometer-observation")
optional("io.projectreactor:reactor-test")
Jakarta EE 9 migration Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles). Closes gh-22093 Closes gh-25354 Closes gh-26185 Closes gh-27423 See gh-27424
3 years ago
optional("jakarta.activation:jakarta.activation-api")
optional("jakarta.el:jakarta.el-api")
optional("jakarta.inject:jakarta.inject-api")
optional("jakarta.servlet:jakarta.servlet-api")
optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
optional("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api")
optional("jakarta.websocket:jakarta.websocket-api")
Align with Servlet 6.0 and introduce support for Jakarta WebSocket 2.1 Includes corresponding build upgrade to Tomcat 10.1.1 and Undertow 2.3.0 (while retaining runtime compatibility with Tomcat 10.0 and Undertow 2.2) Closes gh-29435 Closes gh-29436
2 years ago
optional("jakarta.websocket:jakarta.websocket-client-api")
Consistent dependency declarations
1 year ago
optional("jakarta.xml.bind:jakarta.xml.bind-api")
Revise support for JSR-330 and Jakarta @Inject for autowiring test constructors Closes gh-29851
1 year ago
optional("javax.inject:javax.inject")
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
optional("junit:junit")
Replace dependency management plugin with built-in platform support
2 years ago
optional("net.sourceforge.htmlunit:htmlunit") {
exclude group: "commons-logging", module: "commons-logging"
}
Consistent dependency declarations
1 year ago
optional("org.apache.groovy:groovy")
optional("org.apache.tomcat.embed:tomcat-embed-core")
optional("org.aspectj:aspectjweaver")
optional("org.hamcrest:hamcrest")
optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
optional("org.junit.jupiter:junit-jupiter-api")
optional("org.junit.platform:junit-platform-launcher") // for AOT processing
Avoid accidental dependency on older version of Byte Buddy This commit allows Mockito-based tests in spring-test to work again in Eclipse IDE. This problem was uncovered while fixing gh-27365
3 years ago
optional("org.seleniumhq.selenium:htmlunit-driver") {
Exclude commons-logging dependency in spring-test
1 year ago
exclude group: "commons-logging", module: "commons-logging"
Avoid accidental dependency on older version of Byte Buddy This commit allows Mockito-based tests in spring-test to work again in Eclipse IDE. This problem was uncovered while fixing gh-27365
3 years ago
exclude group: "net.bytebuddy", module: "byte-buddy"
}
optional("org.seleniumhq.selenium:selenium-java") {
exclude group: "net.bytebuddy", module: "byte-buddy"
}
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
optional("org.skyscreamer:jsonassert")
Consistent dependency declarations
1 year ago
optional("org.testng:testng")
optional("org.xmlunit:xmlunit-matchers")
Upgrade to Gradle 7.2 This commit upgrades Gradle to 7.2. Gradle configuration names are updated accordingly. This also upgrades Gradle build plugins. See gh-26870
4 years ago
testImplementation(project(":spring-context-support"))
Consistent dependency declarations
1 year ago
testImplementation(project(":spring-core-test"))
Upgrade to Gradle 7.2 This commit upgrades Gradle to 7.2. Gradle configuration names are updated accordingly. This also upgrades Gradle build plugins. See gh-26870
4 years ago
testImplementation(project(":spring-oxm"))
testImplementation(testFixtures(project(":spring-beans")))
testImplementation(testFixtures(project(":spring-context")))
testImplementation(testFixtures(project(":spring-core")))
testImplementation(testFixtures(project(":spring-tx")))
testImplementation(testFixtures(project(":spring-web")))
Consistent dependency declarations
1 year ago
testImplementation("com.fasterxml.jackson.core:jackson-databind")
testImplementation("com.rometools:rome")
testImplementation("com.thoughtworks.xstream:xstream")
Polishing
1 year ago
testImplementation("de.bechte.junit:junit-hierarchicalcontextrunner")
Consistent dependency declarations
1 year ago
testImplementation("io.projectreactor.netty:reactor-netty-http")
Jakarta EE 9 migration Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles). Closes gh-22093 Closes gh-25354 Closes gh-26185 Closes gh-27423 See gh-27424
3 years ago
testImplementation("jakarta.annotation:jakarta.annotation-api")
testImplementation("jakarta.ejb:jakarta.ejb-api")
testImplementation("jakarta.interceptor:jakarta.interceptor-api")
testImplementation("jakarta.mail:jakarta.mail-api")
Polishing
1 year ago
testImplementation("jakarta.validation:jakarta.validation-api")
testImplementation("javax.cache:cache-api")
Replace dependency management plugin with built-in platform support
2 years ago
testImplementation("org.apache.httpcomponents:httpclient") {
exclude group: "commons-logging", module: "commons-logging"
}
Add test support to record async events, with Junit5 caveat This commit modifies the way the `@RecordApplicationEvents` annotation works in tests, allowing for capture of events from threads other than the main test thread (async events) and for the assertion of captured event from a separate thread (e.g. when using `Awaitility`). This is done by switching the `ApplicationEventsHolder` to use an `InheritedThreadLocal`. There is a mutual exclusion between support of asynchronous events vs support of JUnit5 parallel tests with the `@TestInstance(PER_CLASS)` mode. As a result, we favor the former and now `SpringExtension` will invalidate a test class that is annotated (or meta-annotated, or enclosed-annotated) with `@RecordApplicationEvents` AND `@TestInstance(PER_CLASS)` AND `@Execution(CONCURRENT)`. See gh-29827 Closes gh-30020
2 years ago
testImplementation("org.awaitility:awaitility")
Consistent dependency declarations
1 year ago
testImplementation("org.hibernate:hibernate-core-jakarta")
testImplementation("org.hibernate:hibernate-validator")
testImplementation("org.hsqldb:hsqldb")
testImplementation("org.junit.platform:junit-platform-testkit")
testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
testRuntimeOnly("org.glassfish:jakarta.el")
testRuntimeOnly("org.junit.support:testng-engine")
Upgrade to Gradle 7.2 This commit upgrades Gradle to 7.2. Gradle configuration names are updated accordingly. This also upgrades Gradle build plugins. See gh-26870
4 years ago
testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
Upgrade to Hamcrest 2.1 Closes gh-23467
5 years ago
exclude group: "junit", module: "junit"
}
Support custom properties file formats in @TestPropertySource Spring Framework 4.3 introduced the `PropertySourceFactory` SPI for use with `@PropertySource` on `@Configuration` classes; however, prior to this commit there was no mechanism to support custom properties file formats in `@TestPropertySource` for integration tests. This commit introduces support for configuring a custom `PropertySourceFactory` via a new `factory` attribute in `@TestPropertySource` in order to support custom file formats such as JSON, YAML, etc. For example, if you create a YamlPropertySourceFactory, you can use it in integration tests as follows. @SpringJUnitConfig @TestPropertySource(locations = "/test.yaml", factory = YamlPropertySourceFactory.class) class MyTestClass { /* ... /* } If a custom factory is not specified, traditional `*.properties` and `*.xml` based `java.util.Properties` file formats are supported, which was the existing behavior. Closes gh-30981
1 year ago
testRuntimeOnly("org.yaml:snakeyaml")
Move modules to independent build files The main `build.gradle` file contains now only the common build infrastructure; all module-specific build configurations have been moved to their own build file. Issue: SPR-15885
7 years ago
}
Ensure projects can be imported into Eclipse IDE with JDK 17 Prior to this commit, the Spring Framework projects could not be imported into Eclipse IDE when using JDK 17 to build the projects. The primary obstacle is the fact that Eclipse enforces a strict "no split packages between the unnamed module and a system module" rule when building with a "modular JDK" (such as JDK 17). Resources: - https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 - https://bugs.openjdk.java.net/browse/JDK-8215739 - http://mail.openjdk.java.net/pipermail/jigsaw-dev/2018-December/014077.html - https://stackoverflow.com/questions/51094274/eclipse-cant-find-xml-related-classes-after-switching-build-path-to-jdk-10/53824670#53824670 Since the bug (JDK-8215739) has not been fixed in OpenJDK, the strict "no split packages" rule does not apply to the Java compiler used in Spring Framework's Gradle build or the compiler in IntelliJ IDEA. Hence, this issue only arrises when building the framework in Eclipse IDE. This commit addresses this issue in the following affected projects. - spring-oxm: removal of the dependency on XPP3 which publishes javax.xml.namespace.QName as part of the JAR. The QName type is also published by the java.xml JDK 17 system module. To make the tests pass, we have switched to using the DomDriver instead of the XppDriver in our XStream tests. - spring-test: HtmlUnit has a transitive dependency on xml-apis which publishes several packages also published by java.xml JDK 17 system module. Thus, we have explicitly excluded the transitive dependency on xml-apis for our `optional` configuration. See gh-27407
3 years ago
// Prevent xml-apis from being used so that the corresponding XML APIs from
// the JDK's `java.xml` module are used instead. This allows spring-test to
// build in Eclipse IDE which fails to compile if there is a split package
// between a JDK system module and the unnamed module (for JARs on the
// classpath).
configurations.optional {
exclude group: "xml-apis", module: "xml-apis"
}
Migrate to TestNG Engine for the JUnit Platform in spring-test Prior to this commit, we had configured separate test tasks for JUnit and TestNG. In addition, we configured a standard `test` task that depended on the `junit` and `testNG` tasks, and we had an additional `aggregateTestReports` task that aggregated the reports from the JUnit and TestNG test tasks. Thanks to the introduction of the "TestNG Engine for the JUnit Platform", this commit simplifies our Gradle build in the spring-test module by running JUnit 4, JUnit Jupiter, and TestNG tests on the JUnit Platform in a single Gradle `test` task. See gh-27406
3 years ago
test {
description = "Runs JUnit 4, JUnit Jupiter, and TestNG tests."
Ensure aggregateTestReports task is UP-TO-DATE Prior to this commit, the standard Gradle `test` task was configured to execute all JUnit tests and had a dependency on the `testNG` task. In addition, the `aggregateTestReports` task depended on the results of the `test` and `testNG` tasks as input. Consequently, a subsequent execution of the `aggregateTestReports` task would not be considered UP-TO-DATE since the JUnit and TestNG results were both written to the same "test" reports folder. This commit introduces a new `junit` test task that allows JUnit and TestNG test output to be completely independent. The standard `test` task now depends on `junit` and `testNG` but does not execute any tests itself, and the `aggregateTestReports` task now depends on the individual `junit` and `testNG` results instead of on the mixed `test` results. See also: eec183ef2840d0e3cc20af01f69cda1adea7383e
5 years ago
useJUnitPlatform {
Migrate to TestNG Engine for the JUnit Platform in spring-test Prior to this commit, we had configured separate test tasks for JUnit and TestNG. In addition, we configured a standard `test` task that depended on the `junit` and `testNG` tasks, and we had an additional `aggregateTestReports` task that aggregated the reports from the JUnit and TestNG test tasks. Thanks to the introduction of the "TestNG Engine for the JUnit Platform", this commit simplifies our Gradle build in the spring-test module by running JUnit 4, JUnit Jupiter, and TestNG tests on the JUnit Platform in a single Gradle `test` task. See gh-27406
3 years ago
includeEngines "junit-vintage", "junit-jupiter", "testng"
Ensure aggregateTestReports task is UP-TO-DATE Prior to this commit, the standard Gradle `test` task was configured to execute all JUnit tests and had a dependency on the `testNG` task. In addition, the `aggregateTestReports` task depended on the results of the `test` and `testNG` tasks as input. Consequently, a subsequent execution of the `aggregateTestReports` task would not be considered UP-TO-DATE since the JUnit and TestNG results were both written to the same "test" reports folder. This commit introduces a new `junit` test task that allows JUnit and TestNG test output to be completely independent. The standard `test` task now depends on `junit` and `testNG` but does not execute any tests itself, and the `aggregateTestReports` task now depends on the individual `junit` and `testNG` results instead of on the mixed `test` results. See also: eec183ef2840d0e3cc20af01f69cda1adea7383e
5 years ago
excludeTags "failing-test-case"
}
Migrate to TestNG Engine for the JUnit Platform in spring-test Prior to this commit, we had configured separate test tasks for JUnit and TestNG. In addition, we configured a standard `test` task that depended on the `junit` and `testNG` tasks, and we had an additional `aggregateTestReports` task that aggregated the reports from the JUnit and TestNG test tasks. Thanks to the introduction of the "TestNG Engine for the JUnit Platform", this commit simplifies our Gradle build in the spring-test module by running JUnit 4, JUnit Jupiter, and TestNG tests on the JUnit Platform in a single Gradle `test` task. See gh-27406
3 years ago
// We use `include` instead of `filter.includeTestsMatching`, since
// the latter results in some tests being executed/reported
// multiple times.
Ensure aggregateTestReports task is UP-TO-DATE Prior to this commit, the standard Gradle `test` task was configured to execute all JUnit tests and had a dependency on the `testNG` task. In addition, the `aggregateTestReports` task depended on the results of the `test` and `testNG` tasks as input. Consequently, a subsequent execution of the `aggregateTestReports` task would not be considered UP-TO-DATE since the JUnit and TestNG results were both written to the same "test" reports folder. This commit introduces a new `junit` test task that allows JUnit and TestNG test output to be completely independent. The standard `test` task now depends on `junit` and `testNG` but does not execute any tests itself, and the `aggregateTestReports` task now depends on the individual `junit` and `testNG` results instead of on the mixed `test` results. See also: eec183ef2840d0e3cc20af01f69cda1adea7383e
5 years ago
include(["**/*Tests.class", "**/*Test.class"])
Exclude TestCase classes in spring-test build When not excluded, TestNG will pick up nested TestCase classes and run them. This commit therefore filters out `*TestCase` test classes from the build since these are not intended to be executed with the build. See gh-27406
3 years ago
filter.excludeTestsMatching("*TestCase")
Simplify Gradle test task configuration As an added bonus, AbstractViewTests is now executed in the build.
5 years ago
systemProperty("testGroups", project.properties.get("testGroups"))
Ensure aggregateTestReports task is UP-TO-DATE Prior to this commit, the standard Gradle `test` task was configured to execute all JUnit tests and had a dependency on the `testNG` task. In addition, the `aggregateTestReports` task depended on the results of the `test` and `testNG` tasks as input. Consequently, a subsequent execution of the `aggregateTestReports` task would not be considered UP-TO-DATE since the JUnit and TestNG results were both written to the same "test" reports folder. This commit introduces a new `junit` test task that allows JUnit and TestNG test output to be completely independent. The standard `test` task now depends on `junit` and `testNG` but does not execute any tests itself, and the `aggregateTestReports` task now depends on the individual `junit` and `testNG` results instead of on the mixed `test` results. See also: eec183ef2840d0e3cc20af01f69cda1adea7383e
5 years ago
// Java Util Logging for the JUnit Platform.
// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
}