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
aebf0492
Commit
aebf0492
authored
Oct 26, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14972 from dreis2211
* pr/14972: Fix MetricsAutoConfigurationTests
parents
621eb85a
fb03139c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
MetricsAutoConfigurationTests.java
.../autoconfigure/metrics/MetricsAutoConfigurationTests.java
+5
-9
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java
View file @
aebf0492
...
@@ -16,8 +16,6 @@
...
@@ -16,8 +16,6 @@
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
import
java.util.List
;
import
io.micrometer.core.instrument.Clock
;
import
io.micrometer.core.instrument.Clock
;
import
io.micrometer.core.instrument.Meter
;
import
io.micrometer.core.instrument.Meter
;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.MeterRegistry
;
...
@@ -36,7 +34,6 @@ import org.springframework.test.util.ReflectionTestUtils;
...
@@ -36,7 +34,6 @@ import org.springframework.test.util.ReflectionTestUtils;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
spy
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
;
/**
/**
...
@@ -68,13 +65,13 @@ public class MetricsAutoConfigurationTests {
...
@@ -68,13 +65,13 @@ public class MetricsAutoConfigurationTests {
this
.
contextRunner
.
withUserConfiguration
(
MeterRegistryConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
MeterRegistryConfiguration
.
class
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
MeterRegistry
meterRegistry
=
context
.
getBean
(
MeterRegistry
.
class
);
MeterRegistry
meterRegistry
=
context
.
getBean
(
MeterRegistry
.
class
);
List
<
MeterFilter
>
filters
=
(
List
<
MeterFilter
>
)
ReflectionTestUtils
MeterFilter
[]
filters
=
(
MeterFilter
[]
)
ReflectionTestUtils
.
getField
(
meterRegistry
,
"filters"
);
.
getField
(
meterRegistry
,
"filters"
);
assertThat
(
filters
).
hasSize
(
3
);
assertThat
(
filters
).
hasSize
(
3
);
assertThat
(
filters
.
get
(
0
)
.
accept
((
Meter
.
Id
)
null
))
assertThat
(
filters
[
0
]
.
accept
((
Meter
.
Id
)
null
))
.
isEqualTo
(
MeterFilterReply
.
DENY
);
.
isEqualTo
(
MeterFilterReply
.
DENY
);
assertThat
(
filters
.
get
(
1
)
).
isInstanceOf
(
PropertiesMeterFilter
.
class
);
assertThat
(
filters
[
1
]
).
isInstanceOf
(
PropertiesMeterFilter
.
class
);
assertThat
(
filters
.
get
(
2
)
.
accept
((
Meter
.
Id
)
null
))
assertThat
(
filters
[
2
]
.
accept
((
Meter
.
Id
)
null
))
.
isEqualTo
(
MeterFilterReply
.
ACCEPT
);
.
isEqualTo
(
MeterFilterReply
.
ACCEPT
);
verify
((
MeterBinder
)
context
.
getBean
(
"meterBinder"
))
verify
((
MeterBinder
)
context
.
getBean
(
"meterBinder"
))
.
bindTo
(
meterRegistry
);
.
bindTo
(
meterRegistry
);
...
@@ -98,8 +95,7 @@ public class MetricsAutoConfigurationTests {
...
@@ -98,8 +95,7 @@ public class MetricsAutoConfigurationTests {
@Bean
@Bean
MeterRegistry
meterRegistry
()
{
MeterRegistry
meterRegistry
()
{
SimpleMeterRegistry
meterRegistry
=
new
SimpleMeterRegistry
();
return
new
SimpleMeterRegistry
();
return
spy
(
meterRegistry
);
}
}
@Bean
@Bean
...
...
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