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
1f677075
Commit
1f677075
authored
Feb 05, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cast in TestRestTemplateContextCustomizer
Closes gh-15843
parent
8a7958ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
1 deletion
+83
-1
TestRestTemplateContextCustomizer.java
...ot/test/web/client/TestRestTemplateContextCustomizer.java
+1
-1
TestRestTemplateContextCustomizerTests.java
...st/web/client/TestRestTemplateContextCustomizerTests.java
+82
-0
No files found.
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
View file @
1f677075
...
@@ -62,7 +62,7 @@ class TestRestTemplateContextCustomizer implements ContextCustomizer {
...
@@ -62,7 +62,7 @@ class TestRestTemplateContextCustomizer implements ContextCustomizer {
private
void
registerTestRestTemplate
(
ConfigurableApplicationContext
context
)
{
private
void
registerTestRestTemplate
(
ConfigurableApplicationContext
context
)
{
ConfigurableListableBeanFactory
beanFactory
=
context
.
getBeanFactory
();
ConfigurableListableBeanFactory
beanFactory
=
context
.
getBeanFactory
();
if
(
beanFactory
instanceof
BeanDefinitionRegistry
)
{
if
(
beanFactory
instanceof
BeanDefinitionRegistry
)
{
registerTestRestTemplate
((
BeanDefinitionRegistry
)
context
);
registerTestRestTemplate
((
BeanDefinitionRegistry
)
beanFactory
);
}
}
}
}
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerTests.java
0 → 100644
View file @
1f677075
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
test
.
web
.
client
;
import
org.junit.Test
;
import
org.springframework.beans.BeansException
;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory
;
import
org.springframework.beans.factory.support.DefaultListableBeanFactory
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest.WebEnvironment
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.context.support.AbstractApplicationContext
;
import
org.springframework.test.context.MergedContextConfiguration
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
/**
* Tests for {@link TestRestTemplateContextCustomizer}.
*
* @author Andy Wilkinson
*/
public
class
TestRestTemplateContextCustomizerTests
{
@Test
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
public
void
whenContextIsNotABeanDefinitionRegistryTestRestTemplateIsRegistered
()
{
new
ApplicationContextRunner
(
TestApplicationContext:
:
new
)
.
withInitializer
((
context
)
->
{
MergedContextConfiguration
configuration
=
mock
(
MergedContextConfiguration
.
class
);
given
(
configuration
.
getTestClass
())
.
willReturn
((
Class
)
TestClass
.
class
);
new
TestRestTemplateContextCustomizer
().
customizeContext
(
context
,
configuration
);
}).
run
((
context
)
->
assertThat
(
context
)
.
hasSingleBean
(
TestRestTemplate
.
class
));
}
@SpringBootTest
(
webEnvironment
=
WebEnvironment
.
RANDOM_PORT
)
static
class
TestClass
{
}
private
static
class
TestApplicationContext
extends
AbstractApplicationContext
{
private
final
ConfigurableListableBeanFactory
beanFactory
=
new
DefaultListableBeanFactory
();
@Override
protected
void
refreshBeanFactory
()
throws
BeansException
,
IllegalStateException
{
}
@Override
protected
void
closeBeanFactory
()
{
}
@Override
public
ConfigurableListableBeanFactory
getBeanFactory
()
throws
IllegalStateException
{
return
this
.
beanFactory
;
}
}
}
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