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

275 Commits

Author SHA1 Message Date
Dmytro Nosan
9d052bbe5e Include WebFilter beans in WebFluxTest slice 
See gh-17601
 2019-07-22 12:38:48 -07:00
Dmytro Nosan
6859a89cf3 Include HandlerInterceptor beans in WebMvcTest slice 
See gh-17600
 2019-07-22 12:34:11 -07:00
Stephane Nicoll
e5ca9df478 Merge branch '2.1.x' 2019-07-19 11:33:16 +02:00
Stephane Nicoll
8eb6886388 Fix code formating 2019-07-19 11:29:12 +02:00
Stephane Nicoll
08afbe286c Merge branch '2.1.x' 
Closes gh-17580
 2019-07-19 10:35:01 +02:00
Stephane Nicoll
b8d92cb0ae Fix @DataJdbcTest to be transactional as advertized 
Closes gh-17513
 2019-07-19 10:33:59 +02:00
Stephane Nicoll
5903e9a57a Polish 2019-07-19 10:33:52 +02:00
Phillip Webb
30b5ba87ae Merge branch '2.0.x' into 2.1.x 2019-07-17 21:48:01 +01:00
Andy Wilkinson
808b373def Merge branch '2.1.x' 
Closes gh-17552
 2019-07-17 12:45:48 +01:00
Andy Wilkinson
9dabc0e14d Cleared deferred lines after each test 
Previously, DeferredLinesWriter would collect MockMvc output from
every test that has executed. If a test eventually failed, the
output from every test up to including the one that had failed would
be output, rather than just the output for the test that has just
failed.

This commit clears the deferred lines after each test, thereby
ensuring that when a failure occurs only the lines from the failing
test are output.

Fixes gh-17551
 2019-07-17 12:29:41 +01:00
Stephane Nicoll
a3e94f4412 Harmonize component scan in slice tests 
This commit updates ConfigurationPropertiesScanRegistrar to apply the
same component scan filters than the ones applied on standard classpath
scanning.

As a result, configuration properties scanning is automatically disabled
in slice tests and can be included by an explicit import or a dedicated
TypeFilter implementation if necessary.

Closes gh-16659
 2019-07-15 15:05:12 +02:00
Phillip Webb
eff1147ccc Rename classpath runner package 
Remove `runner` since we're no longer tied to JUnit 4.

See gh-17491
 2019-07-15 13:40:26 +01:00
Phillip Webb
1117fdb2b3 Make ModifiedClassPathExtension package private 
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.

See gh-17491
 2019-07-15 13:38:26 +01:00
Phillip Webb
4fe5e9e31e Remove direct junit-platform-launcher dependency 
Replace any direct `junit-platform-launcher` dependencies and instead
rely on the test runner providing it. Launcher related class are not
handled via reflection.

This update allows us to workaround SUREFIRE-1679.

Closes gh-17517
 2019-07-15 13:35:08 +01:00
dreis2211
0f0278e69b Migrate ModifiedClassPath tests to JUnit 5 
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.

See gh-17491
 2019-07-15 00:31:03 +01:00
dreis2211
ca1808ecae Migrate to MockRestServiceServer 
Migrate `RestClientTestWithoutJacksonIntegrationTests` to use
Spring's `MockRestServiceServer`.

See gh-17491
 2019-07-15 00:26:16 +01:00
Phillip Webb
01933f9b06 Merge previously split strings 
Merge some string lines that were previously split because of the
90 chars wide formatting.
 2019-07-15 00:24:19 +01:00
Phillip Webb
c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Phillip Webb
a66c4d3096 Unify method visibility of private classes 
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
 2019-07-03 11:39:47 -07:00
Phillip Webb
605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
c62b6b4ccd Merge branch '2.1.x' 2019-06-28 12:22:45 -07:00
Phillip Webb
de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Stephane Nicoll
e560b7f6ba Remove public modifier on JUnit5 lifecycle methods 
See gh-17292
 2019-06-21 18:09:05 +02:00
Andy Wilkinson
a189e4cf96 Merge branch '2.1.x' 
Closes gh-17220
 2019-06-17 14:05:16 +01:00
Andy Wilkinson
645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest" 
See gh-16485
 2019-06-17 13:54:41 +01:00
Lorenzo Dee
7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest 
See gh-16485
 2019-06-17 13:37:55 +01:00
Andy Wilkinson
78f51a490c Merge branch '2.1.x' 
Closes gh-17213
 2019-06-17 10:59:16 +01:00
Andy Wilkinson
c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests" 
See gh-17066
 2019-06-17 10:55:35 +01:00
Dmytro Nosan
4701d8f82a Auto-configure caching in jOOQ sliced tests 
See gh-17066
 2019-06-17 10:55:35 +01:00
Phillip Webb
b3d5cd538d Add JUnit 5 checkstyle rules 
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
 2019-06-10 16:16:45 -07:00
Andy Wilkinson
b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295 Merge branch '2.1.x' 
Closes gh-17079
 2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae Merge branch '2.0.x' into 2.1.x 
Closes gh-17078
 2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb
d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb
ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
fidel
2ec0996a6f Fix typo in javadoc 
See gh-17044
 2019-06-02 09:54:11 +02:00
Phillip Webb
0fcc561163 Update copyright header of changed files 2019-05-31 22:41:00 -07:00
Andy Wilkinson
0644a79401 Repackage output capture and always use extension declaratively 
Closes gh-17029
 2019-05-31 18:33:10 +01:00
Phillip Webb
ad5e905bd7 Update copyright header of changed files 2019-05-30 11:30:43 -07:00
Phillip Webb
68aec8b6ee Polish 2019-05-30 11:30:27 -07:00
Andy Wilkinson
080a2f5c3b Align with Framework’s removal of charset attribute from application/json 
Closes gh-16979
 2019-05-28 10:58:23 +01:00
Andy Wilkinson
23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library 
Closes gh-15555
 2019-05-22 14:50:15 +01:00
Johnny Lim
652906ec7c Use MergedAnnotation.getRoot() in PropertyMappingCheckBeanPostProcessor 
Closes gh-16745
 2019-05-21 09:26:27 +02:00
Phillip Webb
3a9ca5fa30 Update copyright header of changed files 2019-05-14 21:05:53 -07:00
Phillip Webb
ed998ef0d3 Update copyright header of changed files 2019-05-14 21:04:50 -07:00