732 Commits

Author SHA1 Message Date
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
Phillip Webb
f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Phillip Webb
2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb
78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb
b83e7b42bb Update copyright year of changed files 2023-09-20 16:05:44 -07:00
Stephane Nicoll
77a85fd180 Fix deprecation in Spring Framework 2023-09-13 18:04:55 +02:00
Moritz Halbritter
bced103517 Merge branch '3.1.x'
Closes gh-37208
2023-09-06 14:44:21 +02:00
Moritz Halbritter
768dfb2c63 Merge branch '3.0.x' into 3.1.x
Closes gh-37207
2023-09-06 14:44:13 +02:00
Moritz Halbritter
ffed8b0502 Merge branch '2.7.x' into 3.0.x
Closes gh-37206
2023-09-06 14:43:36 +02:00
Yanming Zhou
4c39cc2314 Continue polishing
See commit 947e330e9d4cfc537213554f855f6c551e4d3652

See gh-37166
2023-09-06 14:38:57 +02:00
Moritz Halbritter
8f78acd548 Merge branch '3.1.x' 2023-09-05 15:28:23 +02:00
Moritz Halbritter
1962f4ecb7 Merge branch '3.0.x' into 3.1.x 2023-09-05 15:24:25 +02:00
Moritz Halbritter
a69ff3bd59 Merge branch '2.7.x' into 3.0.x 2023-09-05 15:21:51 +02:00
Moritz Halbritter
76e51bc92f Only enable needed Couchbase services in integration tests 2023-09-05 15:10:12 +02:00
Moritz Halbritter
947e330e9d Polish "Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices"
See gh-37122
2023-08-31 13:15:50 +02:00
Yanming Zhou
b8eec2a8a4 Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices
See gh-37122
2023-08-31 13:07:10 +02:00
Andy Wilkinson
f6c88662b4 Merge branch '3.1.x'
Closes gh-37144
2023-08-30 13:36:01 +01:00
Andy Wilkinson
e6fcde4af5 Merge branch '3.0.x' into 3.1.x
Closes gh-37143
2023-08-30 13:35:40 +01:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
Andy Wilkinson
2de98a84bc Polish "Polish code and javadoc"
See gh-37112
2023-08-30 13:31:58 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Phillip Webb
8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Andy Wilkinson
dc45532c94 Avoid triggering second context creation when first attempt failed
Closes gh-24888
2023-08-10 14:39:28 +01:00
Moritz Halbritter
b5a48e926d Handle timeout of latch await in tests 2023-08-08 13:12:48 +02:00
Moritz Halbritter
de57b5f4a4 Call remove() on ThreadLocal in SpringBootMockMvcBuilderCustomizer 2023-08-08 13:12:48 +02:00
Stephane Nicoll
f5b3bc7a9f Merge branch '3.1.x'
Closes gh-36775
2023-08-07 16:49:18 +02:00