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
3 years ago
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
3 years ago
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
3 years ago
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
3 years ago
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
3 years ago
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
3 years ago
d8629fc63d
Merge branch '2.5.x'
3 years ago
ddd38a7ac3
Merge branch '2.4.x' into 2.5.x
3 years ago
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.
3 years ago
0a6991e744
Merge branch '2.5.x'
...
Closes gh-28566
3 years ago
6406ee5609
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28565
3 years ago
8a14e1e2e9
Polish 'Ignore JUnit annotations when caching test contexts'
...
See gh-28563
3 years ago
23876d8a32
Ignore JUnit annotations when caching test contexts
...
Update `ImportsContextCustomizer` to ignore JUnit annotations.
See gh-28563
3 years ago
c05223d9c8
Merge branch '2.5.x'
...
Closes gh-28545
3 years ago
4304eea319
Polish contribution
...
See gh-28531
3 years ago
7d594aa301
Avoid duplicate AOP proxy class definition with FilteredClassLoader
...
See gh-28531
3 years ago
bf88405121
Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
...
Closes gh-28540
3 years ago
fbe614a61b
Fix bean type visibility
...
See gh-28437
3 years ago
2be0161f9a
Fix bean type visibility
...
See gh-28437
3 years ago
84b553a8ca
Upgrade to Jackson Bom 2.13.0
...
Closes gh-28298
3 years ago
1770f065a5
Polish
...
See gh-28239
3 years ago
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
3 years ago
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
3 years ago
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
3 years ago
575d83737a
Merge branch '2.5.x'
...
Closes gh-27799
3 years ago
e409489859
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27798
3 years ago
f8ef90813f
Allow @MockBean to be used with Framework's @Repeat
...
Fixes gh-27693
3 years ago
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
3 years ago
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
3 years ago
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
3 years ago
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
3 years ago
01e741d703
Prohibit circular references by default
...
Closes gh-27652
3 years ago
228e4e3bc8
Make it easier to add new config options to ApplicationContextRunners
...
Closes gh-27690
3 years ago
e30bf0e3e5
Merge branch '2.5.x'
...
Closes gh-27528
3 years ago
43d623e696
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27527
3 years ago
7eb5f35f2f
Make WebTestClient creation back off when no HTTP client available
...
Fixes gh-27520
3 years ago
355226c21e
Merge branch '2.5.x'
...
Closes gh-27474
3 years ago
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
3 years ago
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
3 years ago
3e0baf1bfd
Merge branch '2.5.x'
...
Closes gh-27353
3 years ago
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
3 years ago
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
3 years ago
9e46061aa6
Allow to chain ContextConsumer implementations
...
Closes gh-26723
3 years ago
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
3 years ago
9e1c78da99
Update copyright year of changed files
3 years ago
e317079446
Merge branch '2.4.x'
...
Closes gh-26524
4 years ago
49d362fd7f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26523
4 years ago
7f445630e4
Remove unnecessary semicolon
...
See gh-26446
4 years ago
05a64ecb2c
Merge branch '2.4.x'
...
Closes gh-26522
4 years ago
2a2c68f8f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26521
4 years ago
be807bab12
Polish "Improve documentation of TestRestTemplate's fault tolerance"
...
See gh-26227
4 years ago
a6fa8addb9
Improve documentation of TestRestTemplate's fault tolerance
...
See gh-26227
4 years ago
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
4 years ago
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
4 years ago
691bbcfdfd
Update copyright year of changed files
...
See gh-26448
4 years ago
d115361980
Remove redundant suppression
...
See gh-26448
4 years ago
a28a3ae090
Merge branch '2.3.x' into 2.4.x
4 years ago
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
4 years ago
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
4 years ago
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
4 years ago
82127fdaa3
Update copyright year of changed files
4 years ago
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
4 years ago
22b73f3020
Polish "Improve documentaion of Mockito test execution listeners"
...
See gh-25375
4 years ago
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
4 years ago
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
4 years ago
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
4 years ago
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
4 years ago
d06407ec0a
Update copyright year of changed files
4 years ago
d95d7a0245
Update code for Spring Framework 5.3.4
...
See gh-24998
4 years ago
920136d908
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24678
4 years ago
73a2a4b383
Consider context-path for WebTestClient baseUrl
...
Fixes gh-24168
4 years ago
fb207f73e7
Remove deprecated SpringBootContextLoader#getArgs()
...
See gh-24550
4 years ago
d6890e39a7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24536
4 years ago
0ec603cdad
Avoid duplicates in MergedContextConfiguration
...
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.
See gh-24532
4 years ago
72d36e0c07
Update copyright year of changed files
4 years ago
30c27274e2
Merge branch '2.3.x'
...
Closes gh-24339
4 years ago
5f351a6983
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24338
4 years ago
837fc83527
Fix checkstyle header violations
...
See gh-24337
4 years ago
f248cfe79c
Polish "Check that WebClient is available"
...
See gh-24152
4 years ago
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
4 years ago
d41e739f8c
Merge branch '2.3.x'
...
Closes gh-24013
4 years ago
dc86e8ce30
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24012
4 years ago
6548ca4c11
Implement equals and hashCode in TestTypeExcludeFilter
...
Fixes gh-23978
4 years ago
929d8fcd3c
Update copyright year of changed files
4 years ago
506f7acc8d
Streamline use of TestContextAnnotationUtils
...
See gh-12470
4 years ago
d9084eab67
Provide Mockito with a MockResolver that removes Spring-created proxies
4 years ago
6b437ece54
Inherit enclosing class's configuration in nested tests
...
Fixes gh-12470
4 years ago
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
4 years ago
2d8528d5bd
Adapt to deprecation of StringUtils.isEmpty(Object)
...
See gh-23774
4 years ago
98914b65bc
Merge branch '2.3.x'
...
Closes gh-23672
4 years ago
a9a32f39b5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23671
4 years ago
667ccdae84
Simplify temp directory creation and improve diagnostics
...
Closes gh-23622
4 years ago
7b183ef99d
Merge branch '2.3.x'
...
Closes gh-23478
4 years ago
e626f7f47e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23477
4 years ago
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
4 years ago
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
4 years ago
6509310fdb
Fix DefaultPropertiesPropertySource package tangle
...
Relocate `DefaultPropertiesPropertySource` to fix a package tangle.
Closes gh-23383
4 years ago
91cc283c39
Upgrade to JUnit Jupiter 5.7.0
...
Closes gh-23351
4 years ago
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
4 years ago
969dd35e45
Upgrade to Mockito 3.4.6
...
Closes gh-22838
4 years ago
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