Commit Graph

159 Commits

Author SHA1 Message Date
Madhura Bhave
b16927ce91 Add @WithMockUser to tests
See gh-14227
2018-08-30 18:55:02 -07:00
Madhura Bhave
8f946260d2 Update copyright year for changed files 2018-08-30 16:56:37 -07:00
Madhura Bhave
0384a88b57 Include web security config classes in @WebMvcTest
Security config classes are not included when the
secure flag is set to false.

Closes gh-6514
2018-08-30 16:47:31 -07:00
Madhura Bhave
d91c71b508 Deprecate secure flag on @WebMvcTest
Closes gh-14227
2018-08-30 16:47:31 -07:00
Madhura Bhave
f3fa952cbc Support WebExceptionHandler in @WebFluxTest
Closes gh-13627
2018-08-27 16:35:49 -07:00
Johnny Lim
9602a32a8d Polish
Closes gh-14172
2018-08-23 11:40:44 +02:00
Johnny Lim
c95b339f02 Polish
Closes gh-14149
2018-08-22 10:38:00 +02:00
Andy Wilkinson
075a745e32 Polish "Allow properties to be configured using slice test annotations"
Closes gh-14052
2018-08-16 11:27:49 +01:00
artsiom
0cf1749e85 Allow properties to be configured using slice test annotations
See gh-14052
2018-08-16 11:27:49 +01:00
Andy Wilkinson
f10377bdb7 Polish "Add support for multiple REST Docs configuration customizers"
Closes gh-13498
2018-08-16 09:48:03 +01:00
Eddú Meléndez
4d310f0d5a Add support for multiple REST Docs configuration customizers
This commit introduces support for multiple configuration customizers
for REST Docs with MockMvc, WebTestClient, and REST Assured.

Closes gh-13498
2018-08-16 09:48:03 +01:00
Stephane Nicoll
143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
dreis2211
66b1742f96 Optimize some StringBuilder.append() calls
Closes gh-13961
2018-08-01 08:41:03 +02:00
Phillip Webb
4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb
80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb
aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
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
Phillip Webb
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
Phillip Webb
b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Madhura Bhave
4fee54cf24 Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.

Closes gh-13241
2018-07-17 13:00:54 -07:00
Andy Wilkinson
6a48a440b2 Annotate our test annotations with @ExtendWith(SpringExtension.class)
Closes gh-13739
2018-07-11 17:25:21 +01:00
Andy Wilkinson
8cc0d5577e Avoid unwanted bean overrides in spring-boot-test-autoconfigure
See gh-13609
2018-07-10 19:54:48 +01:00
Stephane Nicoll
7462401291 Merge branch '2.0.x' 2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b Fix javadoc
Closes gh-13274
2018-05-28 09:26:16 +02:00
Phillip Webb
3702da4573 Formatting 2018-05-25 23:52:38 -07:00
Vedran Pavic
f81f50c119 Improve LDAP auto-configuration
Auto-configuration of LDAP's `LdapTemplate` is currently a part of
`LdapDataAutoConfiguration` which is conditional of presence of
`LdapRepository` (i.e. Spring Data LDAP). This arrangement isn't ideal
since the `LdapTemplate` is a part of Spring LDAP project, and therefore
should not be tied to Spring Data LDAP.

This commit improves and simplifies LDAP auto-configuration by moving
`LdapTemplate` configuration to `LdapAutoConfiguration`. Consequently,
`LdapDataAutoConfiguration` is not needed anymore and is removed.

See gh-13136
2018-05-11 14:37:13 +02:00
Stephane Nicoll
360f4e17c2 Add support for PageableHandlerMethodArgumentResolver in WebMvcTest
Closes gh-13066
2018-05-11 10:37:17 +02:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Johnny Lim
d8700522d3 Rename nested *AutoConfiguration classes to *Configuration
Closes gh-12989
2018-04-30 16:50:18 +02:00
dreis2211
a930835b92 Replace <code> tags where possible
Closes gh-12922
2018-04-20 07:19:31 +02:00
Stephane Nicoll
f83934e192 Polish contribution
Closes gh-12812
2018-04-10 11:46:16 +02:00
Johnny Lim
f03849d502 Polish
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson
f335ec00bf Polish 2018-04-05 09:31:17 +01:00
Phillip Webb
598e9bb842 Polish 2018-04-04 18:01:25 -07:00
Stephane Nicoll
b6f9b46be8 Only create a WebTestClient with WebFlux
This commit updates WebTestClientAutoConfiguration to only create a
WebTestClient when running a WebFlux-based application as mocking the
context only works with that mode at the moment.

