Commit Graph
917 Commits
Author SHA1 Message Date
Stefano Cordio f91c8b659c Add missing null check in ApplicationContextAssertProvider
See gh-50456

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2026-05-25 17:12:04 +02:00
Andy Wilkinson e96ca4af56 Update headers to use quotes consistently
Closes gh-50397
2026-05-14 14:59:43 +01:00
Andy Wilkinson e68440d419 Consider enclosing classes when finding imports on test classes
Fixes gh-49860
2026-04-09 16:05:17 +01:00
Lee Jiwon add1f9763e Fix minor Javadoc wording errors
Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com>

See gh-49735
2026-03-24 17:36:19 -07:00
Andy Wilkinson 7280d248e4 Modernize assertion message for no classes or locations
Closes gh-49518
2026-03-09 17:26:27 +00:00
Sam Brannen 7306fd04de Use MergedContextConfiguration.hasResources()
Simplify the code by using MergedContextConfiguration.hasResources().

See gh-49504
2026-03-09 17:01:38 +00:00
Andy Wilkinson 85b0e3bebf Polish "Fix typo in Javadoc for SpringBootTestAnnotation"
See gh-49505
2026-03-09 08:57:53 +00:00
Sam Brannen 29b82310d7 Fix typo in Javadoc for SpringBootTestAnnotation
See gh-49505
2026-03-09 08:57:46 +00:00
Yanming Zhou 147d3d763b Members declared in final classes should not be protected
See gh-49031

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-02-23 16:28:44 +01:00
Stefano Cordio 4e96538509 Fix non-existent assertion in Javadoc example of getFailure()
See gh-48973

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2026-01-27 08:08:43 +01:00
Phillip Webb 92263e7e35 Add checkstyle rule for AssertJ Assertions import
Add a rule to ensure we consistently use `assertThat` rather than
`Assertions.assertThat`.

See gh-48630
2026-01-06 12:34:12 -08:00
Stéphane Nicoll 918325aecc Polish "Use static imports for Assertions.assertThat() consistently"
See gh-48630
2026-01-06 12:23:07 +01:00
Johnny Lim 88f51fafee Use static imports for Assertions.assertThat() consistently
See gh-48630

Signed-off-by: Johnny Lim <izeye@naver.com>
2026-01-06 12:22:25 +01:00
Andy Wilkinson 5400539ba8 Merge branch '3.4.x' into 3.5.x
Closes gh-48499
2025-12-11 14:57:11 +00:00
Andy Wilkinson f64042b337 Remove duplicate @Configuration from test config class hierarchies
Closes gh-48498
2025-12-11 14:56:40 +00:00
Stéphane Nicoll ae3408f285 Detect JDK25-style main method in SpringBootTest
This commit adapts SpringBootTest when it has to use a main method to
detect package private main method as well as main methods that do not
have any arguments.

Closes gh-48271
2025-11-24 16:45:57 +01:00
Phillip Webb 0bb0d5370a Merge branch '3.4.x' into 3.5.x
Closes gh-48192
2025-11-19 10:34:56 -08:00
Phillip Webb 4625534e83 Force Testcontainers Docker API version for Docker 29.0.0+ compatibility
Add `docker-java.properties` to spring-boot-testcontainers and
`spring-boot-test` to force an API version upgrade.

Fixes gh-48104
2025-11-19 10:33:34 -08:00
Stéphane Nicoll 1ce1b7ee35 Merge branch '3.4.x' into 3.5.x
Closes gh-48105
2025-11-13 10:27:51 +01:00
Stéphane NicollandCatiaCorreia catia.correia97@gmail.com 9e656c1554 Remove unnecessary field initialization
Closes gh-45168

Co-authored-by: CatiaCorreia catia.correia97@gmail.com
2025-11-13 10:21:05 +01:00
Stéphane Nicoll 5a67f5707e Replace calls to deprecated setConnectionTimeout method
Replace calls to the recently deprecated `setConnectionTimeout` method
of `HttpComponentsClientHttpRequestFactoryBuilder`.

This commit also introduces a `withConnectionConfigCustomizer` and
allows connection timeouts settings to be used.

Closes gh-48031
2025-11-10 15:32:05 +01:00
Phillip Webb 0ca8f6d03f Replace calls to deprecated setConnectionTimeout method
Replace calls to the recently deprecated `setConnectionTimeout` method
of `HttpComponentsClientHttpRequestFactory` and align the HTTP client
builder with the HTTP async client builder.

This commit also introduces a `withConnectionConfigCustomizer` and
allows connection timeouts settings to be used.

