fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,745 Commits 22 Branches 339 Tags
Commit Graph

841 Commits

Author SHA1 Message Date
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
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00
Phillip Webb
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb
d95d7a0245 Update code for Spring Framework 5.3.4 
See gh-24998
 2021-01-26 17:35:54 -08: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
dreis2211
fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs() 
See gh-24550
 2020-12-21 09:44:28 +01: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
Andy Wilkinson
d41e739f8c Merge branch '2.3.x' 
Closes gh-24013
 2020-11-03 14:58:41 +00:00
Andy Wilkinson
dc86e8ce30 Merge branch '2.2.x' into 2.3.x 
Closes gh-24012
 2020-11-03 14:58:28 +00:00
Andy Wilkinson
6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter 
Fixes gh-23978
 2020-11-03 14:50:00 +00:00
Phillip Webb
929d8fcd3c Update copyright year of changed files 2020-10-29 09:08:13 -07:00
Andy Wilkinson
506f7acc8d Streamline use of TestContextAnnotationUtils 
See gh-12470
 2020-10-28 10:20:14 +00: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
2d8528d5bd Adapt to deprecation of StringUtils.isEmpty(Object) 
See gh-23774
 2020-10-22 17:09:33 +01:00
Andy Wilkinson
98914b65bc Merge branch '2.3.x' 
Closes gh-23672
 2020-10-13 11:23:00 +01:00
Andy Wilkinson
a9a32f39b5 Merge branch '2.2.x' into 2.3.x 
Closes gh-23671
 2020-10-13 11:20:18 +01:00
Andy Wilkinson
667ccdae84 Simplify temp directory creation and improve diagnostics 
Closes gh-23622
 2020-10-13 11:18:06 +01: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