diff options
author | gjoranv <gv@verizonmedia.com> | 2019-05-24 17:34:54 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-05-28 17:27:20 +0200 |
commit | 6172f2c40a0de0d790efd84d64f01395b6674deb (patch) | |
tree | 36d37cb96980d2c72d5bbc0c67c2e27259c2cc9e /metrics-proxy | |
parent | 36deea1b264fa21903c87495632d5ad329b1ed3e (diff) |
minor: rename test utility
Diffstat (limited to 'metrics-proxy')
7 files changed, 15 insertions, 19 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java index 5997f85a46f..e18bd38f97a 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/TestUtil.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; */ public class TestUtil { - public static String getContents(String filename) { + public static String getFileContents(String filename) { InputStream in = TestUtil.class.getClassLoader().getResourceAsStream(filename); if (in == null) { throw new RuntimeException("File not found: " + filename); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java index 4bd9d4758c4..44fe383839f 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import java.io.IOException; import java.util.List; -import static ai.vespa.metricsproxy.TestUtil.getContents; +import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static ai.vespa.metricsproxy.metric.ExternalMetrics.VESPA_NODE_SERVICE_ID; import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; @@ -35,7 +35,7 @@ public class GenericJsonModelTest { assertEquals(2, jsonModel.node.metrics.size()); assertEquals(16.222, jsonModel.node.metrics.get(0).values.get("cpu.util"), 0.01d); - String expected = getContents(TEST_FILE).trim().replaceAll("\\s+", "");; + String expected = getFileContents(TEST_FILE).trim().replaceAll("\\s+", "");; String serialized = jsonModel.serialize(); String trimmed = serialized.trim().replaceAll("\\s+", ""); @@ -81,7 +81,7 @@ public class GenericJsonModelTest { private GenericJsonModel genericJsonModelFromTestFile() throws IOException { ObjectMapper mapper = createObjectMapper(); - return mapper.readValue(getContents(TEST_FILE), GenericJsonModel.class); + return mapper.readValue(getFileContents(TEST_FILE), GenericJsonModel.class); } } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java index 20fb69e410e..c882de349c8 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java @@ -4,7 +4,6 @@ package ai.vespa.metricsproxy.rpc; -import ai.vespa.metricsproxy.TestUtil; import ai.vespa.metricsproxy.metric.HealthMetric; import ai.vespa.metricsproxy.service.MockHttpServer; import ai.vespa.metricsproxy.service.VespaService; @@ -18,6 +17,7 @@ import org.junit.Test; import java.util.List; +import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static ai.vespa.metricsproxy.rpc.IntegrationTester.SERVICE_1_CONFIG_ID; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; @@ -30,11 +30,11 @@ import static org.junit.Assert.assertThat; public class RpcHealthMetricsTest { private static final String HEALTH_OK_RESPONSE = - TestUtil.getContents("health-check.response.json"); + getFileContents("health-check.response.json"); private static final String HEALTH_FAILED_RESPONSE = - TestUtil.getContents("health-check-failed.response.json"); + getFileContents("health-check-failed.response.json"); private static final String WANTED_RPC_RESPONSE = - TestUtil.getContents("rpc-json-output-check.json").trim(); + getFileContents("rpc-json-output-check.json").trim(); // see factory/doc/port-ranges.txt private static final int httpPort = 18635; diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java index f264fd13ddc..6d1b4f3d3b7 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java @@ -4,7 +4,6 @@ package ai.vespa.metricsproxy.rpc; -import ai.vespa.metricsproxy.TestUtil; import ai.vespa.metricsproxy.metric.Metric; import ai.vespa.metricsproxy.metric.Metrics; import ai.vespa.metricsproxy.metric.model.ConsumerId; @@ -22,6 +21,7 @@ import org.junit.Test; import java.util.List; +import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static ai.vespa.metricsproxy.core.VespaMetrics.VESPA_CONSUMER_ID; import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; import static ai.vespa.metricsproxy.rpc.IntegrationTester.CUSTOM_CONSUMER_ID; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat; public class RpcMetricsTest { private static final String METRICS_RESPONSE_CCL = - TestUtil.getContents("metrics-storage-simple.json").trim(); + getFileContents("metrics-storage-simple.json").trim(); // see factory/doc/port-ranges.txt private static final int httpPort = 18633; diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java index 4174b18f3a7..0a84c03acec 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java @@ -4,7 +4,6 @@ package ai.vespa.metricsproxy.service; -import ai.vespa.metricsproxy.TestUtil; import ai.vespa.metricsproxy.metric.Metric; import org.json.JSONException; import org.junit.After; @@ -12,6 +11,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -33,7 +33,7 @@ public class ContainerServiceTest { public void setupHTTPServer() { csPort = 18637; // see factory/doc/port-ranges.txt try { - String response = TestUtil.getContents("metrics-container-state-multi-chain.json"); + String response = getFileContents("metrics-container-state-multi-chain.json"); service = new MockHttpServer(csPort, response, HttpMetricFetcher.METRICS_PATH); } catch (Exception e) { e.printStackTrace(); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java index 27e1bb97943..278b2a3143a 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java @@ -8,8 +8,6 @@ import ai.vespa.metricsproxy.TestUtil; import ai.vespa.metricsproxy.metric.Metrics; import org.junit.Test; -import java.io.File; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -21,7 +19,7 @@ public class MetricsFetcherTest { @Test public void testStateFormatMetricsParse() { - String jsonData = TestUtil.getContents("metrics-state.json"); + String jsonData = TestUtil.getFileContents("metrics-state.json"); RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port); Metrics metrics = fetcher.createMetrics(jsonData, 0); assertThat("Wrong number of metrics", metrics.size(), is(10)); 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 13be98db23a..702f741c41f 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 @@ -4,14 +4,12 @@ package ai.vespa.metricsproxy.service; -import ai.vespa.metricsproxy.TestUtil; import ai.vespa.metricsproxy.metric.Metrics; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.File; - +import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -24,7 +22,7 @@ public class VespaServiceTest { private static final String response; static { - response = TestUtil.getContents("metrics-state.json"); + response = getFileContents("metrics-state.json"); HttpMetricFetcher.CONNECTION_TIMEOUT = 60000; // 60 secs in unit tests } |