Closes gh-47940
2025-11-04 14:12:55 -08:00
Andy Wilkinson c51c478501 Merge branch '3.4.x' into 3.5.x
Closes gh-47859
2025-10-29 10:06:20 +00:00
Andy Wilkinson d2a349868e Limit Kotlin API docs to Kotlin code
Previously, the Kotlin API docs included Java APIs. This commit
corrects this by suppressing all Dokkatoo source sets other than
main (main in src/main/kotlin, javaMain is src/main/java).

Dokkatoo is sensitive to the order in which plugins are applied. This
commit adapts to the sensitivity by changing the order in which
the Dokatoo and Kotlin JVM plugins are applied. This prevents the
Dokatoo plugin for overwriting the configuration that's applied by
our Kotlin conventions.

Closes gh-47763
2025-10-29 10:02:34 +00:00
Phillip Webb 7c16f9ac20 Merge branch '3.4.x' into 3.5.x
Closes gh-47748
2025-10-21 11:28:35 -07:00
Tran Ngoc Nhan 4bebd47c4e Fix typos
See gh-47747
2025-10-21 11:27:41 -07:00
Andy Wilkinson bb0fd0c778 Update javadoc of TestRestTemplate after change to redirect behavior
Closes gh-47474
2025-10-10 08:41:43 +01:00
Andy Wilkinson 2fa20f3def Merge branch '3.4.x' into 3.5.x
Closes gh-46942
2025-08-22 11:41:50 +01:00
Andy Wilkinson e595327610 Polish "Clarify Javadoc of Customizer interfaces about overriding behavior"
See gh-46938
2025-08-22 11:39:15 +01:00
Stéphane Nicoll b827f88f13 Merge branch '3.4.x' into 3.5.x
Closes gh-46872
2025-08-18 13:57:58 +02:00
Stefano Cordio c7b659cb7e Replace AssertJ internal APIs with alternative implementations
See gh-46855

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2025-08-18 13:57:27 +02:00
Phillip Webb a91ff37b92 Merge branch '3.4.x' into 3.5.x
Closes gh-46721
2025-08-08 14:07:10 +01:00
Phillip Webb 742bcc568d Polish 'Fix race condition in OutputCapture'
See gh-46685
2025-08-08 14:02:18 +01:00
Daniel Schmidt 10b8a43291 Fix race condition in OutputCapture
Update `OutputCapture` to fix a race condition that could occur due to the
cache. Prior to this commit, when data was written whilst simultaneously
being read, any subsequent reading of data might miss the last output.

See gh-46685

Signed-off-by: Daniel Schmidt <daniel-github@ad-schmidt.de>
2025-08-08 13:21:43 +01:00
Phillip Webb 61c2d0766b Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:21:58 -07:00
Phillip Webb 3aeb18d618 Add license header to gradle files
See gh-46065
2025-06-20 17:20:50 -07:00
Phillip Webb 198745fe4f Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:19:38 -07:00
Phillip Webb 9863d3da66 Add license header to kotlin files
See gh-46065
2025-06-20 17:18:53 -07:00
Phillip Webb a37c84b7c5 Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:14:59 -07:00
Phillip Webb d66b28fcba Update end copyright year to 'present'
See gh-46065
2025-06-20 17:12:38 -07:00
Andy Wilkinson a9cc83dc8f Merge branch '3.4.x'
Closes gh-45646
2025-05-23 09:32:09 +01:00
Andy Wilkinson 492a4abd70 Merge branch '3.3.x' into 3.4.x
Closes gh-45645
2025-05-23 09:29:23 +01:00
Andy Wilkinson 7628ae8503 Check Kotlin code using Detekt
Closes gh-45583
2025-05-23 09:22:08 +01:00
Phillip Webb 31c864b769 Merge branch '3.4.x' 2025-05-20 17:20:47 -07:00
Phillip Webb 9ae9146661 Merge branch '3.3.x' into 3.4.x 2025-05-20 17:20:34 -07:00
Phillip Webb 2b2228eba5 Update copyright year of changed files 2025-05-20 17:20:07 -07:00
Stéphane Nicoll 921b9fd6ac Merge branch '3.4.x'
Closes gh-45595
2025-05-18 09:28:38 +02:00
Stéphane Nicoll fab15af876 Merge branch '3.3.x' into 3.4.x
Closes gh-45594
2025-05-18 09:26:57 +02:00
Johnny Lim 0a54804a0f Polish
See gh-45592

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-05-18 09:20:33 +02:00
Phillip Webb 736ff7e3e2 Merge branch '3.4.x' 2025-04-28 12:20:19 -07:00