Closes gh-12318
2018-04-03 11:31:37 +02:00
Johnny Lim
c100510222 Remove value in @ConditionalOnMissingBean if possible
See gh-12604
2018-03-26 17:38:46 +02:00
Phillip Webb
a4b0be089d Polish 2018-03-14 14:05:26 -07:00
Stephane Nicoll
5320081d0b Revert "Only create a WebTestClient with WebFlux"
This reverts commit 282bd9f
2018-03-14 08:34:48 -04:00
Stephane Nicoll
282bd9f0db Only create a WebTestClient with WebFlux
This commit updates WebTestClientAutoConfiguration to only create a
WebTestClient when running a WebFlux-based application as mocking the
context only works with that mode at the moment.

Closes gh-12318
2018-03-14 05:12:45 -04:00
dreis2211
0d3f3e46dd Fix typos
Closes gh-12468
2018-03-13 17:42:19 -07:00
Madhura Bhave
4ca1e6ae4e Polish "Fix typo in TestDatabaseAutoConfiguration"
Closes gh-12350
2018-03-05 13:13:07 -08:00
inabajunmr
ddd8598e2e Fix typo in TestDatabaseAutoConfiguration failure msg
See gh-12350
2018-03-05 13:10:46 -08:00
Phillip Webb
9bee9e9cf9 Polish 2018-02-28 13:50:43 -08:00
Madhura Bhave
df337eaf5e Fix author name 2018-02-28 12:26:58 -08:00
Phillip Webb
7bc535e4fa Polish 2018-02-28 10:59:26 -08:00
Phillip Webb
67998e983f Revert "Include WebSecurityConfigurer beans in @WebMvcTest"
This reverts commit eef6fdb066.
2018-02-28 10:59:26 -08:00
Phillip Webb
eef6fdb066 Include WebSecurityConfigurer beans in @WebMvcTest
Update `WebMvcTypeExcludeFilter` to include `WebSecurityConfigurer`
beans.

Fixes gh-12275
2018-02-27 21:05:35 -08:00
Stephane Nicoll
306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
Phillip Webb
4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
2018-02-22 21:11:30 -08:00
igor-suhorukov
fe023817c7 Polish static finals
Closes gh-12083
2018-02-19 20:10:58 -08:00
Andy Wilkinson
5522174e96 Provide package info for all packages included in javadoc 2018-02-08 16:50:37 +00:00
Andy Wilkinson
76a450dfba Format with Eclipse Oxygen SR2 2018-02-08 10:53:53 +00:00
Madhura Bhave
7136bed126 Fix tests 2018-02-07 17:36:44 -08:00
Andy Wilkinson
875091ed85 Polish “Remove or use unused method parameters”
Closes gh-11812
2018-02-02 09:34:19 +00:00
Andy Wilkinson
458dde63a8 Explicitly order AbstractTestExecutionListener subclasses
By default, AbstractTestExecutionListeners have an order of lowest
precedence. This means that it is impossible to write a listener with
lower precedence that any listener that's using the default order.

This commit updates Boot's 6 AbstractTestExecutionListeners to order
them explicitly. MockitoTestExecutionListener performs injection of
Mockito mocks and spies into the test instance. It now has an order of
2050 giving it slightly lower precedence than the dependency injection
test execution listener (2000).

The remaining 5 listeners have all been ordered with lowest precedence
- 100. This leaves them near their current lowest precedence position
while creating some room for any listeners that require lower
precedence.

