diff --git a/src/main/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGauge.java b/src/main/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGauge.java index 84125e58c..3558baf76 100644 --- a/src/main/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGauge.java +++ b/src/main/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGauge.java @@ -37,17 +37,16 @@ public void calculateMetric(Run jenkinsObject, String[] labelValues) { return; } + int ordinal = -1; Result result = jenkinsObject.getResult(); - if (result == null) { - return; + if (null != result) { + ordinal = result.ordinal; } if (labelValues == null) { - this.collector.labels().set(result.ordinal); + this.collector.labels().set(ordinal); } else { - this.collector.labels(labelValues).set(result.ordinal); + this.collector.labels(labelValues).set(ordinal); } - - } } diff --git a/src/test/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGaugeTest.java b/src/test/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGaugeTest.java index 4e1ad4fd6..cda351641 100644 --- a/src/test/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGaugeTest.java +++ b/src/test/java/org/jenkinsci/plugins/prometheus/collectors/builds/BuildResultOrdinalGaugeTest.java @@ -13,7 +13,7 @@ public class BuildResultOrdinalGaugeTest extends MockedRunCollectorTest { @Test - public void testNothingCalculatedAsRunNotYetOver() { + public void testResultIsMinusOneWhenRunResultIsNull() { Mockito.when(mock.getResult()).thenReturn(null); @@ -24,7 +24,11 @@ public void testNothingCalculatedAsRunNotYetOver() { List collect = sut.collect(); Assertions.assertEquals(1, collect.size()); - Assertions.assertEquals(0, collect.get(0).samples.size(), "Would expect no result"); + Assertions.assertEquals(1, collect.get(0).samples.size(), "Would expect one result"); + + Assertions.assertEquals("default_jenkins_builds_build_result_ordinal", collect.get(0).samples.get(0).name); + Assertions.assertEquals(-1.0, collect.get(0).samples.get(0).value); + } @Test