eef89c6c35
Increase tests' Cassandra timeouts to 60s
...
Closes gh-30163
2022-03-11 11:02:18 +00:00
faf7a35425
Merge branch '2.7.x'
2022-03-10 16:51:56 +00:00
6494a9f08a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30165
2022-03-10 16:51:43 +00:00
7c3c5d3d3e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30164
2022-03-10 16:51:33 +00:00
bbdef2b026
Increase timeouts in tests that use Cassandra
...
Closes gh-30163
2022-03-10 16:50:39 +00:00
4388910435
Consider DataFetcherExceptionResolver in GraphQTest
...
Prior to this commit, `@GraphQlTest` slice tests would only consider
JsonComponent, RuntimeWiringConfigurer, Converter and
GenericConverter beans. But DataFetcherExceptionResolver,
Instrumentation and GraphQlSourceBuilderCustomizer are used in
setting up the GraphQL source.
This commit ensures that the `GraphQlTypeExcludeFilter` considers
those bean types.
Closes gh-30078
2022-03-08 17:54:55 +01:00
81754c8bc4
Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
...
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.
This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.
All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .
See gh-29637
2022-03-08 17:54:54 +01:00
1793cee00f
Start building against Micrometer 2.0.0-M3
...
See gh-29753
2022-03-04 11:03:22 +01:00
9c958669f4
Add io.micrometer:micrometer-binders as dependency to the test suite
2022-03-01 11:56:43 +01:00
7dc40e95d2
Merge branch '2.7.x'
2022-02-24 12:06:21 +00:00
664ecbdcc1
Polish "Add DataCouchbaseTest annotation"
...
See gh-29912
2022-02-24 12:05:36 +00:00
36e52758a7
Add DataCouchbaseTest annotation
...
See gh-29912
2022-02-24 11:45:09 +00:00
4093fff225
Merge branch '2.7.x'
2022-02-24 11:24:23 +00:00
53292a1f94
Polish "Add DataElasticsearchTest annotation"
...
See gh-29911
2022-02-24 11:21:24 +00:00
e22f78bc6a
Add DataElasticsearchTest annotation
...
See gh-29911
2022-02-24 10:27:20 +00:00
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
cb69d01e04
Merge branch '2.7.x' into main
2022-02-17 19:07:24 -06:00
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
2022-02-17 19:06:13 -06:00
42808ff13c
Merge branch '2.7.x'
...
# Conflicts:
# spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
# spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
2022-02-17 09:17:23 +01:00
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
44b88cc88c
Allow @ConstructorBinding to be optional
...
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.
Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.
Closes gh-23216
2022-02-16 13:47:26 -08:00
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
3b4832445b
Merge branch '2.7.x'
2022-02-05 14:02:00 +01:00
8c8c9c5f28
Upgrade to H2 2.1.210
...
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.
Closes gh-29651
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
191333773f
Restore support for REST Assured
...
Closes gh-29543
2022-01-24 13:46:48 +00:00
4d03f89a55
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
...
Closes gh-29476
2022-01-19 10:39:18 +01:00
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
c2e86096cd
Reinstate support for jOOQ as it now supports Jakarta EE 9
...
Closes gh-29271
2022-01-05 15:46:54 +00:00
06398eabed
Merge branch '2.7.x'
2022-01-04 12:26:24 -08:00
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
e2f274f01d
Merge branch '2.7.x'
2022-01-04 15:36:12 +01:00
9b34c31916
Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest"
...
See gh-29003
2022-01-04 15:32:23 +01:00
7f8dd81947
Include AbstractJdbcConfiguration beans in @DataJdbcTest
...
See gh-29003
2022-01-04 15:30:54 +01:00
a2bed160f0
Upgrade to Selenium 4.1.1
...
Closes gh-29237
2022-01-03 11:04:53 +01:00
09486b8fc7
Merge branch '2.7.x'
2021-12-27 12:03:11 +01:00
2b140950e3
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29176
2021-12-27 12:02:57 +01:00
7fbb5749d1
Polish
...
See gh-29157
2021-12-27 12:01:50 +01:00
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c938d58f32c
2021-12-21 09:05:06 +01:00
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
a34308e5f7
Add GraphQlTest slice
...
This commit adds the `@GraphQlTest` annotation which brings a new type
of sliced test for GraphQL applications. This considers all the required
infrastructure brought by `@AutoConfigureGraphQl`, but also brings
application components like `@Controller` beans and
`RuntimeWiringConfigurer`.
With this type of test, we'll only initialize a minimal setup for
testing a set of Controllers, without involving any transport-related
component.
See gh-29140
2021-12-21 08:34:15 +01:00
c0707e4f5b
Auto-configure GraphQlTester
...
This commit adds the required infrastructure to auto-configure a
`GraphQlTester` or `WebGraphQlTester` in Spring Boot tests.
Specific annotations like `AutoConfigureGraphQlTester` and
`AutoConfigureWebGraphQlTester` will contribute pre-configured beans for
testing a GraphQL with the tester.
This also ships a `ContextCustomize` for contributing a `GraphQlTester`
in the case of a full `@SpringBootTest` integration test against a live
server.
See gh-29140
2021-12-21 08:34:06 +01:00
9a92a9c91d
Add AutoConfigureGraphQl test annotation
...
This commit adds the `@AutoConfigureGraphQl` test annotation. It can be
used to import the relevant auto-configurations when testing a GraphQL
application.
Currently, it will get the main `GraphQlAutoConfiguration`, but also
what's required for configuring codecs and validation support.
See gh-29140
2021-12-21 08:34:00 +01:00
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
4a8904aaa9
Drop support for jOOQ until its dependencies are Jakarta EE 9 compatible
...
Closes gh-28821
2021-11-30 15:55:48 +00:00
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
f26995307e
Remove support for REST Assured until it supports Jakarta EE 9
...
Closes gh-28722
2021-11-30 15:55:47 +00:00
5944041f2a
Switch to Yasson for JSON-B testing
...
Closes gh-28615
2021-11-30 15:39:08 +00:00
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
bf88405121
Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
...
Closes gh-28540
2021-11-05 14:20:37 +01:00
0561992c2a
Update copyright year of changed files
2021-10-13 18:45:38 -07:00
1770f065a5
Polish
...
See gh-28239
2021-10-13 09:07:33 +02:00
c56bba98d9
Harmonize bean type visibility in TestDatabaseAutoConfiguration
...
Closes gh-28264
2021-10-08 15:45:36 +02:00
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
2021-10-06 10:03:24 +01:00
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
1b7536fda4
Merge branch '2.5.x'
...
Closes gh-28160
2021-10-01 08:14:03 +02:00
1c139b1d23
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28159
2021-10-01 08:13:49 +02:00
bedd749e1c
Polish "Clarify use of @AutoConfigureTestEntityManager"
...
See gh-28086
2021-10-01 08:12:01 +02:00
70f64f2c26
Clarify use of @AutoConfigureTestEntityManager
...
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.
See gh-28086
2021-10-01 07:55:57 +02:00
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
6e9bdacc10
Include WebMvcRegistrations beans in WebMvcTest
...
See gh-27823
2021-09-10 07:55:26 +02:00
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
8b3bea173c
Configure WebTestClient for @AutoConfigureMockMvc tests
...
As of Spring Framework 5.3, `WebTestClient` can now be configured on top
of `MockMvc` for testing Spring MVC applications in a mock environment.
Prior to this commit, `WebTestClient` would be already configured for
WebFlux mock setups with `@AutoConfigureWebTestClient` or live servers
(for both MVC and WebFlux apps).
This commit enhances the `@AutoConfigureWebMvc` support so that a
`WebTestClient` instance is auto-configured if the spring-webflux
dependency is present on the classpath.
Closes gh-23067
2021-08-03 09:43:44 +02:00
2482607a06
Merge branch '2.5.x'
...
Closes gh-27526
2021-07-29 17:42:40 +01:00
533bb24b55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27525
2021-07-29 17:42:26 +01:00
ad2d9c0ab1
Customize Cassandra's configuration to reduce container startup time
...
Closes gh-27524
2021-07-29 17:33:56 +01:00
11fc231cc9
Merge branch '2.5.x'
...
Closes gh-27491
2021-07-26 13:53:44 +01:00
1bf466702b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27490
2021-07-26 13:53:31 +01:00
0326fa47b7
Make DataJpaTestSchemaCredentialsIntegrationTests create the schema
...
Closes gh-26106
2021-07-26 13:51:23 +01:00
7e9ac39f0d
Update copyright year of changed files
2021-07-22 09:50:37 -07:00
3d581847e6
Merge branch '2.5.x'
...
Closes gh-27370
2021-07-16 15:46:39 +01:00
96111514e1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27369
2021-07-16 15:46:27 +01:00
06a3c40506
Use a 10s init query timeout in Cassandra tests
...
Closes gh-27368
2021-07-16 15:45:49 +01:00
43f1b98864
Polish "Add @WebServiceServerTest slice test support"
...
See gh-27091
2021-07-16 11:28:39 +01:00
c897b1e689
Add @WebServiceServerTest slice test support
...
Add `@WebServiceServerTest` and related test auto-configuration to
allow slice testing of Spring Web Service server applications.
See gh-27091
2021-07-16 10:11:06 +01:00
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
cb7c3774a7
Merge branch '2.4.x'
...
Closes gh-26646
2021-05-24 11:39:57 +02:00
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
6df3a8291e
Merge branch '2.4.x'
...
Closes gh-26328
2021-04-30 14:36:04 +02:00
01d2c70e8c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26327
2021-04-30 14:35:52 +02:00
07358c6b79
Support reactive infrastructure with DataRedisTest
...
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.
Closes gh-26319
2021-04-30 14:32:25 +02:00
2f852fa256
Update copyright year of changed files
2021-04-23 23:42:14 -07:00
e3f81f0243
Merge branch '2.4.x'
2021-04-21 17:23:42 +02:00
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
3ca6ed6246
Polish
...
Closes gh-26190
2021-04-21 17:20:22 +02:00
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +02:00
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
9d0e1a2cb3
Include SQL init auto-config in Data RDBC test slice
...
Closes gh-24741
2021-04-14 16:37:33 +01:00
05adf02a47
Include SQL init auto-config in JDBC-based test slices
...
Closes gh-25323
2021-04-14 15:11:28 +01:00
0d81b4d07e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26108
2021-04-14 15:04:28 +02:00
0fb482579b
Harmonize Neo4jContainer startup options
...
Closes gh-26084
2021-04-14 14:50:04 +02:00
a58b25b5db
Add package-info to o.s.b.test.autoconfigure.data.Cassandra
...
Closes gh-26081
2021-04-13 20:14:29 +01:00
fd6ad5b889
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26024
2021-04-12 14:19:41 +02:00
7286c33f53
Document default behaviour of DataJpaTest#showSql
...
Closes gh-25843
2021-04-12 14:14:36 +02:00
852e5778a3
Polish
...
See gh-25875
2021-04-04 11:12:03 +02:00
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
96ba9ae47f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25768
2021-03-23 14:48:24 +00:00
62023104de
Test auto-configured MockRestServiceServer with metrics and a root URI
...
Closes gh-25741
2021-03-23 14:37:37 +00:00
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
79c0597aa2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25072
2021-02-01 15:39:19 +00:00
3585d20453
Include IDialect beans in WebFluxTest and WebMvcTest
...
Fixes gh-24149
2021-02-01 15:03:08 +00:00
d06407ec0a
Update copyright year of changed files
2021-01-26 19:06:14 -08:00
d95d7a0245
Update code for Spring Framework 5.3.4
...
See gh-24998
2021-01-26 17:35:54 -08:00
a67edfbeb7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24518
2020-12-15 17:21:39 +00:00
76198f9a8d
Include properties from test-autoconfigure in config props appendix
...
Closes gh-24486
2020-12-15 17:20:21 +00:00
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -08:00
93d83342d2
Merge branch '2.3.x'
...
Closes gh-24401
2020-12-08 15:42:52 +01:00
06671aa50e
Stop deferring JPA bootstrap mode by default
...
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.
Closes gh-24249
2020-12-08 15:42:14 +01:00
30c27274e2
Merge branch '2.3.x'
...
Closes gh-24339
2020-12-04 18:31:55 -08:00
5f351a6983
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24338
2020-12-04 18:21:57 -08:00
837fc83527
Fix checkstyle header violations
...
See gh-24337
2020-12-04 18:05:53 -08:00
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
9e901b6e07
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 16:24:16 +01:00
23ad2b4156
Rationalize Testcontainers image versions
...
This commit rationalizes the Docker image names used in integration
tests.
Closes gh-24107
2020-11-10 16:04:27 +01:00
a4505eaeb0
Merge branch '2.3.x'
...
Closes gh-24024
2020-11-04 09:41:41 +00:00
81f672eae3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24023
2020-11-04 09:40:54 +00:00
28ccf54b21
Ignore schema username when auto-configuring a test DB
...
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.
This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.
Fixes gh-19321
2020-11-04 09:30:19 +00:00
c93d91175d
Merge branch '2.3.x'
...
Closes gh-24007
2020-11-03 10:27:53 +00:00
2513071b1f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24006
2020-11-03 10:27:38 +00:00
622606d85a
Make it clearer that only the main DataSource bean may be replaced
...
Closes gh-23808
2020-11-03 10:24:44 +00:00
8004a821f2
Fix nested test config discovery for sliced tests
...
Fixes gh-23984
2020-11-02 20:40:27 +00:00
929d8fcd3c
Update copyright year of changed files
2020-10-29 09:08:13 -07:00
506f7acc8d
Streamline use of TestContextAnnotationUtils
...
See gh-12470
2020-10-28 10:20:14 +00:00
Andy Wilkinson
Gautham Mohan
Brian Clozel
Moritz Halbritter
Eddú Meléndez
Phillip Webb
Scott Frederick
Madhura Bhave
Stephane Nicoll
Yanming Zhou
raviu
izeye
Leo Li
dreis2211
Daniil Razorenov
weixsun
Stephane Nicoll