diff options
Diffstat (limited to 'node-maintainer/src/test/java/com/yahoo/vespa/hosted/node')
3 files changed, 14 insertions, 16 deletions
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/HostURLGeneratorTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/HostURLGeneratorTest.java index 8fe1e20b63e..428f6c0b738 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/HostURLGeneratorTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/HostURLGeneratorTest.java @@ -1,13 +1,13 @@ package com.yahoo.vespa.hosted.node.verification.commons; import com.yahoo.vespa.hosted.node.verification.mock.MockCommandExecutor; -import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; import org.junit.Before; import org.junit.Test; import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -19,9 +19,9 @@ public class HostURLGeneratorTest { private MockCommandExecutor mockCommandExecutor; private static final String CAT_NODE_HOST_NAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest"; - private static final String CAT_CONFIG_SERVER_HOST_NAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput"; private static final String CAT_WRONG_HOSTNAME_PATH = "cat src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest"; - private static final String CONFIG_SERVER_HOSTNAME = "http://cfg1.prod.region1:4080"; + private static final String CONFIG_SERVER_HOSTNAME_1 = "http://cfg1.prod.region1:4080"; + private static final String CONFIG_SERVER_HOSTNAME_2 = "http://cfg2.prod.region1:4080"; private static final String NODE_HOSTNAME_PREFIX = "/nodes/v2/node/"; private static final String EXPECTED_HOSTNAME = "expected.hostname"; @@ -30,23 +30,22 @@ public class HostURLGeneratorTest { mockCommandExecutor = new MockCommandExecutor(); } + @Test public void generateNodeInfoUrl_find_config_server_test_if_url_is_formatted_correctly() throws Exception { - mockCommandExecutor.addCommand(CAT_CONFIG_SERVER_HOST_NAME_PATH); mockCommandExecutor.addCommand(CAT_NODE_HOST_NAME_PATH); - ArrayList<URL> url = HostURLGenerator.generateNodeInfoUrl(mockCommandExecutor); - String expectedUrl = CONFIG_SERVER_HOSTNAME + NODE_HOSTNAME_PREFIX + EXPECTED_HOSTNAME; - String actualUrl = url.get(0).toString(); - assertEquals(expectedUrl, actualUrl); - + ArrayList<URL> urls = HostURLGenerator.generateNodeInfoUrl(mockCommandExecutor, CONFIG_SERVER_HOSTNAME_1 + "," + CONFIG_SERVER_HOSTNAME_2); + String expectedUrl1 = CONFIG_SERVER_HOSTNAME_1 + NODE_HOSTNAME_PREFIX + EXPECTED_HOSTNAME; + String expectedUrl2 = CONFIG_SERVER_HOSTNAME_2 + NODE_HOSTNAME_PREFIX + EXPECTED_HOSTNAME; + assertEquals(expectedUrl1, urls.get(0).toString()); + assertEquals(expectedUrl2, urls.get(1).toString()); } @Test public void generateNodeInfoURL_expected_IOException() { try { - mockCommandExecutor.addCommand(CAT_CONFIG_SERVER_HOST_NAME_PATH); mockCommandExecutor.addCommand(CAT_WRONG_HOSTNAME_PATH); - HostURLGenerator.generateNodeInfoUrl(mockCommandExecutor); + HostURLGenerator.generateNodeInfoUrl(mockCommandExecutor, CONFIG_SERVER_HOSTNAME_1); fail("Expected an IOException to be thrown"); } catch (IOException e) { String expectedExceptionMessage = "Unexpected output from \"hostname\" command."; @@ -59,7 +58,7 @@ public class HostURLGeneratorTest { mockCommandExecutor.addCommand(CAT_NODE_HOST_NAME_PATH); String configServerHostname = "cfg1.prod.region1"; ArrayList<URL> actualUrls = HostURLGenerator.generateNodeInfoUrl(mockCommandExecutor, configServerHostname); - String expectedUrl = CONFIG_SERVER_HOSTNAME + NODE_HOSTNAME_PREFIX + EXPECTED_HOSTNAME; + String expectedUrl = CONFIG_SERVER_HOSTNAME_1 + NODE_HOSTNAME_PREFIX + EXPECTED_HOSTNAME; String actualUrl = actualUrls.get(0).toString(); assertEquals(expectedUrl, actualUrl); } diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java index 81c7dcd1291..1d0999f9463 100644 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java +++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java @@ -12,7 +12,7 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ReportSenderTest { @@ -41,7 +41,7 @@ public class ReportSenderTest { double memoryReadSpeedGBs = 0.1; benchmarkReport.setCpuCyclesPerSec(cpuCyclesPerSec); benchmarkReport.setMemoryReadSpeedGBs(memoryReadSpeedGBs); - String expectedReport = "{\"hardwareDivergence\": \"{\"benchmarkReport\":{\"cpuCyclesPerSec\":0.3,\"memoryReadSpeedGBs\":0.1}}\"}"; + String expectedReport = "{\"hardwareDivergence\": {\"benchmarkReport\":{\"cpuCyclesPerSec\":0.3,\"memoryReadSpeedGBs\":0.1}}}"; ReportSender.reportBenchmarkResults(benchmarkReport,nodeInfoUrls); assertEquals(expectedReport, println.toString()); } @@ -61,7 +61,7 @@ public class ReportSenderTest { boolean actualIpv6Connection = false; specVerificationReport.setActualDiskSpaceAvailable(actualDiskSpaceAvailable); specVerificationReport.setActualIpv6Connection(actualIpv6Connection); - String expectedReport = "{\"hardwareDivergence\": \"{\"specVerificationReport\":{\"actualDiskSpaceAvailable\":150.0,\"actualIpv6Connection\":false},\"benchmarkReport\":{\"cpuCyclesPerSec\":0.5}}\"}"; + String expectedReport = "{\"hardwareDivergence\": {\"specVerificationReport\":{\"actualDiskSpaceAvailable\":150.0,\"actualIpv6Connection\":false},\"benchmarkReport\":{\"cpuCyclesPerSec\":0.5}}}"; ReportSender.reportSpecVerificationResults(specVerificationReport, nodeInfoUrls); assertEquals(expectedReport, println.toString()); } diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput deleted file mode 100644 index 4f8a4910690..00000000000 --- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeHostNameOutput +++ /dev/null @@ -1 +0,0 @@ -services.addr_configserver: cfg1.prod.region1,cfg2.prod.region1,cfg3.prod.region1
\ No newline at end of file |