Andy Wilkinson
89bf486d0c
Merge branch '2.1.x'
2019-02-05 11:39:37 +00:00
Andy Wilkinson
1f67707509
Fix cast in TestRestTemplateContextCustomizer
...
Closes gh-15843
2019-02-05 11:39:25 +00:00
Andy Wilkinson
45cc649c7d
Merge branch '2.1.x'
2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c
Use AssertJ’s exception assertions rather than fail
...
Closes gh-15761
2019-02-04 11:48:26 +00:00
Andy Wilkinson
2cb147af7c
Merge branch '2.1.x'
2019-01-22 09:22:17 +00:00
Andy Wilkinson
e15e140f8c
Polish "Fix typos in JsonContentAssert failure messages"
...
See gh-15752
2019-01-22 09:19:41 +00:00
Johnny Lim
3744082996
Fix typos in JsonContentAssert failure messages
...
Closes gh-15752
2019-01-22 09:19:25 +00:00
Stephane Nicoll
32b14f3098
Merge branch '2.1.x'
2019-01-17 16:15:32 -05:00
Stephane Nicoll
f0a20b1821
Polish contribution
...
Closes gh-15733
2019-01-17 16:14:15 -05:00
NAIT BELKACEM
6a0053c8bc
Fix typo
...
See gh-15733
2019-01-17 16:11:11 -05:00
Stephane Nicoll
33f2bd4d61
Merge branch '2.1.x'
2019-01-14 08:13:37 -05:00
Stephane Nicoll
485bdc9901
Polish "Remove redundant interface modifiers"
...
Closes gh-15694
2019-01-14 08:13:08 -05:00
igor-suhorukov
2d873c78fe
Remove redundant interface modifiers
...
See gh-15694
2019-01-14 08:12:41 -05:00
Stephane Nicoll
6baa6b291e
Polish contribution
...
Closes gh-15695
2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f
Polish
...
See gh-15695
2019-01-14 08:09:32 -05:00
Stephane Nicoll
1e98c78ab9
Fix typo
2018-12-31 09:59:00 +01:00
Camille Vienot
ff8edf8d98
Use assertJ to generate AssertionError and filter its stacktrace
...
Closes gh-15569
2018-12-31 09:58:13 +01:00
Andy Wilkinson
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Stephane Nicoll
dfd477aa74
Merge branch '2.1.x'
2018-12-11 08:53:37 +01:00
Stephane Nicoll
38e4d330b0
Merge branch '2.0.x' into 2.1.x
2018-12-11 08:52:58 +01:00
dreis2211
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
2018-12-11 08:52:15 +01:00
Madhura Bhave
e367b54928
Merge branch '2.1.x'
2018-12-07 11:57:19 -08:00
Madhura Bhave
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Stephane Nicoll
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
igor-suhorukov
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
Madhura Bhave
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
Madhura Bhave
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
2018-12-05 17:48:27 -08:00
Johnny Lim
fd5aa3ebf1
Polish
...
See gh-15134
2018-11-11 11:03:13 +01:00
Phillip Webb
f3fa20b2d1
Polish
2018-10-29 14:25:45 -07:00
Phillip Webb
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
dreis2211
8b14754cda
Remove usages of BasicAuthorizationInterceptor
...
See gh-14830
2018-10-16 10:21:32 +02:00
Stephane Nicoll
1a0d53dec0
Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
...
Closes gh-14696
2018-10-15 08:25:10 +02:00
Stephane Nicoll
baf83aec0d
Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
...
Closes gh-14774
2018-10-12 15:37:25 +02:00
Roy Jacobs
d3ca1a7b0e
Allow ClassPathResources to be filtered by FilteredClassLoader
...
See gh-14774
2018-10-12 15:15:16 +02:00
Andy Wilkinson
da7daece08
Tolerate Integer values for port properties
...
Closes gh-14682
2018-10-04 10:53:02 +01:00
Andy Wilkinson
b473f2996d
Polish
2018-10-04 10:39:07 +01:00
Phillip Webb
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
Phillip Webb
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
Stephane Nicoll
c403ac9db6
Merge branch '2.0.x'
2018-09-26 11:43:59 -04:00
Stephane Nicoll
b6e5103dc4
Polish contribution
...
Closes gh-14592
2018-09-26 11:43:19 -04:00
Marten Deinum
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
Johnny Lim
521f746151
Polish
...
Closes gh-14517
2018-09-20 09:51:10 +02:00
Madhura Bhave
b2dd162572
Merge branch '2.0.x'
2018-09-17 14:30:38 -07:00
Madhura Bhave
d7d5cbf959
Simplify printing ConditionEvaluationReport when using context runner
...
Closes gh-13119
2018-09-17 14:23:47 -07:00
Madhura Bhave
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
Phillip Webb
04710373bf
Add @Author attribution
...
See gh-11077
2018-09-06 13:42:29 -07:00
Phillip Webb
bc357225b5
Polish MockitoPostProcessor
...
Closes gh-11077
2018-09-06 13:31:35 -07:00
Andreas Neiser
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