Closes gh-11796
2018-02-01 14:28:25 +00:00
Stephane Nicoll
3f1aaa1f7e Polish contribution
Closes gh-11783
2018-01-26 10:03:47 +01:00
Raja Kolli
64c324612e Polish
See gh-11783
2018-01-26 09:52:52 +01:00
Phillip Webb
dc935fba48 Polish 2018-01-19 20:44:18 -08:00
Madhura Bhave
5e2cc02499 Move servlet specific security auto-config 2018-01-20 09:41:50 +05:30
Phillip Webb
b078698f20 Update copyright year of changed files 2018-01-09 12:13:27 -08:00
Phillip Webb
b9bb31cfd4 Extract RestDocsProperties
Extract properties used by RestDocs to their own class.
2018-01-09 12:11:23 -08:00
Andy Wilkinson
964939d3a9 Polish "Add auto-configuration for using REST Docs with WebTestClient"
Closes gh-10696
2018-01-09 11:53:12 +00:00
Roman Zaynetdinov
ab7c47d340 Add auto-configuration for using REST Docs with WebTestClient
See gh-10969
2018-01-09 11:37:14 +00:00
Andy Wilkinson
16c52bce84 Introduce WebTestClientBuilderCustomizer callback
Closes gh-11579
2018-01-09 11:16:27 +00:00
Johnny Lim
b8706c47d6 Use instance equality for Class
Closes gh-11534
2018-01-09 09:30:36 +01:00
Phillip Webb
201da97774 Further refine test containers 2018-01-08 16:32:39 -08:00
Phillip Webb
25609c060e Polish 2018-01-08 15:19:06 -08:00
Madhura Bhave
9a6c339243 Use TestContainers util from spring-boot-test-support
See gh-10516
2018-01-08 14:05:15 -08:00
Andy Wilkinson
996b3ef7f2 Refine test containers 2018-01-08 14:05:05 -08:00
Andy Wilkinson
927003e0b7 Polish 2018-01-08 13:59:14 +00:00
Andy Wilkinson
94d5836618 Merge branch '1.5.x' 2018-01-05 12:02:11 +00:00
Stephane Nicoll
ac004eabf3 Update copyright header
See gh-11510
2018-01-05 10:30:43 +01:00
Johnny Lim
37d8eedae3 Polish
Closes gh-11510
2018-01-05 10:29:22 +01:00
Madhura Bhave
fc3b43e832 Wait for neo4j to start accepting connections
See gh-10516
2018-01-04 14:26:34 -08:00
Madhura Bhave
e28915bd4b Make integration tests self-contained
Fixes gh-10516
2018-01-04 11:26:40 -08:00
Madhura Bhave
8102dc78cb Remove redundant throws declarations 2017-12-29 12:10:13 -08:00
Phillip Webb
2efa21c570 Make hot methods in-line friendly
Refactor a few hot methods so that they are more likely to be in-lined
by the JIT.

Fixes gh-11409
2017-12-22 20:55:47 -08:00
Phillip Webb
3273859fde Polish 2017-12-13 14:32:55 -08:00
Stephane Nicoll
47c8b5731a polish 2017-12-13 14:41:39 +01:00
Stephane Nicoll
7216a8fa38 Polish
See gh-11341
2017-12-13 14:22:57 +01:00
Stephane Nicoll
23218add90 Polish 2017-12-12 11:57:30 +01:00
Madhura Bhave
47ed096981 Make default username and password configurable
Closes gh-10963
2017-12-11 15:15:47 -08:00
Brian Clozel
deb16e1617 Polish 2017-12-11 22:11:24 +01:00
Stephane Nicoll
5ef9364085 Polish 2017-12-11 17:55:12 +01:00
Johnny Lim
6d54072e04 Remove "final" keywords
Closes gh-11294
2017-12-08 11:13:07 -08:00
Stephane Nicoll
1620ac42b3 Polish contribution
Closes gh-11143
2017-11-27 10:14:34 +01:00
Johnny Lim
d9828a0aaa Polish
See gh-11143
2017-11-27 10:14:18 +01:00
Kazuki Shimizu
bd8834568d Add @Inherited on spring-boot-test-autoconfigure
Closes gh-11139
2017-11-26 11:27:49 +01:00
Andy Wilkinson
61f9d240df Polish 2017-11-24 16:31:31 +00:00
Johnny Lim
1783a072ad Remove explicit constructor super() calls
Closes gh-11068
2017-11-17 16:44:16 -08:00
Stephane Nicoll
1830dcf103 Rename AutoConfigurationReportEndpoint to ConditionsEndpoint
This commit further aligns the change to ConditionEvaluationReport by
renaming the 'autoconfig' endpoint to 'conditions'.

Closes gh-2945
2017-11-14 15:25:07 +01:00
Stephane Nicoll
4e88db9883 Scan converters with @WebMvcTest and @WebFluxTest
This commit makes sure to automatically scan `Converter` and
`GenericConverter` beans when a test uses `@WebMvcTest` or
`@WebFluxTest`.

Closes gh-10802
2017-11-10 15:58:27 +01:00
Johnny Lim
bd0dcfb172 Utilize StandardCharsets
Closes gh-10972
2017-11-10 09:49:13 +01:00
Andy Wilkinson
60afbdc868 Polish 2017-11-06 11:44:53 +00:00
Johnny Lim
c05a299520 Polish
Closes gh-10921
2017-11-06 12:28:43 +01:00
Phillip Webb
c55b5d7111 Polish 2017-11-01 23:14:52 -07:00