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

573 Commits

Author SHA1 Message Date
Madhura Bhave
21bb249a73 Merge branch '2.2.x' 
Closes gh-21090
 2020-04-22 14:36:36 -07:00
Madhura Bhave
b9c2b7b257 Prevent early initialization in MockitoPostProcessor 
Fixes gh-20665
 2020-04-22 14:35:50 -07:00
Phillip Webb
7ab2bca376 Support commas in @ActiveProfiles 
Update `SpringBootContextLoader` so that it correctly deals with an
`@ActiveProfiles` annotation that contains a comma.

Fixes gh-19537

Co-authored-by: Scott Frederick <sfrederick@pivotal.io>
Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
 2020-04-17 18:47:56 -07:00
Phillip Webb
3ca896e63f Polish 2020-04-07 12:10:49 -07:00
Stephane Nicoll
f4c68dbc98 Do not set server.port=-1 for non embedded tests 
Closes gh-16998
 2020-04-02 18:12:39 +02:00
dreis2211
674f1e77b5 Fix typos 
See gh-20704
 2020-03-28 08:42:59 +01:00
dreis2211
ef9f1d39a3 Remove redundant MockitoAnnotations.initMocks() 
See gh-20601
 2020-03-22 08:43:50 +01:00
Phillip Webb
1eee83a07e Update copyright year of changed files 2020-01-30 17:09:49 -08:00
Stephane Nicoll
eb852f1ad6 Disable bean overriding by default in ApplicationContextRunner 
For consistency with SpringApplication, this commit disables bean
overriding by default in ApplicationContextRunner. Bean overriding can
be enabled again using withAllowBeanDefinitionOverriding.

Closes gh-18019
 2020-01-28 15:57:28 +01:00
Stephane Nicoll
95be419527 Use Class.forName rather than ClassLoader.loadClass 
This commit changes uses of ClassLoader.loadClass to Class.forName for
consistency with what was initiated in #19342 and better compatibility
with GraalVM.

Closes gh-19824
 2020-01-23 10:47:53 +01:00
Andy Wilkinson
29d8b6db5a Merge branch '2.2.x' 
Closes gh-19822
 2020-01-20 15:18:18 +00:00
Andy Wilkinson
f708aace65 Merge branch '2.1.x' into 2.2.x 
Fixes gh-19821
 2020-01-20 15:18:00 +00:00
Andy Wilkinson
c85f19b75b Revert "Add profiles directly to the application environment for tests" 
This reverts commit 487b9cbf963829ea33ba3c1fde48a9265c633e9d.

Fixes gh-19788
 2020-01-20 15:01:09 +00:00
Scott Frederick
8f102aee68 Remove deprecated 2.2 code 
See gh-19699
 2020-01-16 14:44:52 +01:00
Phillip Webb
f57281340c Merge branch '2.2.x' 2020-01-13 16:46:49 -08:00
Phillip Webb
3cfbfebbb1 Merge branch '2.1.x' into 2.2.x 2020-01-13 16:45:40 -08:00
Phillip Webb
9bd49562fe Update copyright year of changed files 2020-01-13 14:09:11 -08:00
Madhura Bhave
6944e52052 Merge branch '2.2.x' 2020-01-07 13:49:43 -08:00
Madhura Bhave
ac10ebba33 Fix checkstyle 2020-01-07 13:49:02 -08:00
Madhura Bhave
c82d728c93 Merge branch '2.2.x' 
Closes gh-19561
 2020-01-07 13:34:43 -08:00
Madhura Bhave
67fab60fbd Merge branch '2.1.x' into 2.2.x 
Closes gh-19560
 2020-01-07 13:33:32 -08:00
Scott Frederick
487b9cbf96 Add profiles directly to the application environment for tests 
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.

See gh-19556
 2020-01-07 13:23:09 -08:00
Stephane Nicoll
2c1e81adf0 Polish 2019-12-26 10:42:40 +01:00
Andy Wilkinson
9b0569cf81 Merge branch '2.1.x' into 2.2.x 
Closes gh-19309
 2019-12-05 16:15:15 +00:00
