diff options
| author | Ola Aunrønning <olaa@oath.com> | 2019-05-14 13:36:00 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@oath.com> | 2019-05-14 13:36:35 +0200 |
| commit | d254455be444517118ab45320e31fc9068793f42 (patch) | |
| tree | 3106b71e817e4e1d8e02b5b4b2703f658ef82aa8 | |
| parent | 9cc325556adb375c0efbefaf2443976823fba3ea (diff) | |
Fixed test
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/metrics/MetricsRetrieverTest.java | 15 | ||||
| -rw-r--r-- | configserver/src/test/resources/metrics_response | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/MetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/MetricsRetrieverTest.java index e296b3a44c8..86874a0dae9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/MetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/MetricsRetrieverTest.java @@ -44,17 +44,17 @@ public class MetricsRetrieverTest { stubFor(get(urlEqualTo("/1")) .willReturn(aResponse() .withStatus(200) - .withBody(metricsString(10,20,33,40,50)))); + .withBody(metricsString()))); stubFor(get(urlEqualTo("/2")) .willReturn(aResponse() .withStatus(200) - .withBody(metricsString(1,2,3,4,5)))); + .withBody(metricsString()))); stubFor(get(urlEqualTo("/3")) .willReturn(aResponse() .withStatus(200) - .withBody(metricsString(1,2,3,4,5)))); + .withBody(metricsString()))); MetricsResponse metricsResponse = metricsRetriever.retrieveAllMetrics(applications); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -69,7 +69,7 @@ public class MetricsRetrieverTest { " \"queriesPerSecond\": 2.8666666666666667,\n" + " \"writesPerSecond\": 1.4333333333333333,\n" + " \"documentCount\": 6000.0,\n" + - " \"queryLatencyMillis\": 116.27906976744185,\n" + + " \"queryLatencyMillis\": 93.02325581395348,\n" + " \"feedLatency\": 69.76744186046511\n" + " },\n" + " \"timestamp\": 1557306075\n" + @@ -80,7 +80,7 @@ public class MetricsRetrieverTest { " \"queriesPerSecond\": 1.4333333333333333,\n" + " \"writesPerSecond\": 0.7166666666666667,\n" + " \"documentCount\": 3000.0,\n" + - " \"queryLatencyMillis\": 116.27906976744185,\n" + + " \"queryLatencyMillis\": 93.02325581395348,\n" + " \"feedLatency\": 69.76744186046511\n" + " },\n" + " \"timestamp\": 1557306075\n" + @@ -92,8 +92,7 @@ public class MetricsRetrieverTest { wireMock.stop(); } - private String metricsString(double queriesPerSecond, double writesPerSecond, double documentCount, double queryLatencyMillis, double writeLatencyMills) throws IOException { - String responseBody = Files.readString(Path.of("src/test/resources/metrics_response")); - return String.format(responseBody, queriesPerSecond, writesPerSecond, documentCount, queryLatencyMillis, writeLatencyMills); + private String metricsString() throws IOException { + return Files.readString(Path.of("src/test/resources/metrics_response")); } }
\ No newline at end of file diff --git a/configserver/src/test/resources/metrics_response b/configserver/src/test/resources/metrics_response index ef992ba067b..19fa2c97799 100644 --- a/configserver/src/test/resources/metrics_response +++ b/configserver/src/test/resources/metrics_response @@ -26,7 +26,7 @@ }, { - "name":"qrs", + "name":"qrserver", "timestamp": 1557306075, "metrics": [ { |