Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,950 Commits 23 Branches 0 Tags
bc643d997e0e6fa3fea5eec194ee402d968c26c5
Commit Graph

268 Commits

Author SHA1 Message Date
Andy Wilkinson
575d83737a Merge branch '2.5.x' 
Closes gh-27799
 2021-08-23 13:27:22 +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
fd2fbcb3c6 Merge branch '2.5.x' 
Closes gh-27758
 2021-08-18 18:28:34 +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
01e741d703 Prohibit circular references by default 
Closes gh-27652
 2021-08-17 14:51:39 +01:00
Andy Wilkinson
e30bf0e3e5 Merge branch '2.5.x' 
Closes gh-27528
 2021-07-29 18:47: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
355226c21e Merge branch '2.5.x' 
Closes gh-27474
 2021-07-23 13:09:37 +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
3e0baf1bfd Merge branch '2.5.x' 
Closes gh-27353
 2021-07-15 19:45:32 +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
Stephane Nicoll
dc5acb0019 Remove deprecated code flagged for removal 
Closes gh-27303
 2021-07-14 11:50:01 +02:00
Stephane Nicoll
9e46061aa6 Allow to chain ContextConsumer implementations 
Closes gh-26723
 2021-06-11 16:04:34 +02: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
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
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
Madhura Bhave
920136d908 Merge branch '2.3.x' into 2.4.x 
Closes gh-24678
 2021-01-06 16:44:32 -08:00
Madhura Bhave
73a2a4b383 Consider context-path for WebTestClient baseUrl 
Fixes gh-24168
 2021-01-06 16:42:09 -08:00
Phillip Webb
d6890e39a7 Merge branch '2.3.x' into 2.4.x 
Closes gh-24536
 2020-12-16 13:10:35 -08:00
dreis2211
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
Phillip Webb
72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Phillip Webb
30c27274e2 Merge branch '2.3.x' 
Closes gh-24339
 2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983 Merge branch '2.2.x' into 2.3.x 
Closes gh-24338
 2020-12-04 18:21:57 -08:00
Phillip Webb
837fc83527 Fix checkstyle header violations 
See gh-24337
 2020-12-04 18:05:53 -08:00
Stephane Nicoll
f248cfe79c Polish "Check that WebClient is available" 
See gh-24152
 2020-11-25 14:52:47 +01:00
Tobias Gesellchen
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
Phillip Webb
929d8fcd3c Update copyright year of changed files 2020-10-29 09:08:13 -07:00
Andy Wilkinson
d9084eab67 Provide Mockito with a MockResolver that removes Spring-created proxies 2020-10-28 09:43:09 +00:00
Andy Wilkinson
6b437ece54 Inherit enclosing class's configuration in nested tests 
Fixes gh-12470
 2020-10-28 08:56:42 +00:00
Phillip Webb
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
Andy Wilkinson
7b183ef99d Merge branch '2.3.x' 
Closes gh-23478
 2020-09-24 14:46:42 +01:00
Andy Wilkinson
e626f7f47e Merge branch '2.2.x' into 2.3.x 
Closes gh-23477
 2020-09-24 14:45:55 +01:00
Andy Wilkinson
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
Stephane Nicoll
91cc283c39 Upgrade to JUnit Jupiter 5.7.0 
Closes gh-23351
 2020-09-16 13:28:31 +02:00
Andy Wilkinson
969dd35e45 Upgrade to Mockito 3.4.6 
Closes gh-22838
 2020-08-10 15:22:03 +01:00
Andy Wilkinson
d16838e4b7 Merge branch '2.3.x' 
Closes gh-22584
 2020-07-27 13:08:40 +01:00
Andy Wilkinson
39cb912819 Merge branch '2.2.x' into 2.3.x 
Closes gh-22583
 2020-07-27 13:08:14 +01:00