Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix batch metrics test

Browse Source 
Micrometer's global registry might contain other metrics than
those from Spring Batch. This commit updates the test to expect
at least those from Spring Batch to be registered.

Issue BATCH-2774
This commit is contained in:
Mahmoud Ben Hassine
2019-04-15 08:35:01 +02:00
parent b24a05d532
commit 3bc00a7c07
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java
View File

@@ -20,7 +20,6 @@ import java.util.List;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.Metrics;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.springframework.batch.core.ExitStatus;
@@ -42,11 +41,13 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class BatchMetricsTests {
private static final int EXPECTED_SPRING_BATCH_METRICS = 6;
@Test
public void testBatchMetrics() throws Exception {
// given
@@ -60,7 +61,7 @@ public class BatchMetricsTests {
// then
assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
List<Meter> meters = Metrics.globalRegistry.getMeters();
assertThat(meters, Matchers.hasSize(7));
assertTrue(meters.size() >= EXPECTED_SPRING_BATCH_METRICS);
try {
Metrics.globalRegistry.get("spring.batch.job")