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
bced103517
Merge branch '3.1.x'
...
Closes gh-37208
2023-09-06 14:44:21 +02:00
768dfb2c63
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37207
2023-09-06 14:44:13 +02:00
ffed8b0502
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37206
2023-09-06 14:43:36 +02:00
4c39cc2314
Continue polishing
...
See commit 947e330e9d
2023-09-06 14:38:57 +02:00
8f78acd548
Merge branch '3.1.x'
2023-09-05 15:28:23 +02:00
1962f4ecb7
Merge branch '3.0.x' into 3.1.x
2023-09-05 15:24:25 +02:00
a69ff3bd59
Merge branch '2.7.x' into 3.0.x
2023-09-05 15:21:51 +02:00
76e51bc92f
Only enable needed Couchbase services in integration tests
2023-09-05 15:10:12 +02:00
947e330e9d
Polish "Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices"
...
See gh-37122
2023-08-31 13:15:50 +02:00
b8eec2a8a4
Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices
...
See gh-37122
2023-08-31 13:07:10 +02:00
f6c88662b4
Merge branch '3.1.x'
...
Closes gh-37144
2023-08-30 13:36:01 +01:00
e6fcde4af5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37143
2023-08-30 13:35:40 +01:00
a8e37b5cc5
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37142
2023-08-30 13:34:12 +01:00
2de98a84bc
Polish "Polish code and javadoc"
...
See gh-37112
2023-08-30 13:31:58 +01:00
6d9ce8a3b5
Polish code and javadoc
...
See gh-37112
2023-08-30 13:31:58 +01:00
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00
dc45532c94
Avoid triggering second context creation when first attempt failed
...
Closes gh-24888
2023-08-10 14:39:28 +01:00
b5a48e926d
Handle timeout of latch await in tests
2023-08-08 13:12:48 +02:00
de57b5f4a4
Call remove() on ThreadLocal in SpringBootMockMvcBuilderCustomizer
2023-08-08 13:12:48 +02:00
f5b3bc7a9f
Merge branch '3.1.x'
...
Closes gh-36775
2023-08-07 16:49:18 +02:00
3e72b8625d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36774
2023-08-07 16:48:50 +02:00
56535d804c
Rename WebDriverContextCustomizerFactory's customizer
...
Closes gh-36416
2023-08-07 16:44:16 +02:00
1a8b8ce26e
Revert "Revise synchronized blocks"
...
This reverts commit 497bbf9c2d
2023-08-03 17:26:31 +02:00
497bbf9c2d
Revise synchronized blocks
...
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter
Closes gh-36670
2023-08-03 09:23:46 +02:00
0646eabd4a
Merge branch '3.1.x'
...
Closes gh-36665
2023-08-01 20:03:25 +01:00
92361b5545
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36664
2023-08-01 20:03:01 +01:00
51b81ced6f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36663
2023-08-01 20:01:20 +01:00
28b3054a9e
Try to stabilize DataCouchbaseTestIntegrationTests
...
Closes gh-36662
2023-08-01 19:58:28 +01:00
806aa45279
Merge branch '3.1.x'
...
Closes gh-36661
2023-08-01 18:14:03 +01:00
0d646d7c26
Polish "Support ServiceConnection beans in slice tests"
...
See gh-36037
2023-08-01 18:12:53 +01:00
4dfb60c9a3
Support ServiceConnection beans in slice tests
...
Previously, to use `@ServiceConnection` on a `@Bean` method in a sliced
test required ServiceConnectionAutoConfiguration to be imported using
`@ImportAutoConfiguration`. This commit removes the need for this
import by registering ServiceConnectionAutoConfiguration in specific
slice test annotations.
See gh-36037
2023-08-01 18:09:57 +01:00
96c9915f12
Polish
...
See gh-36565
2023-07-26 10:00:56 +02:00
5a9ca67fba
Start building against Spring Framework 6.2.0-M2 snapshots
...
See gh-36198
2023-07-04 10:20:33 +01:00
47cc65d912
Merge branch '3.1.x'
...
Closes gh-36056
2023-06-23 16:12:58 -06:00
321c526bf7
Add SslAutoConfiguration to slice test annotations
...
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.
See gh-36038
2023-06-23 15:51:42 -06:00
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
27add2bbe3
Rework @AutoConfigureObservability and tracing auto-configurations
...
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.
This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.
Closes gh-35354
2023-06-16 14:09:10 +02:00
c00e6ebbdf
Merge branch '3.0.x'
...
Closes gh-35360
2023-05-09 11:23:05 +02:00
1c87fcb806
Add property to disable DisableObservabilityContextCustomizer
...
Closes gh-35009
2023-05-09 11:21:53 +02:00
a474e54cf3
Merge branch '3.0.x'
...
Closes gh-35244
2023-05-05 16:20:41 -05:00
cf180fa1cc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35243
2023-05-05 16:07:23 -05:00
5d91c24f63
Update Couchbase image tag used in tests
...
Closes gh-35228
2023-05-05 14:45:58 -05:00
735c43ce9b
Merge branch '2.7.x' into 3.0.x
2023-05-02 14:38:48 +02:00
312f0c17ed
Set initial ElasticSearch heap size in integration tests
2023-05-02 14:37:13 +02:00
944d77491b
Set initial heap size for ElasticSearch integration tests
2023-05-02 14:25:35 +02:00
1ce88f25b4
Merge branch '3.0.x'
2023-05-02 14:08:37 +02:00
037cb8c5b0
Merge branch '2.7.x' into 3.0.x
2023-05-02 13:57:37 +02:00
c1cef099d2
Limit maximum heap of ElasticSearch in tests
2023-05-02 13:40:59 +02:00
d7a9f87b64
Disable Neo4j tests on aarch64 linux and mac
...
See gh-35228
2023-05-02 13:40:59 +02:00
9f109fe785
Disable Couchbase integration tests on aarch64 linux and mac
...
See gh-35228
2023-05-02 13:40:59 +02:00
81a972af8d
Refactor testcontainers service connections
...
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.
A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.
Closes gh-35017
2023-04-17 00:45:39 -07:00
11dac5b5b7
Create dedicated spring-boot-testcontainers module
...
Create a dedicated testcontainers module containing the service
connectors code.
Closes gh-34757
2023-04-17 00:42:31 -07:00
2951cc7594
Polish
2023-04-17 00:42:28 -07:00
d4980ea993
Always define connection details beans
...
Closes gh-34776
2023-04-13 18:02:35 +01:00
463701db18
Merge branch '3.0.x'
2023-04-10 16:22:57 -07:00
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
2a52c47386
Merge branch '3.0.x'
...
Closes gh-34870
2023-04-05 16:58:03 +02:00
ace8cff1b3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34869
2023-04-05 16:57:44 +02:00
9107c5cae3
Avoid repeated class lookups in tests
...
See gh-34613
2023-04-05 16:40:21 +02:00
d8d6cb7323
Improve diagnostics with @ServiceConnection on non-static field
...
Closes gh-34795
2023-03-28 10:44:17 +01:00
2267430bdb
Find service connections declaring in enclosing classes
...
Fixes gh-34790
2023-03-28 10:24:11 +01:00
cd17d92eac
Merge branch '3.0.x'
...
Closes gh-34782
2023-03-27 18:05:26 +01:00
d6dbf300ab
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34781
2023-03-27 18:05:03 +01:00
5669ea69d0
Consider properties on outer class in nested sliced tests
...
Prior to this commit, properties configured using the properties
attribute of a `@…Test` sliced test annotation would not be considered
when processed a `@Nested` test class. This would lead to the nested
class not reusing its outer class's application context due to the
two having different property configuration.
Fixes gh-33317
2023-03-27 17:58:51 +01:00
95f45eab1f
Create service connections from Testcontainers-managed containers
...
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.
See gh-34658
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
58e7cae20f
Merge branch '2.7.x' into 3.0.x
2023-02-22 13:36:01 -08:00
737ef61456
Enable and fix GraphQlTestIntegrationTests
2023-02-22 13:34:40 -08:00
e04c09ceae
Merge branch '2.7.x' into 3.0.x
2023-02-22 00:50:18 -08:00
891ce3bd1b
Disable recently renamed tests
2023-02-22 00:49:23 -08:00
01e8c42c16
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:55:34 -08:00
3651ba348d
Fix checkstyle test violations
2023-02-21 23:49:56 -08:00
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2023-01-31 10:20:06 +01:00
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00
7c508fa324
Update copyright year of changed files
2023-01-18 15:37:58 -08:00
94f4a4396c
Merge branch '2.7.x'
...
Closes gh-33880
2023-01-18 17:35:52 +01:00
e8d809fe65
Replace 'via' with 'over' or 'through' in the documentation
...
Closes gh-33878
2023-01-18 16:56:42 +01:00
a2ac38e203
Update copyright year of changed files
2023-01-09 15:46:07 -08:00
cf6493f65c
Simplify AssertJ assertions and also make them more readable
...
See gh-33653
2023-01-09 11:10:20 +01:00
f588793445
Update copyright year of changed files
2022-12-22 01:00:42 -08:00
532fed3147
Increase couchbase connection timeout for tests
2022-12-22 00:49:04 -08:00
08659baeba
Polish away public modifier on tests
2022-12-16 16:08:44 +01:00
725337f976
Make fields final
...
Closes gh-33537
2022-12-16 14:28:44 +01:00
928df41f61
Start building against Reactor 2022.0.1 SNAPSHOTs
...
See gh-33475
2022-12-07 14:45:42 +01:00
ce33ec19cd
Start building against Spring GraphQL 1.1.1-SNAPSHOT
...
See gh-33477
2022-12-07 14:43:04 +01:00
fad610ef72
Add factory for NoopTracer instead of using instance supplier
...
Closes gh-33298
2022-11-22 14:02:57 +01:00
6027508cf7
Polish
...
See gh-33108
2022-11-16 10:00:36 +01:00
d34ccb3880
Avoid duplicate test database replacement in native tests
...
Closes gh-33100
2022-11-10 19:25:36 +00:00
fcbc7dacf1
Add reflection hints for JsonTesters
...
Closes gh-32858
2022-11-09 15:15:29 +00:00
85fd475821
Add noop tracer bean if tracing is disabled
...
The new functionality doesn't expose any public API
and works the same as WebTestClientContextCustomizer
does.
Closes gh-32907
2022-11-02 15:45:39 +01:00
c81ebf63d9
Use ApplicationContextFailureProcessor to log report on failure
...
Closes gh-31793
2022-10-31 15:15:49 -05:00
99edda735e
Polish
2022-10-25 12:57:58 +01:00
ce3c933f77
Adapt to Spring Security changes
...
Closes gh-32604
2022-10-19 11:46:27 -07:00
e0b67889a8
Use Stream.toList instead of Stream.collect when possible
...
Update code to make use of `Stream.toList()` whenever possible.
Closes gh-28177
2022-10-04 00:29:22 -07:00
51df7813a5
Remove code deprecated in 2.x and add since and forRemoval attributes
...
Closes gh-32548
Closes gh-32549
2022-09-30 14:39:05 +01:00
f0b4a65546
Avoid usage of StringBuffer where possible
...
See gh-32519
2022-09-29 09:29:10 +02:00
eac50a8f0c
Auto-configure Observation support for RestTemplate
...
Prior to this commit, Spring Boot would auto-configure a customizer that
instruments `RestTemplate` through a `RestTemplateBuilder`. This would
install a request interceptor that instrumented client exchanges for
producing metrics.
As of spring-projects/spring-framework#28341 , the instrumentation is
done at the `RestTemplate` level directly using the `Observation` API.
The `Tag` (now `KeyValue`) extraction, observation name and
instrumentation behavior now lives in the Spring Framework project.
This commit updates the auto-configuration to switch from Boot-specific
Metrics instrumentation to a generic Observation instrumentation.
As a migration path, some configuration properties are deprecated in
favor of the new `management.observations.*` namespace.
Closes gh-32484
2022-09-27 22:19:01 +02:00
0f325f98b5
Disable ContextCustomizer implementations at runtime if necessary
...
This commit disables ContextCustomizer implementations that tune a
test configuration context at runtime. Previously, these ran again and
required additional hints to work properly.
Rather than contributing those hints, the customizer is skipped as its
impact is irrelevant in an AOT-optimized context: the context is fully
prepared and the updates on the MergedContextConfiguration are not taken
into account.
Closes gh-32422
2022-09-20 04:34:58 +02:00
0476b5da5d
Upgrade to Selenium HtmlUnit 3.64.0 and Selenium 4.4.0
...
Closes gh-32372
Closes gh-32373
2022-09-15 12:31:56 +01:00
d103bbc034
Avoid returning null from TestContext.getTestClass()
...
Our mock didn't configure an expectation so null was returned. That's
prohibited by the javadoc and some recent Framework changes mean that
it's no longer tolerated.
2022-09-13 17:41:06 +01:00
46be4a3f30
Merge branch '2.7.x'
2022-09-08 19:38:18 -07:00
0991bd3983
Harmonize data configuration
...
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.
Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.
Closes gh-11574
2022-08-05 13:32:25 -07:00
38f1bc9793
Reinstate Spring for GraphQL auto-configuration
...
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.
Closes gh-31809
2022-08-01 14:33:25 +02:00
5c057a2730
Auto-configure the new Elasticsearch clients
...
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.
As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.
Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
7f00378eaf
Polish "Start building against Spring Data 2022.0.0-M5 snapshots"
...
See gh-31582
2022-07-07 16:32:13 +01:00
ac59b5781f
Align with breaking changes in spring-test
...
See gh-31241
2022-06-26 09:55:36 +01:00
458f989cf3
Use switch expressions where appropriate
...
See gh-31527
2022-06-24 16:19:28 +01:00
631b1e0d76
Merge branch '2.7.x'
...
Closes gh-31526
2022-06-24 13:10:10 +01:00
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01:00
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2022-06-20 17:55:36 +01:00
43c2f1c03c
Polish AutoConfigureObservability changes
...
See gh-31457
2022-06-20 07:38:22 +02:00
e746dfa677
Polish "Allow configuring WebDriver with TestNG"
...
See gh-27947
2022-06-19 10:35:09 +02:00
4872523181
Allow configuring WebDriver with TestNG
...
See gh-27947
2022-06-19 10:33:54 +02:00
b0f5fb51fc
Adapt to deprecation of NestedServletException
2022-06-14 17:45:31 +02:00
b250d8a1e4
Add @AutoConfigureObservability annotation
...
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.
@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability
See gh-31308
2022-06-10 14:25:12 +02:00
91bb5aa222
Move auto-config of ReactiveElasticClient to elasticsearch pkg
...
Closes gh-28068
2022-06-09 11:42:09 +01:00
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Phillip Webb
Moritz Halbritter
Yanming Zhou
Andy Wilkinson
Scott Frederick
Stephane Nicoll
hakan-krgn
Eddú Meléndez
Johnny Lim
ThomazPassarelli
Christoph Dreis
Krzysztof Krason
Brian Clozel
Madhura Bhave
AlexCD