49e408828c
Fix property source ordering in SpringBootTest
...
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.
Fixes gh-28776
2021-11-24 10:17:02 -08:00
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08: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
d8629fc63d
Merge branch '2.5.x'
2021-11-08 13:14:52 -08:00
ddd38a7ac3
Merge branch '2.4.x' into 2.5.x
2021-11-08 13:14:35 -08:00
75bf430eb1
Polish ImportsContextCustomizerTests
...
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
2021-11-08 13:13:04 -08:00
0a6991e744
Merge branch '2.5.x'
...
Closes gh-28566
2021-11-08 13:11:03 -08:00
6406ee5609
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28565
2021-11-08 13:08:52 -08:00
8a14e1e2e9
Polish 'Ignore JUnit annotations when caching test contexts'
...
See gh-28563
2021-11-08 13:07:26 -08:00
23876d8a32
Ignore JUnit annotations when caching test contexts
...
Update `ImportsContextCustomizer` to ignore JUnit annotations.
See gh-28563
2021-11-08 13:06:23 -08:00
c05223d9c8
Merge branch '2.5.x'
...
Closes gh-28545
2021-11-06 12:06:14 +01:00
4304eea319
Polish contribution
...
See gh-28531
2021-11-06 12:03:22 +01:00
7d594aa301
Avoid duplicate AOP proxy class definition with FilteredClassLoader
...
See gh-28531
2021-11-06 11:58:28 +01:00
bf88405121
Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
...
Closes gh-28540
2021-11-05 14:20:37 +01:00
fbe614a61b
Fix bean type visibility
...
See gh-28437
2021-11-02 14:41:32 +01:00
2be0161f9a
Fix bean type visibility
...
See gh-28437
2021-11-02 12:35:19 +01:00
84b553a8ca
Upgrade to Jackson Bom 2.13.0
...
Closes gh-28298
2021-10-13 10:32:17 +01:00
1770f065a5
Polish
...
See gh-28239
2021-10-13 09:07:33 +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
575d83737a
Merge branch '2.5.x'
...
Closes gh-27799
2021-08-23 13:27:22 +01:00
e409489859
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27798
2021-08-23 13:26:37 +01:00
f8ef90813f
Allow @MockBean to be used with Framework's @Repeat
...
Fixes gh-27693
2021-08-23 12:38:15 +01:00
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
01e741d703
Prohibit circular references by default
...
Closes gh-27652
2021-08-17 14:51:39 +01:00
228e4e3bc8
Make it easier to add new config options to ApplicationContextRunners
...
Closes gh-27690
2021-08-17 14:51:08 +01:00
e30bf0e3e5
Merge branch '2.5.x'
...
Closes gh-27528
2021-07-29 18:47:40 +01:00
43d623e696
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27527
2021-07-29 18:47:31 +01:00
7eb5f35f2f
Make WebTestClient creation back off when no HTTP client available
...
Fixes gh-27520
2021-07-29 18:45:53 +01:00
355226c21e
Merge branch '2.5.x'
...
Closes gh-27474
2021-07-23 13:09:37 +01:00
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
2021-07-23 13:09:27 +01:00
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
2021-07-23 13:06:25 +01:00
3e0baf1bfd
Merge branch '2.5.x'
...
Closes gh-27353
2021-07-15 19:45:32 +01:00
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
2021-07-15 19:44:52 +01:00
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02:00
9e46061aa6
Allow to chain ContextConsumer implementations
...
Closes gh-26723
2021-06-11 16:04:34 +02: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
e317079446
Merge branch '2.4.x'
...
Closes gh-26524
2021-05-17 11:27:57 +01:00
49d362fd7f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26523
2021-05-17 11:27:46 +01:00
7f445630e4
Remove unnecessary semicolon
...
See gh-26446
2021-05-17 11:26:57 +01:00
05a64ecb2c
Merge branch '2.4.x'
...
Closes gh-26522
2021-05-17 11:24:29 +01:00
2a2c68f8f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26521
2021-05-17 11:22:48 +01:00
be807bab12
Polish "Improve documentation of TestRestTemplate's fault tolerance"
...
See gh-26227
2021-05-17 11:07:42 +01:00
a6fa8addb9
Improve documentation of TestRestTemplate's fault tolerance
...
See gh-26227
2021-05-17 11:07:42 +01:00
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
691bbcfdfd
Update copyright year of changed files
...
See gh-26448
2021-05-16 15:29:48 +02:00
d115361980
Remove redundant suppression
...
See gh-26448
2021-05-16 15:10:48 +02:00
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -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
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
2021-03-05 14:16:07 +00:00
22b73f3020
Polish "Improve documentaion of Mockito test execution listeners"
...
See gh-25375
2021-03-05 14:14:36 +00:00
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
2021-03-04 18:54:56 +00:00
297e3079d0
Fix handling of UriTemplateRequestEntity in TestRestTemplate
...
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.
This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.
Fixes gh-25097
[1] a0f4d81db7
2021-02-04 10:59:00 +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
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
920136d908
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24678
2021-01-06 16:44:32 -08:00
73a2a4b383
Consider context-path for WebTestClient baseUrl
...
Fixes gh-24168
2021-01-06 16:42:09 -08:00
fb207f73e7
Remove deprecated SpringBootContextLoader#getArgs()
...
See gh-24550
2020-12-21 09:44:28 +01:00
d6890e39a7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24536
2020-12-16 13:10:35 -08:00
0ec603cdad
Avoid duplicates in MergedContextConfiguration
...
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.
See gh-24532
2020-12-16 12:50:54 -08:00
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -08: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
f248cfe79c
Polish "Check that WebClient is available"
...
See gh-24152
2020-11-25 14:52:47 +01:00
f6255cc691
Check that WebClient is available
...
This commit reinstanties the isWeBClientPresent() check so that
WebTestClientContextCustomizer is only added if a web client is
available.
See gh-24152
2020-11-25 14:38:42 +01:00
d41e739f8c
Merge branch '2.3.x'
...
Closes gh-24013
2020-11-03 14:58:41 +00:00
dc86e8ce30
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24012
2020-11-03 14:58:28 +00:00
6548ca4c11
Implement equals and hashCode in TestTypeExcludeFilter
...
Fixes gh-23978
2020-11-03 14:50:00 +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
d9084eab67
Provide Mockito with a MockResolver that removes Spring-created proxies
2020-10-28 09:43:09 +00:00
6b437ece54
Inherit enclosing class's configuration in nested tests
...
Fixes gh-12470
2020-10-28 08:56:42 +00:00
e790828e19
Allow TestPropertyValues.of to take a Map source
...
Extend the API of `TestPropertyValues` so that it can be constructed
from an existing `Map` or a `Stream` and mapping `Function`.
Closes gh-23685
2020-10-23 12:00:25 -07:00
2d8528d5bd
Adapt to deprecation of StringUtils.isEmpty(Object)
...
See gh-23774
2020-10-22 17:09:33 +01:00
98914b65bc
Merge branch '2.3.x'
...
Closes gh-23672
2020-10-13 11:23:00 +01:00
a9a32f39b5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23671
2020-10-13 11:20:18 +01:00
667ccdae84
Simplify temp directory creation and improve diagnostics
...
Closes gh-23622
2020-10-13 11:18:06 +01:00
7b183ef99d
Merge branch '2.3.x'
...
Closes gh-23478
2020-09-24 14:46:42 +01:00
e626f7f47e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23477
2020-09-24 14:45:55 +01:00
bf9d23e55a
Consider SpringBootTest's web environment in context cache key
...
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.
This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.
Fixes gh-23085
2020-09-24 14:43:51 +01:00
1ae1436211
Refactor BootstrapRegistry support
...
Refactor `BootstrapRegistry` support following initial prototype work
with the Spring Cloud team.
This update splits the `BootstrapRegistry` API into `BootstrapRegistry`,
`BootstrapContext` and `ConfigurableBootstrapContext` interfaces and
moves it to the same package as `SpringApplication`.
A new `Bootstrapper` interface has been introduced that can be added
to the `SpringApplication` to customize the `BootstrapRegistry` before
it's used.
Closes gh-23326
2020-09-17 00:31:00 -07:00
6509310fdb
Fix DefaultPropertiesPropertySource package tangle
...
Relocate `DefaultPropertiesPropertySource` to fix a package tangle.
Closes gh-23383
2020-09-17 00:31:00 -07:00
91cc283c39
Upgrade to JUnit Jupiter 5.7.0
...
Closes gh-23351
2020-09-16 13:28:31 +02:00
d123c924a0
Add BootstrapRegisty support for config data
...
Expose the `BootstrapRegisty` to both `ConfigDataLocationResolver` and
`ConfigDataLoader` implementations. The registry is exposed via the
context interfaces and may be used to reuse instances that are expensive
to create. It may also be used to ultimately register beans with the
`ApplicationContext`.
Closes gh-22956
2020-08-20 21:49:03 -07:00
969dd35e45
Upgrade to Mockito 3.4.6
...
Closes gh-22838
2020-08-10 15:22:03 +01:00
Madhura Bhave
Andy Wilkinson
Phillip Webb
Loïc Ledoyen
Stephane Nicoll
dreis2211
Leo Li
izeye
weixsun
Carlos Rafael de Oliveira Carneiro
Madhura Bhave
Tobias Gesellchen
Andy Wilkinson
Stephane Nicoll