Andy Wilkinson
bc53fe0344 Recommend mockito-inline for mocking and spying of CGLib proxies 
This reverts commit 52050c173c35e8b96722051031ab55774f524967.

See gh-17817
Closes gh-19020
 2019-12-05 16:13:02 +00:00
Stephane Nicoll
fd94608f73 Polish "Restore proxying of @Bean methods in @TestConfiguration" 
See gh-18675
 2019-10-22 09:13:00 +02:00
Dmytro Nosan
7faa606920 Restore proxying of @Bean methods in @TestConfiguration 
See gh-18675
 2019-10-22 09:10:05 +02:00
Stephane Nicoll
0bc5803e34 Merge branch '2.1.x' 
Closes gh-18603
 2019-10-15 14:38:59 +02:00
Stephane Nicoll
e4ba6049ff Clarify scope of "@SpringBootTest#classes" 
See gh-18229
 2019-10-15 14:36:28 +02:00
Johnny Lim
887c3b71f3 Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable() 
See gh-18559
 2019-10-12 16:51:53 +01:00
Andy Wilkinson
96f85a40de Support customization of WebTestClient.Builder when using @SpringBootTest 
Closes gh-15132
 2019-10-02 17:51:00 +01:00
Phillip Webb
b65ba60980 Polish 'Simplify some code' 
See gh-18438
 2019-10-01 22:08:20 -07:00
kenneth
e6b45de41e Simplify some code 
See gh-18438
 2019-10-01 22:08:02 -07:00
Stephane Nicoll
c605419f19 Merge branch '2.1.x' 
Closes gh-18379
 2019-09-27 16:34:59 +02:00
Roland Weisleder
92ae7b21a1 Fix typo in ApplicationContextAssert 
See gh-18372
 2019-09-27 16:32:32 +02:00
Phillip Webb
ad32603635 Restore compatibility with MockRestServiceServer 
Closes gh-17885
 2019-09-16 10:17:41 +02:00
Stephane Nicoll
3d5530d15d Merge branch '2.1.x' 
Closes gh-18234
 2019-09-16 10:03:19 +02:00
Stephane Nicoll
9065c4997d Fix rebase from master 2019-09-16 09:52:55 +02:00
Stephane Nicoll
e05f42f0f3 Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter" 
See gh-18214
 2019-09-16 09:44:01 +02:00
Leonard Brünings
b9c8d7dd60 Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter 
See gh-18214
 2019-09-16 09:42:55 +02:00
dreis2211
b4350a9d96 Remove unnecessary blank lines 
See gh-18089
 2019-09-03 08:48:10 +02:00
dreis2211
3e35a6616c Fix duplicated words 
See gh-18004
 2019-09-01 09:09:38 +02:00
Andy Wilkinson
ba6fe60134 Merge branch '2.1.x' 
Closes gh-17948
 2019-08-23 19:15:02 +01:00
Andy Wilkinson
52050c173c Fix spying on scoped beans with @SpyBean 
Previously, when spying on a scoped bean the creation of the spy
would be performed using the scoped proxy. This would result in
the spy being unable to spy on any of the target bean's methods as
the scoped proxy's implementations of those methods would be final.

This commit updates MockitoPostProcessor so that the creation of the
spy and injection of the @SpyBean-annotated field is performed using
the scoped target. The scoped target has not be proxied so this
allows Mockito to spy on all of its methods.

Closes gh-17817
 2019-08-23 19:03:08 +01:00
Andy Wilkinson
ab87b2a39b Polish 2019-08-19 16:05:43 +01:00
dreis2211
d4affd7f85 Use hasSize() assertion in favor of length checks 
See gh-17874
 2019-08-17 06:39:41 +02:00
Phillip Webb
34c31ce099 Remove BeanTypeRegistry 
Remove `BeanTypeRegistry` and rely entirely on standard calls Spring
Framework APIs.

Closes gh-17594
 2019-08-01 10:15:15 +01:00
Phillip Webb
da4f436140 Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY 
Fixup references following upstream Spring Framework change.
 2019-07-31 15:11:43 +01:00
dreis2211
8d2f2b75bd Upgrade to AssertJ 3.13.1 
See gh-17690
 2019-07-30 09:48:33 +02:00
Phillip Webb
8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00