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
d597cc33
Commit
d597cc33
authored
Apr 25, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test broken in gh-708
parent
6ad7257b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
AutoConfigurationReportTests.java
...autoconfigure/condition/AutoConfigurationReportTests.java
+3
-6
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java
View file @
d597cc33
...
@@ -37,7 +37,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
...
@@ -37,7 +37,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import
org.springframework.context.annotation.Condition
;
import
org.springframework.context.annotation.Condition
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.context.annotation.Import
;
import
static
org
.
hamcrest
.
Matchers
.
contains
InAnyOrder
;
import
static
org
.
hamcrest
.
Matchers
.
contains
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
...
@@ -201,7 +201,6 @@ public class AutoConfigurationReportTests {
...
@@ -201,7 +201,6 @@ public class AutoConfigurationReportTests {
}
}
@Test
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
duplicateOutcomes
()
{
public
void
duplicateOutcomes
()
{
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
(
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
(
DuplicateConfig
.
class
);
DuplicateConfig
.
class
);
...
@@ -212,7 +211,7 @@ public class AutoConfigurationReportTests {
...
@@ -212,7 +211,7 @@ public class AutoConfigurationReportTests {
ConditionAndOutcomes
outcomes
=
report
.
getConditionAndOutcomesBySource
().
get
(
ConditionAndOutcomes
outcomes
=
report
.
getConditionAndOutcomesBySource
().
get
(
autoconfigKey
);
autoconfigKey
);
assertThat
(
outcomes
,
not
(
nullValue
()));
assertThat
(
outcomes
,
not
(
nullValue
()));
assertThat
(
getNumberOfOutcomes
(
outcomes
),
equalTo
(
2
));
assertThat
(
getNumberOfOutcomes
(
outcomes
),
equalTo
(
1
));
List
<
String
>
messages
=
new
ArrayList
<
String
>();
List
<
String
>
messages
=
new
ArrayList
<
String
>();
for
(
ConditionAndOutcome
outcome
:
outcomes
)
{
for
(
ConditionAndOutcome
outcome
:
outcomes
)
{
...
@@ -222,9 +221,7 @@ public class AutoConfigurationReportTests {
...
@@ -222,9 +221,7 @@ public class AutoConfigurationReportTests {
Matcher
<
String
>
onClassMessage
=
containsString
(
"@ConditionalOnClass "
Matcher
<
String
>
onClassMessage
=
containsString
(
"@ConditionalOnClass "
+
"classes found: javax.servlet.Servlet,org.springframework.web.multipart.support.StandardServletMultipartResolver"
);
+
"classes found: javax.servlet.Servlet,org.springframework.web.multipart.support.StandardServletMultipartResolver"
);
Matcher
<
String
>
onBeanMessage
=
containsString
(
"@ConditionalOnBean "
assertThat
(
messages
,
contains
(
onClassMessage
));
+
"(types: javax.servlet.MultipartConfigElement; SearchStrategy: all) found no beans"
);
assertThat
(
messages
,
containsInAnyOrder
(
onClassMessage
,
onBeanMessage
));
context
.
close
();
context
.
close
();
}
}
...
...
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