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

694 Commits

Author SHA1 Message Date
Madhura Bhave
f4ad30c448 Merge branch '2.2.x' into 2.3.x 
Closes gh-22006
 2020-06-17 17:26:40 -07:00
Madhura Bhave
615cf63a82 Make MockBean resolve right type for abstract test class 
Fixes gh-20916
 2020-06-17 17:25:03 -07:00
Andy Wilkinson
9e08490522 Merge branch 'gh-21271' 
Closes gh-21271
 2020-06-16 12:52:17 +01:00
Andy Wilkinson
753bea64c6 Enable varargs compilation warnings 
See gh-21271
 2020-06-16 12:50:53 +01:00
Andy Wilkinson
056d5f3120 Enable deprecation compilation warnings 
See gh-21271
 2020-06-16 12:50:47 +01:00
Phillip Webb
0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb
038ae93406 Update copyright year of changed files 2020-05-13 16:48:51 -07:00
Phillip Webb
49921d65ac Ensure @ActiveProfiles replaces existing profiles 
Update `SpringBootContextLoader` to both add `spring.profiles.active`
properties and to directly call `Environment.setActiveProfiles`.
The additional `setActiveProfiles` call prevents `AbstractEnvironment`
from accidentally loading `spring.profiles.active` properties directly
when `doGetActiveProfiles` is called.

Directly setting active profiles has only become necessary since we
started adding properties using the square bracket notation. Previously
we added a comma-separated list which would be picked up by both the
`AbstractEnvironment` and the `ConfigurationFileApplicationListener`.

Closes gh-21302
 2020-05-08 17:16:06 -07:00
Stephane Nicoll
846db6105f Merge branch '2.2.x' 
Closes gh-21364
 2020-05-08 14:51:49 +02:00
Stephane Nicoll
60ff8bafb5 Polish "Align TestRestTemplate Javadoc with documentation" 
See gh-21318
 2020-05-08 14:49:50 +02:00
Andrii Hrytsiuk
f11c030b71 Align TestRestTemplate Javadoc with documentation 
See gh-21318
 2020-05-08 14:48:21 +02:00
Phillip Webb
ad1248e4ec Replace "folder" with "directory" 
Consistently use the term "directory" instead of "folder"

Closes gh-21218
 2020-04-28 19:20:24 -07:00
dreis2211
c7d7facc3a Remove empty test rule package 
See gh-21137
 2020-04-27 10:32:44 +02:00
Stephane Nicoll
c7baf5fda1 Update copyright year of changed file 
See gh-21009
 2020-04-25 08:55:27 +02:00
dreis2211
5eb5bf0a2d Polish 
See gh-21009
 2020-04-25 08:54:47 +02:00
Stephane Nicoll
85e9f713b0 Update copyright year of changed files 
See gh-21007
 2020-04-25 08:50:51 +02:00
Johnny Lim
29717423a3 Remove this keyword on member method invocations 
See gh-21007
 2020-04-25 08:49:44 +02:00
Phillip Webb
b73d5038d5 Merge branch '2.2.x' 2020-04-23 14:35:08 -07:00
Phillip Webb
9bb53a4c37 Polish 2020-04-23 14:31:49 -07:00
Madhura Bhave
b3ccefdb57 Merge branch '2.2.x' 
Closes gh-21102
 2020-04-23 10:19:10 -07:00
Madhura Bhave
4dc9bbe127 @SpringBootTest classes with different args shouldn't share a context 
Fixes gh-20866
 2020-04-23 10:18:14 -07:00
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