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
c489c6c5
Commit
c489c6c5
authored
Jul 11, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish test following forward merge
parent
67dfa0a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
ConditionalOnBeanTests.java
.../boot/autoconfigure/condition/ConditionalOnBeanTests.java
+8
-6
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java
View file @
c489c6c5
...
...
@@ -139,12 +139,14 @@ public class ConditionalOnBeanTests {
@Test
public
void
conditionEvaluationConsidersChangeInTypeWhenBeanIsOverridden
()
{
this
.
context
.
register
(
OriginalDefinition
.
class
,
OverridingDefinition
.
class
,
ConsumingConfiguration
.
class
);
this
.
context
.
refresh
();
assertThat
(
this
.
context
.
containsBean
(
"testBean"
)).
isTrue
();
assertThat
(
this
.
context
.
getBean
(
Integer
.
class
)).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeansOfType
(
ConsumingConfiguration
.
class
)).
isEmpty
();
this
.
contextRunner
.
withUserConfiguration
(
OriginalDefinition
.
class
,
OverridingDefinition
.
class
,
ConsumingConfiguration
.
class
)
.
run
((
context
)
->
{
assertThat
(
context
).
hasBean
(
"testBean"
);
assertThat
(
context
).
hasSingleBean
(
Integer
.
class
);
assertThat
(
context
).
doesNotHaveBean
(
ConsumingConfiguration
.
class
);
});
}
@Configuration
...
...
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