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

749 Commits

Author SHA1 Message Date
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
Phillip Webb
fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
6c0dbacfce Polish 2019-07-23 15:43:51 +01:00
Phillip Webb
0d92af7d55 Add hasJsonPath and doesNotHaveJsonPath asserts 
Extend `JsonContentAssert` with `hasJsonPath` and `doesNotHaveJsonPath`
methods which can be used to check the path regardless of the value it
may or may not contain.

Prior to this commit there wasn't an easy way to assert that the
Jackson `@JsonInclude(JsonInclude.Include.NON_NULL)` annotation was
applied since `assertDoesNotHavePathValue` would pass for both
`{"name" : null}` and `{}`.

Closes gh-17608
 2019-07-23 15:43:51 +01:00
Phillip Webb
900ec9f3ec Fix error message formatting placeholders 
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.

See gh-15569
 2019-07-23 15:43:51 +01:00
Andy Wilkinson
41957ec2ad Polish "Polish OutputCapture and its JUnit Jupiter extension" 
See gh-17049
 2019-07-18 17:46:56 +01:00
Sam Brannen
e1c595a67f Polish OutputCapture and its JUnit Jupiter extension 
- Polish Javadoc
- Improve error message in OutputCapture
- Use ExtensionContext.Store in OutputCaptureExtension

See gh-17049
 2019-07-18 17:46:55 +01:00
Phillip Webb
a9ba7080ce Merge branch '2.1.x' 2019-07-17 21:48:42 +01: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
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
Phillip Webb
0cb6a7f47d Polish 2019-07-15 00:24:19 +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
cdf43a7489 Polish 2019-07-14 19:42:56 +01:00
Phillip Webb
8d4a2add63 Allow OutputCaptureRule to be used with AssertJ 
Update `OutputCaptureRule` so that it now implements
`CapturedOutput` and can be used directly with AssertJ.

Closes gh-17512
 2019-07-14 19:42:42 +01:00
dreis2211
82047a2544 Polish 
See gh-17505
 2019-07-14 11:38:40 +02:00
Johnny Lim
426ef749db Polish 
See gh-17413
 2019-07-09 07:40:30 +02:00
Andy Wilkinson
2816635418 Polish 2019-07-04 17:51:20 +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
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