73150b799a
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42772
2024-10-17 17:58:11 +02:00
ce106eb43c
Remove calls to deprecated Project.getBuildDir() in Gradle files
...
Closes gh-42739
2024-10-17 17:46:17 +02:00
c018c43886
Merge branch '3.3.x'
...
Closes gh-42736
2024-10-17 13:44:25 +02:00
8efe6e02d9
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42735
2024-10-17 13:38:03 +02:00
a3060652f8
Call String.toLowerCase and .toUppercase with explicit locale
...
Closes gh-42719
2024-10-17 13:20:39 +02:00
0c0acb4339
Polish "Use RootBeanDefinition if possible"
...
This commit adapts code that was using GenericBeanDefinition to use
RootBeanDefinition instead. Spring Framework recommend to use
RootBeanDefinition if it's pre-determined as root bean.
See gh-42611
2024-10-15 09:45:28 +02:00
7427304b3d
Use RootBeanDefinition if possible
...
This commit adapts code that was using GenericBeanDefinition to use
RootBeanDefinition instead. Spring Framework recommend to use
RootBeanDefinition if it's pre-determined as root bean.
See gh-42611
2024-10-15 09:35:56 +02:00
a40ae49a76
Upgrade to Testcontainers 1.20.2
...
Closes gh-42670
2024-10-14 16:25:57 +02:00
1585c5a109
Polish
...
See gh-42503
2024-10-03 07:33:40 +02:00
7b3077280c
Merge branch '3.3.x'
...
Closes gh-42441
2024-09-24 14:32:48 -07:00
100bedc07d
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42440
2024-09-24 14:29:09 -07:00
ad72411e2b
Apply conventions plugin to all subprojects
...
Closes gh-42438
2024-09-24 14:26:32 -07:00
3723a9e040
Support Testcontainer JDBC URLs with `Replace.NON_TEST`
...
Update `TestDatabaseAutoConfiguration` so that Testcontainer JDBC URLs
are also detected when using `Replace.NON_TEST`.
Closes gh-35253
2024-09-12 13:02:23 -07:00
8628f7334f
Ensure `@AutoConfigureTestDatabase` does not replace test databases
...
Update `@AutoConfigureTestDatabase` support so that by default test
databases are not replaced.
Fixes gh-35253
2024-09-11 21:01:54 -07:00
e7faca3bbb
Add support for Testcontainer Redis
...
Add support for the official `com.redis:testcontainers-redis` container.
See gh-41450
2024-08-29 19:23:40 -07:00
aa4e22809b
Merge branch '3.3.x'
2024-08-19 16:31:42 +02:00
9c2d388ca8
Merge branch '3.2.x' into 3.3.x
2024-08-19 16:31:17 +02:00
8a253d1db7
Fix formatting
2024-08-19 16:28:47 +02:00
501a8b2a96
Merge branch '3.3.x'
...
Closes gh-41936
2024-08-19 16:21:14 +02:00
1d062e0f41
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41935
2024-08-19 16:21:03 +02:00
f1e5108b59
Improve Javadoc of slice test annotations
...
This commit harmonizes the phrasing that we use to describe what
components are considered for scanning when a slice test is enabled.
This makes the description of the default filter explicit, with an
exhaustive description of the annotations and/or base classes.
Closes gh-41914
2024-08-19 16:19:18 +02:00
46150bae89
Merge branch '3.3.x'
...
Closes gh-41858
2024-08-14 17:20:59 +02:00
2a84fe5760
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41857
2024-08-14 16:47:52 +02:00
575abf743c
Merge branch '3.3.x'
...
Closes gh-41618
2024-07-25 16:36:31 +01:00
163581cfe8
Rename DataLdapTestIntegrationTests to remove clash
...
Closes gh-41617
2024-07-25 16:35:37 +01:00
e201b94d4f
Merge branch '3.3.x'
...
Closes gh-41616
2024-07-25 16:17:52 +01:00
c642f6d268
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41613
2024-07-25 16:16:35 +01:00
5f666eec5b
Reduce warnings reported by Eclipse
...
Closes gh-41598
2024-07-25 14:55:00 +01:00
000600c68a
Merge branch '3.3.x'
2024-07-22 18:41:53 +01:00
36b1214feb
Merge branch '3.2.x' into 3.3.x
2024-07-22 18:30:45 +01:00
61dc82d836
Update copyright year of changed files
2024-07-22 18:16:19 +01:00
d4dd9f76e0
Merge branch '3.3.x'
...
Closes gh-41525
2024-07-16 16:49:14 +02:00
31d2bebd49
Add support for ServiceConnection in DataLdapTest
...
See gh-41325
2024-07-16 16:48:21 +02:00
cddf92e047
Polish "Deprecate @MockBean and @SpyBean"
...
See gh-39864
2024-07-12 13:49:11 +01:00
375b3b16a0
Remove APIs that were deprecated for removal in 3.4.0
...
Closes gh-41435
2024-07-10 13:31:21 +01:00
156237227c
Migrate MockMvc tests to MockMvcTester
...
See gh-41198
2024-07-03 15:09:10 +02:00
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
5b7365b63b
Merge branch '3.3.x'
...
Closes gh-41258
2024-06-27 10:25:32 +01:00
b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
843de3adbc
Update spring-boot-test-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:41 +01:00
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
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
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
6bb8a11295
Merge branch '3.2.x'
...
Closes gh-40517
2024-04-25 11:07:36 +02:00
26f1bbb634
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40516
2024-04-25 11:07:25 +02:00
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
6963bd884b
Merge branch '3.2.x'
2024-04-18 12:53:26 -07:00
12e004f131
Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
...
This reverts commit 06f5ab162f
2024-04-12 11:19:16 +01:00
1ea6f2f51f
Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""
...
This reverts commit 3b76165f4e
2024-04-11 17:06:03 +01:00
93c8513a78
Merge branch '3.2.x'
...
See gh-40224
2024-04-11 16:56:41 +01:00
7d3ea3f06f
Merge branch '3.1.x' into 3.2.x
...
See gh-40212
2024-04-11 16:56:22 +01:00
3b76165f4e
Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
...
This reverts commit 06f5ab162f
2024-04-11 16:55:24 +01:00
3699bcfb87
Merge branch '3.2.x'
...
See gh-40224
2024-04-09 09:09:12 +01:00
3bb7baf90f
Merge branch '3.1.x' into 3.2.x
...
See gh-40212
2024-04-09 09:07:52 +01:00
06f5ab162f
Exclude unwanted javax.inject dependency from Data Couchbase
...
See gh-40200
2024-04-09 09:07:13 +01:00
412b8dd548
Polish
...
See gh-39910
2024-03-15 11:25:16 +01:00
a01e068059
Start building against Micrometer 1.13.0 snapshots
...
See gh-39889
2024-03-12 09:28:27 +00:00
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
4a1a98c037
Apply @AutoConfigureJson to test slices
...
See gh-39253
2024-02-16 10:10:20 +01:00
51991d6f41
Merge branch '3.2.x'
...
Closes gh-39536
2024-02-13 13:11:50 -06:00
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
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
ddb769bf7f
Polish 'Simplify conditionals'
...
See gh-39259
2024-01-23 09:47:07 -08:00
65a1ff84e6
Simplify conditionals
...
See gh-39259
2024-01-23 09:07:40 -08:00
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
dbfd038a4d
Validate combined RestTemplate and RestClient usage in mock REST config
...
Fixes gh-38820
2024-01-17 12:05:18 -06:00
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
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
175b6473c7
Polish
...
See gh-38389
2023-11-22 10:16:19 +01:00
0ef87f5102
Merge branch '3.1.x'
2023-11-13 10:42:56 -08:00
b902bf6aca
Merge branch '3.0.x' into 3.1.x
2023-11-13 10:42:32 -08:00
09e5a2f24a
Update copyright year of changed files
2023-11-13 10:42:26 -08:00
d59b385304
Merge branch '3.1.x'
...
Closes gh-38226
2023-11-06 10:27:50 +01:00
3560a13d57
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38225
2023-11-06 10:27:42 +01:00
d7ab153559
Use switch expression where feasible
...
See gh-38217
2023-11-06 10:27:04 +01:00
77218a644e
Merge branch '3.1.x'
2023-11-02 14:16:37 -07:00
afa4d274c2
Merge branch '3.0.x' into 3.1.x
2023-11-02 14:14:19 -07:00
8d53caa1c6
Merge branch '2.7.x' into 3.0.x
2023-11-02 14:13:47 -07:00
54313d1962
Update copyright year of changed files
2023-11-02 14:13:38 -07:00
607ed86edb
Merge branch '3.0.x' into 3.1.x
2023-10-31 10:23:01 +01:00
1f41179a88
Polish SpringBootMockMvcBuilderCustomizer
2023-10-31 09:49:01 +01:00
97c2311dee
Merge branch '3.1.x'
...
Closes gh-38114
2023-10-30 11:14:01 +00:00
3be8475089
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38113
2023-10-30 11:13:43 +00:00
aaa26c90a8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38112
2023-10-30 11:13:25 +00:00
f78dcac56f
Clarify that @AutoConfigureWebTestClient uses mock infrastructure
...
Closes gh-29890
2023-10-30 11:13:03 +00:00
0950d4416a
Pass in filter's name when adding to MockMvc
...
Closes gh-38001
2023-10-24 12:39:42 +01:00
daa903ab31
Add filters to MockMvc with their init params and dispatcher types
...
Closes gh-37835
2023-10-17 17:54:36 +01:00
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
f55184a998
Update copyright year of changed files
2023-09-20 17:16:31 -07:00
2075f6c685
Merge branch '3.1.x'
2023-09-20 17:16:13 -07:00
78eb8f90d1
Merge branch '3.0.x' into 3.1.x
2023-09-20 17:12:27 -07:00
9b5062e5bb
Merge branch '2.7.x' into 3.0.x
2023-09-20 17:06:55 -07:00
b83e7b42bb
Update copyright year of changed files
2023-09-20 16:05:44 -07:00
77a85fd180
Fix deprecation in Spring Framework
2023-09-13 18:04:55 +02:00
Moritz Halbritter
Stéphane Nicoll
Yanming Zhou
Johnny Lim
Phillip Webb
Scott Frederick
Andy Wilkinson
Eddú Meléndez
Wzy19930507
Tobias Lippert
Phillip Webb
Moritz Halbritter
Andy Wilkinson
Scott Frederick
Stephane Nicoll