Stephane Nicoll
5f03ace40f
Update copyright year of changed file
...
See gh-29112
2022-01-13 08:43:03 +01:00
izeye
74c522c745
Polish SpringBootContextLoaderTests
...
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
to use a side-effect free
Environment implementation rather than converting the Environment early.
Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.
Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Madhura Bhave
27eb992252
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.
Closes gh-28804
2021-11-24 10:29:35 -08:00
Madhura Bhave
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
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Phillip Webb
ddd38a7ac3
Merge branch '2.4.x' into 2.5.x
2021-11-08 13:14:35 -08:00
Phillip Webb
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
Phillip Webb
6406ee5609
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28565
2021-11-08 13:08:52 -08:00
Phillip Webb
8a14e1e2e9
Polish 'Ignore JUnit annotations when caching test contexts'
...
See gh-28563
2021-11-08 13:07:26 -08:00
Loïc Ledoyen
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
Stephane Nicoll
4304eea319
Polish contribution
...
See gh-28531
2021-11-06 12:03:22 +01:00
dreis2211
7d594aa301
Avoid duplicate AOP proxy class definition with FilteredClassLoader
...
See gh-28531
2021-11-06 11:58:28 +01:00
Andy Wilkinson
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson
e409489859
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f
Allow @MockBean to be used with Framework's @Repeat
...
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Andy Wilkinson
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
43d623e696
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27527
2021-07-29 18:47:31 +01:00
Andy Wilkinson
7eb5f35f2f
Make WebTestClient creation back off when no HTTP client available
...
Fixes gh-27520
2021-07-29 18:45:53 +01:00
Andy Wilkinson
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
2021-07-15 19:44:52 +01:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
Andy Wilkinson
e317079446
Merge branch '2.4.x'
...
Closes gh-26524
2021-05-17 11:27:57 +01:00
Andy Wilkinson
49d362fd7f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26523
2021-05-17 11:27:46 +01:00
weixsun
7f445630e4
Remove unnecessary semicolon
...
See gh-26446
2021-05-17 11:26:57 +01:00
Andy Wilkinson
05a64ecb2c
Merge branch '2.4.x'
...
Closes gh-26522
2021-05-17 11:24:29 +01:00
Andy Wilkinson
2a2c68f8f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26521
2021-05-17 11:22:48 +01:00
Andy Wilkinson
be807bab12
Polish "Improve documentation of TestRestTemplate's fault tolerance"
...
See gh-26227
2021-05-17 11:07:42 +01:00
Carlos Rafael de Oliveira Carneiro
a6fa8addb9
Improve documentation of TestRestTemplate's fault tolerance
...
See gh-26227
2021-05-17 11:07:42 +01:00
Stephane Nicoll
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
weixsun
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
Stephane Nicoll
691bbcfdfd
Update copyright year of changed files
...
See gh-26448
2021-05-16 15:29:48 +02:00
weixsun
d115361980
Remove redundant suppression
...
See gh-26448
2021-05-16 15:10:48 +02:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
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
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
Andy Wilkinson
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson
22b73f3020
Polish "Improve documentaion of Mockito test execution listeners"
...
See gh-25375
2021-03-05 14:14:36 +00:00
dreis2211
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
2021-03-04 18:54:56 +00:00
Andy Wilkinson
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
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00