1f67707509
Fix cast in TestRestTemplateContextCustomizer
...
Closes gh-15843
2019-02-05 11:39:25 +00:00
82bc87560c
Use AssertJ’s exception assertions rather than fail
...
Closes gh-15761
2019-02-04 11:48:26 +00:00
e15e140f8c
Polish "Fix typos in JsonContentAssert failure messages"
...
See gh-15752
2019-01-22 09:19:41 +00:00
3744082996
Fix typos in JsonContentAssert failure messages
...
Closes gh-15752
2019-01-22 09:19:25 +00:00
f0a20b1821
Polish contribution
...
Closes gh-15733
2019-01-17 16:14:15 -05:00
6a0053c8bc
Fix typo
...
See gh-15733
2019-01-17 16:11:11 -05:00
485bdc9901
Polish "Remove redundant interface modifiers"
...
Closes gh-15694
2019-01-14 08:13:08 -05:00
2d873c78fe
Remove redundant interface modifiers
...
See gh-15694
2019-01-14 08:12:41 -05:00
38e4d330b0
Merge branch '2.0.x' into 2.1.x
2018-12-11 08:52:58 +01:00
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
2018-12-11 08:52:15 +01:00
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
fd5aa3ebf1
Polish
...
See gh-15134
2018-11-11 11:03:13 +01:00
f3fa20b2d1
Polish
2018-10-29 14:25:45 -07:00
683484e4a8
Fix primary beans with ApplicationContextAssert
...
Update `ApplicationContextAssert.getBean` so that multiple beans are
supported as long as one of them is primary. This aligns better with
the way that the standard `ApplicationContext.getBean` method works.
Closes gh-14874
2018-10-24 21:34:17 -07:00
8b14754cda
Remove usages of BasicAuthorizationInterceptor
...
See gh-14830
2018-10-16 10:21:32 +02:00
1a0d53dec0
Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
...
Closes gh-14696
2018-10-15 08:25:10 +02:00
baf83aec0d
Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
...
Closes gh-14774
2018-10-12 15:37:25 +02:00
d3ca1a7b0e
Allow ClassPathResources to be filtered by FilteredClassLoader
...
See gh-14774
2018-10-12 15:15:16 +02:00
da7daece08
Tolerate Integer values for port properties
...
Closes gh-14682
2018-10-04 10:53:02 +01:00
b473f2996d
Polish
2018-10-04 10:39:07 +01:00
d76bba5e6f
Migrate from ExpectedException rule to AssertJ
...
Replace ExpectedException JUnit rules with AssertJ exception
assertions.
Closes gh-14336
2018-10-02 10:55:28 -07:00
94b366bc16
Make assertable context interfaces configurable
...
Update `Assertable*ApplicationContext` interfaces so that they also
extend the appropriate `Configurable*ApplicationContext` interface.
Closes gh-14650
2018-10-01 10:27:39 -07:00
c403ac9db6
Merge branch '2.0.x'
2018-09-26 11:43:59 -04:00
b6e5103dc4
Polish contribution
...
Closes gh-14592
2018-09-26 11:43:19 -04:00
77afe76ed5
Polish
...
The SpringBootContextLoader still checked if tests were annotated with
@IntegrationTest or @WebIntegrationTest. Those classes have been
removed in Spring Boot 1.5 and been deprecated since 1.4.
This commit removes the check on the annotations as well as the static
list of names.
See gh-14592
2018-09-26 11:41:25 -04:00
521f746151
Polish
...
Closes gh-14517
2018-09-20 09:51:10 +02:00
b2dd162572
Merge branch '2.0.x'
2018-09-17 14:30:38 -07:00
d7d5cbf959
Simplify printing ConditionEvaluationReport when using context runner
...
Closes gh-13119
2018-09-17 14:23:47 -07:00
d5a197fe66
Support random actuator port in SpringBootTest
...
This commit changes @SpringBootTest(randomPort = true) to
generate a random port for the actuator endpoints if the
management server runs on a different port from the main
server.
Closes gh-4424
2018-09-14 15:42:08 -07:00
04710373bf
Add @Author attribution
...
See gh-11077
2018-09-06 13:42:29 -07:00
bc357225b5
Polish MockitoPostProcessor
...
Closes gh-11077
2018-09-06 13:31:35 -07:00
a5b3a2646b
Test @MockBean/@SpyBean with @Primary
...
Add additional tests to ensure that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.
See gh-11077
2018-09-06 13:31:33 -07:00
c777614d8f
Support @MockBean/@SpyBean with @Primary
...
Update `MockitoPostProcessor` so that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.
See gh-11077
Co-authored-by: Andreas Neiser <andreas.neiser@gmail.com>
2018-09-06 13:24:41 -07:00
82b27c60a4
Drop MockitoPostProcessor factory method
...
Remove factory method previously used to create the mock instance.
Since commit 0e00a49dcc
2018-09-06 13:22:46 -07:00
0e725543d5
Merge branch '2.0.x'
2018-09-05 13:43:16 -07:00
ec27137632
Merge branch '1.5.x' into 2.0.x
2018-09-05 13:40:48 -07:00
d92441e53f
Update assertion message in AnnotatedClassFinder.scanPackage()
...
Closes gh-13989
2018-08-03 09:06:38 +02:00
4d86ac4713
Polish copyright date on changed files
2018-07-29 09:30:26 +01:00
80da9cf5eb
Merge branch '2.0.x'
2018-07-29 09:28:56 +01:00
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
a6c9c92f2e
Merge branch '2.0.x'
2018-07-28 01:35:43 +01:00
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:53 +01:00
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
f780179777
Polish contribution
...
Closes gh-13904
2018-07-26 17:22:58 +02:00
df6feb3e2a
Make SpringBootConfigurationFinder public and usable with other annotations
...
See gh-13904
2018-07-26 17:07:55 +02:00
6a48a440b2
Annotate our test annotations with @ExtendWith(SpringExtension.class)
...
Closes gh-13739
2018-07-11 17:25:21 +01:00
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
2018-06-28 10:51:58 +01:00
20546024d3
Merge branch '2.0.x'
2018-06-20 10:11:44 +01:00
e1774672af
Prefer servlet to reactive when Jersey and WebFlux are both available
...
Closes gh-13521
2018-06-20 10:10:35 +01:00
Andy Wilkinson
Johnny Lim
Stephane Nicoll
NAIT BELKACEM
igor-suhorukov
dreis2211
Madhura Bhave
Phillip Webb
Roy Jacobs
Marten Deinum
Andreas Neiser
artsiom