From 05ad4199ba7c3447a339c396a1883f98f30726fe Mon Sep 17 00:00:00 2001 From: Daniel Pozzi Date: Wed, 23 Jun 2021 09:01:52 +0200 Subject: [PATCH] [#562] cleanup --- .../nivio/assessment/kpi/CustomKPITest.java | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/src/test/java/de/bonndan/nivio/assessment/kpi/CustomKPITest.java b/src/test/java/de/bonndan/nivio/assessment/kpi/CustomKPITest.java index 930a520ca..cffec6ec5 100644 --- a/src/test/java/de/bonndan/nivio/assessment/kpi/CustomKPITest.java +++ b/src/test/java/de/bonndan/nivio/assessment/kpi/CustomKPITest.java @@ -7,9 +7,12 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import static de.bonndan.nivio.model.ItemFactory.getTestItem; @@ -26,34 +29,23 @@ void setup() { kpiConfig.label = LABEL; } - @Test - void testWithRanges1() { + @ParameterizedTest + @CsvSource({ + "2.58, green", + "0, green", + "10.1, yellow", + }) + void testWithRanges1(String value, String status) { CustomKPI test = new CustomKPI(); kpiConfig.ranges = getRangeMap(); test.init(kpiConfig); - StatusValue statusValue = test.getStatusValues(getComponent("2.58")).get(0); - assertNotNull(statusValue); - Assertions.assertEquals(Status.GREEN, statusValue.getStatus()); - } - @Test - void testWithRanges2() { - CustomKPI test = new CustomKPI(); - kpiConfig.ranges = getRangeMap(); - test.init(kpiConfig); - StatusValue statusValue = test.getStatusValues(getComponent("0")).get(0); - assertNotNull(statusValue); - Assertions.assertEquals(Status.GREEN, statusValue.getStatus()); - } + //when + StatusValue statusValue = test.getStatusValues(getComponent(value)).get(0); - @Test - void testWithRanges3() { - CustomKPI test = new CustomKPI(); - kpiConfig.ranges = getRangeMap(); - test.init(kpiConfig); - StatusValue statusValue = test.getStatusValues(getComponent("10.1")).get(0); + //then assertNotNull(statusValue); - Assertions.assertEquals(Status.YELLOW, statusValue.getStatus()); + Assertions.assertEquals(status, statusValue.getStatus().getName().toLowerCase(Locale.ROOT)); } @Test