Stéphane Nicoll
156237227c
Migrate MockMvc tests to MockMvcTester
...
See gh-41198
2024-07-03 15:09:10 +02:00
Phillip Webb
d411d4347f
Merge branch '3.3.x'
...
Closes gh-41222
2024-06-24 12:24:40 -07:00
Phillip Webb
726f71a1a8
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41221
2024-06-24 12:24:27 -07:00
Phillip Webb
57f452fec1
Disable ReactorResourceFactory use of global resources in tests
...
Add `ContextCustomizerFactory` to automatically disable the use of
`ReactorResourceFactory` global resources in tests.
Fixes gh-38199
2024-06-24 11:22:11 -07:00
Andy Wilkinson
b593734edd
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41191
2024-06-21 10:01:22 +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
Stéphane Nicoll
305bfb1641
Adapt to Mockito support in the Test Context Framework
...
This commit updates MockitoTestExecutionListener to not handle mocks
as this is already done in the listener provided by the core framework,
and registration can only happen once.
Integration tests have been left as-is to validate that the presence
of both listeners doesn't have an unwanted side effect.
See gh-41177
2024-06-20 20:18:07 +01:00
Stéphane Nicoll
2053e13c09
Adapt to new Placeholder resolution API
...
See gh-41177
2024-06-20 20:18:07 +01:00
Andy Wilkinson
6110e0ff43
Merge branch '3.2.x'
...
Closes gh-41184
2024-06-20 19:30:12 +01:00
Stéphane Nicoll
e9eeac9028
Use Spring Framework's NoOpResponseErrorHandler
...
See spring-projects/spring-framework#32750
Closes gh-41183
2024-06-20 18:28:36 +01:00
Phillip Webb
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
Phillip Webb
147240aa0c
Merge branch '3.2.x'
...
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2
Polish "Use method references when possible in test code"
...
See gh-40974
2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c
Use method references when possible in test code
...
See gh-40974
2024-06-11 12:58:00 -07:00
Phillip Webb
255bcc28e6
Merge branch '3.2.x'
...
Closes gh-41077
2024-06-11 10:48:52 -07:00
Piyal Ahmed
17adcfc180
Use constructor rather than Collection.addAll
...
See gh-41053
2024-06-11 09:39:45 -07:00
Moritz Halbritter
000869c25d
Merge branch '3.2.x'
...
Closes gh-41065
2024-06-11 15:01:29 +02:00
Donghoon Lee
8920c2f269
Fix typo in javadoc
...
See gh-41052
2024-06-11 15:01:06 +02:00
Andy Wilkinson
f355080dc8
Merge branch '3.2.x'
...
Closes gh-40855
2024-05-21 15:48:15 +01:00
Andy Wilkinson
486ceecc9a
Use the bean factory to get the type produced by a factory bean
...
Previously, we only looked at the OBJECT_TYPE_ATTRIBUTE on the
factory bean's definition. This did not work for situations
where the information's provided by the definition's target type
rather than the attribute.
Rather than manually considering the target type in addition to
the existing consideration of the attribute, we now ask the bean
factory for the type that will be produced by the factory bean
instead. This should insulate us from any changes and
enhancements in Framework in the future.
Fixes gh-40234
2024-05-21 15:27:59 +01:00
Moritz Halbritter
6697db257c
Merge branch '3.2.x'
...
Closes gh-40614
2024-05-02 11:56:21 +02:00
Moritz Halbritter
2183b47e62
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40612
2024-05-02 11:53:21 +02:00
Moritz Halbritter
1534bc8ad2
Polish "Avoid using OkHttp3ClientHttpRequestFactory in test"
...
See gh-40611
2024-05-02 11:45:23 +02:00
Stéphane Nicoll
20042576e9
Avoid using OkHttp3ClientHttpRequestFactory in test
...
See gh-40611
2024-05-02 11:45:20 +02:00
Phillip Webb
6963bd884b
Merge branch '3.2.x'
2024-04-18 12:53:26 -07:00
Phillip Webb
38af8cd362
Merge branch '3.1.x' into 3.2.x
2024-04-18 12:52:54 -07:00
Phillip Webb
20db2b54c7
Update copyright year of changed files
2024-04-18 12:52:29 -07:00
Scott Frederick
813507b791
Merge branch '3.2.x'
...
Closes gh-40166
2024-04-03 16:32:13 -05:00
Scott Frederick
1c2a43d1e6
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40165
2024-04-03 16:30:41 -05:00
Felix
8a42935dad
Apply instanceof pattern matching
...
See gh-40085
2024-04-03 16:30:01 -05:00
Moritz Halbritter
35b39d3a44
Make spring-test available to compile classpath of consumers of spring-boot-test
...
Closes gh-39901
2024-03-26 13:45:51 +01:00
Andy Wilkinson
102215ee96
Upgrade to HttpClient5 5.3.1
...
Closes gh-39703
2024-02-22 10:10:05 +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
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
Moritz Halbritter
acf758aea9
Merge branch '3.2.x'
2024-01-25 11:06:36 +01:00
Moritz Halbritter
c47430d842
Merge branch '3.1.x' into 3.2.x
2024-01-25 11:06:25 +01:00
Moritz Halbritter
df755db1f3
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-25 10:57:45 +01:00
Moritz Halbritter
9146ce5515
Merge branch '3.2.x'
2024-01-25 10:19:49 +01:00
Moritz Halbritter
36b70d7b16
Merge branch '3.1.x' into 3.2.x
2024-01-25 10:19:37 +01:00
Moritz Halbritter
930669888a
Add more integration tests for MockitoTestExecutionListener
2024-01-25 10:18:59 +01:00
Phillip Webb
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
Tobias Lippert
9cdd0c3776
Remove unnecessary semicolons
...
See gh-39259
2024-01-23 09:07:29 -08:00
Moritz Halbritter
43296d019e
Merge branch '3.2.x'
...
Closes gh-39273
2024-01-23 09:27:25 +01:00
