27ca7e17d9
Fix deprecated StandardAnnotationMetadata usages
...
Closes gh-16930
2019-05-22 14:05:15 +02:00
ed998ef0d3
Update copyright header of changed files
2019-05-14 21:04:50 -07:00
552345fcd1
Disable more @Bean method proxying
...
Previously, due to a quirk in Spring Framework, it was necessary to use bean method
proxying in @Configuration classes that define one or more FactoryBeans. This quirk has
now been addressed so this commit disables bean method proxying where it is now no longer
needed.
Closes gh-16533
2019-05-10 10:16:22 +01:00
ca51609cdf
Align mock with Selenium HtmlUnit's new behaviour
...
See gh-16801
2019-05-09 09:48:36 +01:00
1db1c8b03c
Validate our own tests work with JUnit5 and the vintage engine
...
Closes gh-14737
Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-05-08 16:05:44 +02:00
d15347d4e5
Add Junit5 OutputCapture Extension
...
Closes gh-14738
2019-05-08 16:05:43 +02:00
c91578bbae
Define surefire test provider to use
...
The `spring-boot-test` module has a dependency to TestNG to validate
some part of the test infrastructure but no tests are actually written
using TestNG. The presence of TestNG is a trigger for the maven surefire
plugin and it attempts to run tests using it.
This commit defines the explicit provider to use (JUnit 4)
Closes gh-16735
2019-05-07 14:22:53 +02:00
32040e355b
Merge branch '2.1.x'
...
Closes gh-16649
2019-04-24 19:50:41 -07:00
d4151e0b51
Polish "Use Jackson configuration with JsonPath"
...
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.
Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.
See gh-16629
2019-04-24 19:45:43 -07:00
17aaf26590
Use consistent javadoc style for annotation links
...
Closes gh-13920
2019-04-24 19:37:59 -07:00
1e44aba772
Fix compiler warnings and polish
...
Fix various compiler warnings and apply a little polish.
2019-04-24 19:37:42 -07:00
756a7f12a3
Use Jackson configuration with JsonPath
...
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.
Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.
See gh-16629
2019-04-24 18:15:46 -07:00
b879972d0d
Migrate to MergedAnnotations API
...
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.
Closes gh-16551
2019-04-18 15:40:02 -07:00
5f1bbf8c72
Update copyright header of changed files
2019-04-15 17:51:08 -07:00
7d4118a0fe
Align withBean methods with ApplicationContext
...
Rework `AbstractApplicationContextRunner.withBean` methods to
align signatures as much as possible with those provided by
the `ApplicationContext`.
Also update the implementation to use a dedicate member
variable rather than adding initializers.
Closes gh-16011
2019-04-15 17:51:08 -07:00
2dfd916c96
Polish
2019-04-15 17:51:08 -07:00
a780875390
Allow `ApplicationContextRunner` to accept simple bean definitions
...
This commit adds `withBean` methods to the `ApplicationContextRunner`
abstraction so that simple beans can be registered inline. This is a
nice alternative for cases where a inner configuration class has to be
defined for the purpose of creating a simple bean.
Closes gh-16011
2019-04-09 12:15:05 +02:00
c432288ed1
Migrate ApplicationContext to common hierarchy
...
This commit migrates `AnnotationConfigReactiveWebApplicationContext`
parent to the `GenericApplicationContext` abstraction. Any use of
`AnnotationConfigWebApplicationContext` is also removed as it also
inherits from the `AbstractRefreshableApplicationContext` outdated
hierarchy.
A new `AnnotationConfigServletWebApplicationContext` context is
introduced instead, extending from `GenericApplicationContext` and
providing the counter part of the reactive context for the Servlet-based
web app tests.
See gh-16096
2019-04-05 14:17:41 +02:00
ad7eebee9e
Merge branch '2.1.x'
2019-04-03 17:00:25 -07:00
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
2376f973f4
Merge branch '2.1.x'
2019-04-02 13:46:36 -07:00
47c6bf741d
Merge branch '2.0.x' into 2.1.x
2019-04-02 13:40:21 -07:00
07c000c5b7
Merge branch '1.5.x' into 2.0.x
2019-04-02 13:34:28 -07:00
8daa8c48fb
Merge branch '2.1.x'
2019-04-01 15:51:25 -07:00
c592e71449
Override missing methods in FilteredClassLoader
...
Closes gh-16404
2019-04-01 15:42:02 -07:00
878a635bfb
Merge branch '2.1.x'
2019-03-28 11:48:47 +00:00
5a3474c7a8
Polish "Use HTTPS for external links wherever possible"
...
See gh-16320
2019-03-28 10:53:01 +00:00
864942ad4f
Merge branch '2.0.x' into 2.1.x
2019-03-28 09:35:53 +00:00
1a4c6f2dac
Use HTTPS for external links wherever possible
...
See gh-16319
2019-03-27 20:06:52 +00:00
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
95d10388dd
Merge branch '2.1.x'
2019-03-25 11:03:10 -07:00
0c2e71cd08
Prevent early initialization of factory beans in text context customizers
...
Until Spring Framework 5.1.15, a FactoryBean with a non-default constructor
defined via component scanning would cause an error. This behavior has changed
as of https://github.com/spring-projects/spring-framework/issues/22409 .
Regardless of this change we want to ensure that we avoid triggering eager
initialisation. `SimpleFactoryBean` has been written this way so that the tests
fail if early initialization is triggered regardless of the Spring Framework version.
Fixes gh-15898
2019-03-25 10:55:41 -07:00
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00
3e2b6ac8ed
Update build and setup configuration to use HTTPS
...
See gh-16246
2019-03-19 16:58:31 +00:00
0611eb49c8
Merge branch '2.1.x'
2019-03-18 18:03:32 -07:00
7ea8770524
Polish "Fix request factory used with withBasicAuth"
...
Fixes gh-15982
2019-03-18 18:00:17 -07:00
756bd890eb
Fix request factory used with TestRestTemplate withBasicAuth
...
This commit updates the behavior of withBasicAuth on TestRestTemplate
by trying to use the same request factory type as the underlying restTemplate.
If creation of a new instance of the configured request factory class fails,
it falls back to the `ClientHttpRequestFactorySupplier`.
See gh-15982
2019-03-18 18:00:08 -07:00
1893eeef4f
Merge branch '2.1.x'
2019-03-15 17:27:10 -07:00
2f3e5d65be
Test server port shouldn't affect management port when random
...
Closes gh-16108
2019-03-15 17:21:29 -07:00
2cdc93cf19
Make TestRestTemplate withBasicAuth fault tolerant
...
It's part of TestRestTemplate's contract that it's fault tolerant. This
commit aligns the behavior of `withBasicAuth` with that expectation.
Closes gh-15780
2019-03-13 11:49:42 -07:00
68bfb020aa
Reduce need for bean method proxying and disable where not needed
...
Closes gh-9068
2019-03-12 13:18:42 +00:00
dd3e8154d9
Merge branch '2.1.x'
2019-03-11 22:15:19 -07:00
fc3aa43cc2
Update copyright year for changed files
2019-03-11 22:14:53 -07:00
aa2008bc5a
Merge branch '2.1.x'
2019-03-11 16:40:19 +00:00
8c3cec8f13
Merge branch '2.0.x' into 2.1.x
2019-03-11 16:14:19 +00:00
361437f4e2
Merge branch '1.5.x' into 2.0.x
2019-03-11 15:53:34 +00:00
b34b217d1e
Upgrade to Kotlin 1.3.21
...
Closes gh-16195
2019-03-11 15:56:13 +01:00
d6a869fa98
Switch to Jakarta EE API dependencies where possible
...
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
f2e3e274a8
Merge branch '2.1.x'
2019-02-21 08:19:43 +00:00
53326695ea
Polish
2019-02-21 08:13:54 +00:00
4992b7fb29
Polish "Migrate Kotlin tests to Mockk"
...
Closes gh-15993
2019-02-19 13:36:06 +01:00
cca79b8d4d
Migrate Kotlin tests to Mockk
...
See gh-15993
2019-02-19 13:35:43 +01:00
7413584b00
Polish "Support expressing application `args` in `@SpringBootTest`"
...
Closes gh-14823
2019-02-13 15:07:11 +01:00
422e6b7d41
Support expressing application `args` in `@SpringBootTest`
...
Add `args` property to the `@SpringBootTest` annotation so tests
can easily supply application arguments to pass to their app under test.
See gh-14823
2019-02-13 14:38:26 +01:00
c04eba7ebc
Polish "Add TestNG support in TestTypeExcludeFilter"
...
See gh-7630
2019-02-12 15:28:19 +00:00
b005008cac
Add TestNG support in TestTypeExcludeFilter
...
See gh-7630
2019-02-12 15:27:51 +00:00
89bf486d0c
Merge branch '2.1.x'
2019-02-05 11:39:37 +00:00
1f67707509
Fix cast in TestRestTemplateContextCustomizer
...
Closes gh-15843
2019-02-05 11:39:25 +00:00
45cc649c7d
Merge branch '2.1.x'
2019-02-04 12:36:33 +00:00
82bc87560c
Use AssertJ’s exception assertions rather than fail
...
Closes gh-15761
2019-02-04 11:48:26 +00:00
2cb147af7c
Merge branch '2.1.x'
2019-01-22 09:22:17 +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
32b14f3098
Merge branch '2.1.x'
2019-01-17 16:15:32 -05: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
33f2bd4d61
Merge branch '2.1.x'
2019-01-14 08:13:37 -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
6baa6b291e
Polish contribution
...
Closes gh-15695
2019-01-14 08:11:20 -05:00
af3ed9ff9f
Polish
...
See gh-15695
2019-01-14 08:09:32 -05:00
1e98c78ab9
Fix typo
2018-12-31 09:59:00 +01:00
ff8edf8d98
Use assertJ to generate AssertionError and filter its stacktrace
...
Closes gh-15569
2018-12-31 09:58:13 +01:00
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
dfd477aa74
Merge branch '2.1.x'
2018-12-11 08:53:37 +01: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
e367b54928
Merge branch '2.1.x'
2018-12-07 11:57:19 -08:00
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
2018-12-05 17:48:27 -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
bd8106d77f
Upgrade to Spring Framework 5.1
...
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.
Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.
See gh-13321
2018-06-04 18:59:17 +02:00
e306aad28c
Merge branch '2.0.x'
2018-06-01 17:27:10 +01:00
27267a7090
Ensure that condition evaluator uses runner’s class loader
...
Closes gh-13319
2018-06-01 17:26:32 +01:00
52b80c77d8
Merge branch '2.0.x'
2018-05-29 10:39:39 +02:00
17bcd1c359
Fix wrong reference in cast operation
...
Closes gh-13288
2018-05-29 10:37:32 +02:00
7462401291
Merge branch '2.0.x'
2018-05-28 09:28:30 +02:00
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
4464a5f5bd
Remove code deprecated in 2.0
...
Closes gh-12962
2018-05-22 14:48:25 +02:00
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
300f6bf4d7
Polish contribution
...
Closes gh-13208
2018-05-18 14:20:31 +02:00
d31dbac69e
Support custom UriTemplateHandler in LocalHostUriTemplateHandler
...
See gh-13208
2018-05-18 14:19:01 +02:00
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
f03849d502
Polish
...
See gh-12812
2018-04-10 11:46:16 +02:00
4c61d8abfe
avoid check class by string name
2018-03-14 23:59:42 +01:00
ed05e1f7ca
Polish "Reorder modifiers to comply with the JLS"
...
Closes gh-12432
2018-03-12 15:17:23 +01:00
dreis2211
Phillip Webb
Andy Wilkinson
Madhura Bhave
Stephane Nicoll
Diego Berrueta
Spring Operator
Dmytro Nosan
Sebastien Deleuze
Justin Griffin
Eddú Meléndez
Johnny Lim
NAIT BELKACEM
igor-suhorukov
Camille Vienot
Roy Jacobs
Marten Deinum
Andreas Neiser
artsiom
Brian Clozel
nkjackzhang
Mihhail Lapushkin