Commit Graph

716 Commits

Author SHA1 Message Date
Stéphane Nicoll
156237227c Migrate MockMvc tests to MockMvcTester
See gh-41198
2024-07-03 15:09:10 +02:00
Stéphane Nicoll
e5859aedaf Add auto-configuration for MockMvcTester
This commit adds auto-configuration and documentation for MockMvcTester,
a wrapper of MockMvc that provides AssertJ integration as well as a
fluent API to build requests. The main differences compared to the
regular MockMvc are as follows:

* No need for static imports for building requests and define assertions
* No need to handle unchecked exception as they can be asserted instead
* Support for converting the response body to data types

Closes gh-41198
2024-07-03 15:09:10 +02:00
Andy Wilkinson
5b7365b63b Merge branch '3.3.x'
Closes gh-41258
2024-06-27 10:25:32 +01:00
Andy Wilkinson
b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson
843de3adbc Update spring-boot-test-autoconfigure to use docker-test plugin
See gh-41228
2024-06-26 19:46:41 +01:00
Stéphane Nicoll
17ca0421e7 Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20
Closes gh-41178
Closes gh-41179
2024-06-20 20:18:23 +01:00
Phillip Webb
905d6b96d0 Merge branch '3.2.x'
Closes gh-41166
2024-06-19 22:30:58 -07:00
Andy Wilkinson
491f34d25c Improve container test code
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.

Closes gh-41164

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
Moritz Halbritter
6bb8a11295 Merge branch '3.2.x'
Closes gh-40517
2024-04-25 11:07:36 +02:00
Moritz Halbritter
26f1bbb634 Merge branch '3.1.x' into 3.2.x
Closes gh-40516
2024-04-25 11:07:25 +02:00
Moritz Halbritter
2e906c4720 Catch exceptions thrown during String format when collecting diagnostics
Registers the LoggingLinesWriter only if debug logging is actually
enabled.

Closes gh-40500
2024-04-25 11:06:31 +02:00
Phillip Webb
6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07:00
Johnny Lim
412b8dd548 Polish
See gh-39910
2024-03-15 11:25:16 +01:00
Andy Wilkinson
a01e068059 Start building against Micrometer 1.13.0 snapshots
See gh-39889
2024-03-12 09:28:27 +00:00
Phillip Webb
f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Wzy19930507
4a1a98c037 Apply @AutoConfigureJson to test slices
See gh-39253
2024-02-16 10:10:20 +01:00
Scott Frederick
51991d6f41 Merge branch '3.2.x'
Closes gh-39536
2024-02-13 13:11:50 -06:00
Scott Frederick
720e9cef16 Make RestTemplateBuilder more compatible with RestClient.Builder
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.

With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.

Fixes gh-39317
2024-02-13 13:10:55 -06:00
Moritz Halbritter
7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code
See gh-39259
2024-01-23 10:18:50 -08:00
Phillip Webb
ddb769bf7f Polish 'Simplify conditionals'
See gh-39259
2024-01-23 09:47:07 -08:00
Tobias Lippert
65a1ff84e6 Simplify conditionals
See gh-39259
2024-01-23 09:07:40 -08:00
Tobias Lippert
def7523398 Inline redundant if statements
See gh-39259
2024-01-23 09:07:35 -08:00
Scott Frederick
dbfd038a4d Validate combined RestTemplate and RestClient usage in mock REST config
Fixes gh-38820
2024-01-17 12:05:18 -06:00
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter
198dbb4a45 Auto-configure observatibility beans in sliced tests
If @AutoConfigureObservability is applied to a sliced test, it
auto-configures:

- An in-memory MeterRegistry
- A no-op Tracer
- An ObservationRegistry

Closes gh-38568
2023-12-12 11:29:43 +01:00
Johnny Lim
175b6473c7 Polish
See gh-38389
2023-11-22 10:16:19 +01:00
Phillip Webb
0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Phillip Webb
b902bf6aca Merge branch '3.0.x' into 3.1.x 2023-11-13 10:42:32 -08:00
Phillip Webb
09e5a2f24a Update copyright year of changed files 2023-11-13 10:42:26 -08:00
Moritz Halbritter
d59b385304 Merge branch '3.1.x'
Closes gh-38226
2023-11-06 10:27:50 +01:00
Moritz Halbritter
3560a13d57 Merge branch '3.0.x' into 3.1.x
Closes gh-38225
2023-11-06 10:27:42 +01:00
Yanming Zhou
d7ab153559 Use switch expression where feasible
See gh-38217
2023-11-06 10:27:04 +01:00
Phillip Webb
77218a644e Merge branch '3.1.x' 2023-11-02 14:16:37 -07:00
Phillip Webb
afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb
8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb
54313d1962 Update copyright year of changed files 2023-11-02 14:13:38 -07:00
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
1f41179a88 Polish SpringBootMockMvcBuilderCustomizer 2023-10-31 09:49:01 +01:00
Andy Wilkinson
97c2311dee Merge branch '3.1.x'
Closes gh-38114
2023-10-30 11:14:01 +00:00
Andy Wilkinson
3be8475089 Merge branch '3.0.x' into 3.1.x
Closes gh-38113
2023-10-30 11:13:43 +00:00
Andy Wilkinson
aaa26c90a8 Merge branch '2.7.x' into 3.0.x
Closes gh-38112
2023-10-30 11:13:25 +00:00
Andy Wilkinson
f78dcac56f Clarify that @AutoConfigureWebTestClient uses mock infrastructure
Closes gh-29890
2023-10-30 11:13:03 +00:00
Andy Wilkinson
0950d4416a Pass in filter's name when adding to MockMvc
Closes gh-38001
2023-10-24 12:39:42 +01:00
Andy Wilkinson
daa903ab31 Add filters to MockMvc with their init params and dispatcher types
Closes gh-37835
2023-10-17 17:54:36 +01:00
Scott Frederick
ff99de49c4 Configure a RestClient.Builder with RestClientTest
This commit adds support for configuring a `RestClient.Builder` and
`MockRestServiceServer` support for the `RestClient` when using
`@RestClientTest` sliced tests.

Closes gh-37033
2023-09-29 15:07:38 -05:00