1 files changed, 14 insertions, 4 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
index 54004e7872a..a54e050bac7 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.metricsproxy.service;
 
+import ai.vespa.metricsproxy.metric.Metric;
 import ai.vespa.metricsproxy.metric.Metrics;
 import ai.vespa.metricsproxy.metric.model.MetricId;
 import org.junit.After;
@@ -8,9 +9,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static ai.vespa.metricsproxy.TestUtil.getFileContents;
+import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.service.RemoteMetricsFetcher.METRICS_PATH;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Unknown
@@ -53,15 +57,13 @@ public class VespaServiceTest {
     // TODO: Make it possible to test this without running a HTTP server to create the response
     public void testMetricsFetching() {
         VespaService service = VespaService.create("service1", "id", httpServer.port());
-        Metrics metrics = service.getMetrics();
-        assertThat(metrics.getMetric(MetricId.toMetricId("queries.count")).getValue().intValue(), is(28));
+        assertEquals(28, getMetric("queries.count", service.getMetrics()).getValue().intValue());
 
         // Shutdown server and check that no metrics are returned (should use empty metrics
         // when unable to fetch new metrics)
         shutdown();
 
-        metrics = service.getMetrics();
-        assertThat(metrics.size(), is(0));
+        assertTrue(service.getMetrics().list().isEmpty());
     }
 
     @After
@@ -69,4 +71,12 @@ public class VespaServiceTest {
         this.httpServer.close();
     }
 
+    public Metric getMetric(String metric, Metrics metrics) {
+        for (Metric m: metrics.list()) {
+            if (m.getName().equals(toMetricId(metric)))
+                return m;
+        }
+        return null;
+    }
+
 }