diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-05-27 14:53:42 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-05-27 14:53:42 +0200 |
commit | c3af22625994c04405a2675cedd5072e0dbcf0c4 (patch) | |
tree | 2c5445adcede3b4c7166ee1425fab414bc5de8ef /controller-server | |
parent | b9d352fd4fe4cea477c5c036fa8c849e23ae8c82 (diff) |
Verify confidence conversion
Diffstat (limited to 'controller-server')
2 files changed, 14 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java index 28c6d262fc5..9cf4f014e3e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java @@ -49,7 +49,7 @@ public class VersionStatusUpdater extends ControllerMaintainer { } } - private static SystemMonitor.Confidence convert(VespaVersion.Confidence confidence) { + static SystemMonitor.Confidence convert(VespaVersion.Confidence confidence) { switch (confidence) { case broken: return broken; case low: return low; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java index d3efac55a1a..d287c025b42 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java @@ -2,12 +2,16 @@ package com.yahoo.vespa.hosted.controller.maintenance; import com.yahoo.vespa.hosted.controller.ControllerTester; +import com.yahoo.vespa.hosted.controller.api.integration.organization.SystemMonitor; import com.yahoo.vespa.hosted.controller.versions.VersionStatus; +import com.yahoo.vespa.hosted.controller.versions.VespaVersion; import org.junit.Test; import java.time.Duration; import java.util.Collections; +import java.util.List; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,5 +33,14 @@ public class VersionStatusUpdaterTest { updater.maintain(); assertTrue(tester.controller().versionStatus().systemVersion().isPresent()); } + + @Test + public void testConfidenceConversion() { + List.of(VespaVersion.Confidence.values()).forEach(VersionStatusUpdater::convert); + assertEquals(SystemMonitor.Confidence.broken, VersionStatusUpdater.convert(VespaVersion.Confidence.broken)); + assertEquals(SystemMonitor.Confidence.low, VersionStatusUpdater.convert(VespaVersion.Confidence.low)); + assertEquals(SystemMonitor.Confidence.normal, VersionStatusUpdater.convert(VespaVersion.Confidence.normal)); + assertEquals(SystemMonitor.Confidence.high, VersionStatusUpdater.convert(VespaVersion.Confidence.high)); + } } |