Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
6859a89c
Commit
6859a89c
authored
Jul 22, 2019
by
Dmytro Nosan
Committed by
Madhura Bhave
Jul 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include HandlerInterceptor beans in WebMvcTest slice
See gh-17600
parent
53afbbe2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
WebMvcTypeExcludeFilter.java
...st/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
+2
-0
WebMvcTypeExcludeFilterTests.java
...toconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
+10
-0
No files found.
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
View file @
6859a89c
...
...
@@ -35,6 +35,7 @@ import org.springframework.util.ClassUtils;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
import
org.springframework.web.method.support.HandlerMethodArgumentResolver
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
/**
...
...
@@ -65,6 +66,7 @@ class WebMvcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeF
includes
.
add
(
ErrorAttributes
.
class
);
includes
.
add
(
Converter
.
class
);
includes
.
add
(
GenericConverter
.
class
);
includes
.
add
(
HandlerInterceptor
.
class
);
for
(
String
optionalInclude
:
OPTIONAL_INCLUDES
)
{
try
{
includes
.
add
(
ClassUtils
.
forName
(
optionalInclude
,
null
));
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
View file @
6859a89c
...
...
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Controller;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -55,6 +56,7 @@ class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleWebSecurityConfigurer
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleHandlerInterceptor
.
class
)).
isFalse
();
}
@Test
...
...
@@ -68,6 +70,7 @@ class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleWebSecurityConfigurer
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleHandlerInterceptor
.
class
)).
isFalse
();
}
@Test
...
...
@@ -81,6 +84,7 @@ class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleWebSecurityConfigurer
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleHandlerInterceptor
.
class
)).
isTrue
();
}
@Test
...
...
@@ -93,6 +97,7 @@ class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
ExampleMessageConverter
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleHandlerInterceptor
.
class
)).
isFalse
();
}
@Test
...
...
@@ -106,6 +111,7 @@ class WebMvcTypeExcludeFilterTests {
assertThat
(
excludes
(
filter
,
ExampleService
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleRepository
.
class
)).
isTrue
();
assertThat
(
excludes
(
filter
,
ExampleWebSecurityConfigurer
.
class
)).
isFalse
();
assertThat
(
excludes
(
filter
,
ExampleHandlerInterceptor
.
class
)).
isFalse
();
}
private
boolean
excludes
(
WebMvcTypeExcludeFilter
filter
,
Class
<?>
type
)
throws
IOException
{
...
...
@@ -175,4 +181,8 @@ class WebMvcTypeExcludeFilterTests {
}
static
class
ExampleHandlerInterceptor
implements
HandlerInterceptor
{
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment