Andy Wilkinson
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
6 years ago
Stephane Nicoll
dfd477aa74
Merge branch '2.1.x'
6 years ago
Stephane Nicoll
38e4d330b0
Merge branch '2.0.x' into 2.1.x
6 years ago
dreis2211
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
6 years ago
Madhura Bhave
e367b54928
Merge branch '2.1.x'
6 years ago
Madhura Bhave
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
6 years ago
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
6 years ago
Stephane Nicoll
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
6 years ago
igor-suhorukov
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
6 years ago
Madhura Bhave
5a18df2d69
Fix tests
6 years ago
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
6 years ago
Madhura Bhave
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
6 years ago
Johnny Lim
fd5aa3ebf1
Polish
...
See gh-15134
6 years ago
Phillip Webb
f3fa20b2d1
Polish
6 years ago
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
6 years ago
dreis2211
8b14754cda
Remove usages of BasicAuthorizationInterceptor
...
See gh-14830
6 years ago
Stephane Nicoll
1a0d53dec0
Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
...
Closes gh-14696
6 years ago
Stephane Nicoll
baf83aec0d
Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
...
Closes gh-14774
6 years ago
Roy Jacobs
d3ca1a7b0e
Allow ClassPathResources to be filtered by FilteredClassLoader
...
See gh-14774
6 years ago
Andy Wilkinson
da7daece08
Tolerate Integer values for port properties
...
Closes gh-14682
6 years ago
Andy Wilkinson
b473f2996d
Polish
6 years ago
Phillip Webb
d76bba5e6f
Migrate from ExpectedException rule to AssertJ
...
Replace ExpectedException JUnit rules with AssertJ exception
assertions.
Closes gh-14336
6 years ago
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
6 years ago
Stephane Nicoll
c403ac9db6
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
b6e5103dc4
Polish contribution
...
Closes gh-14592
6 years ago
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
6 years ago
Johnny Lim
521f746151
Polish
...
Closes gh-14517
6 years ago
Madhura Bhave
b2dd162572
Merge branch '2.0.x'
6 years ago
Madhura Bhave
d7d5cbf959
Simplify printing ConditionEvaluationReport when using context runner
...
Closes gh-13119
6 years ago
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
6 years ago
Phillip Webb
04710373bf
Add @Author attribution
...
See gh-11077
6 years ago
Phillip Webb
bc357225b5
Polish MockitoPostProcessor
...
Closes gh-11077
6 years ago
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
6 years ago
Phillip Webb
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>
6 years ago
Phillip Webb
82b27c60a4
Drop MockitoPostProcessor factory method
...
Remove factory method previously used to create the mock instance.
Since commit 0e00a49dcc
, the method is not longer needed.
See gh-11077
6 years ago
Phillip Webb
0e725543d5
Merge branch '2.0.x'
6 years ago
Phillip Webb
ec27137632
Merge branch '1.5.x' into 2.0.x
6 years ago
Johnny Lim
d92441e53f
Update assertion message in AnnotatedClassFinder.scanPackage()
...
Closes gh-13989
6 years ago
Phillip Webb
4d86ac4713
Polish copyright date on changed files
6 years ago
Phillip Webb
80da9cf5eb
Merge branch '2.0.x'
6 years ago
Phillip Webb
aeb885192e
Polish ternary expressions
6 years ago
Phillip Webb
a6c9c92f2e
Merge branch '2.0.x'
6 years ago
Phillip Webb
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
6 years ago
Phillip Webb
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
6 years ago
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
6 years ago
Stephane Nicoll
f780179777
Polish contribution
...
Closes gh-13904
6 years ago
artsiom
df6feb3e2a
Make SpringBootConfigurationFinder public and usable with other annotations
...
See gh-13904
6 years ago
Andy Wilkinson
6a48a440b2
Annotate our test annotations with @ExtendWith(SpringExtension.class)
...
Closes gh-13739
6 years ago
Andy Wilkinson
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
6 years ago
Andy Wilkinson
20546024d3
Merge branch '2.0.x'
7 years ago