Interns/logic changes to make testing easier (#3045)

* Reformatted code

* Faulty IP adresses now affects match metric

* insideThreshold now takes threshold percentage as parameter

* change in match logic to make testing easier

* Changed IPv4 regex

5 files changed, 9 insertions, 8 deletions

diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
index c56bac698ad..f8b960749c6 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/SpecVerifierTest.java
@@ -34,6 +34,7 @@ public class SpecVerifierTest {
     private static final String NET_INTERFACE_INFO_PATH = RESOURCE_PATH + "/ifconfig";
     private static final String NET_INTERFACE_SPEED_INFO_PATH = RESOURCE_PATH + "/eth0";
     private static final String PING_RESPONSE = RESOURCE_PATH + "/validpingresponse";
+    private static final String INVALID_PING_RESPONSE = RESOURCE_PATH + "/pingresponse-all-packets-lost";
     private static final double DELTA = 0.1;
 
     @Before
@@ -64,7 +65,7 @@ public class SpecVerifierTest {
     }
 
     @Test
-    public void verifySpec_inequal_nodeRepoInfo_and_hardware_should_return_false() throws Exception {
+    public void verifySpec_unequal_nodeRepoInfo_and_hardware_should_return_false() throws Exception {
         mockCommandExecutor.addCommand("echo notUsed " + URL_RESOURCE_PATH);
         mockCommandExecutor.addCommand("echo nodeRepo.json");
         mockCommandExecutor.addCommand("cat " + CPU_INFO_PATH);
@@ -73,7 +74,7 @@ public class SpecVerifierTest {
         mockCommandExecutor.addCommand("cat " + DISK_SIZE_INFO_PATH);
         mockCommandExecutor.addCommand("cat " + NET_INTERFACE_INFO_PATH + "NoIpv6");
         mockCommandExecutor.addCommand("cat " + NET_INTERFACE_SPEED_INFO_PATH);
-        mockCommandExecutor.addCommand("cat " + PING_RESPONSE);
+        mockCommandExecutor.addCommand("cat " + INVALID_PING_RESPONSE);
         assertFalse(SpecVerifier.verifySpec(mockCommandExecutor));
     }
 
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
index f063b300ba9..aa2b2104e38 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/IPAddressVerifierTest.java
@@ -26,7 +26,7 @@ public class IPAddressVerifierTest {
     private String ipv6LookupFormat;
 
     @Before
-    public void setup() throws Exception{
+    public void setup() throws Exception {
         ipv4Address = "10.213.181.113";
         ipv6Address = "2001:4998:c:2940::111c";
         ArrayList<URL> nodeRepoUrl = new ArrayList<>(Arrays.asList(new URL(URL_RESOURCE_PATH)));
@@ -69,7 +69,7 @@ public class IPAddressVerifierTest {
     }
 
     @Test
-    public void getFaultyIpAddresses_should_return_empty_array_when_parameters_are_invalid () {
+    public void getFaultyIpAddresses_should_return_empty_array_when_parameters_are_invalid() {
         assertEquals(0, ipAddressVerifier.getFaultyIpAddresses(new NodeRepoJsonModel()).length);
     }
 
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/NodeRepoInfoRetrieverTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/NodeRepoInfoRetrieverTest.java
index 8d07c519e44..729506fcab0 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/NodeRepoInfoRetrieverTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/noderepo/NodeRepoInfoRetrieverTest.java
@@ -28,8 +28,8 @@ public class NodeRepoInfoRetrieverTest {
     }
 
     @Test
-    public void retrieve_should_return_nodeJSONModel_when_parameter_contains_valid_url () throws IOException{
-        urls.add(new URL(URL_RESOURCE_PATH  + "/nodeInfoTest.json"));
+    public void retrieve_should_return_nodeJSONModel_when_parameter_contains_valid_url() throws IOException {
+        urls.add(new URL(URL_RESOURCE_PATH + "/nodeInfoTest.json"));
         NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(urls);
         double expectedMinDiskAvailable = 500.0;
         double expectedMinMainMemoryAvailable = 24.0;
@@ -38,6 +38,7 @@ public class NodeRepoInfoRetrieverTest {
         assertEquals(expectedMinMainMemoryAvailable, nodeRepoJsonModel.getMinMainMemoryAvailableGb(), DELTA);
         assertEquals(expectedMinCpuCores, nodeRepoJsonModel.getMinCpuCores(), DELTA);
     }
+
     @Test
     public void retrieve_should_throw_IOException_when_no_valid_URLs() throws MalformedURLException {
         urls = new ArrayList<>();
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
index 6a0223d325c..08874998e0f 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodes/v2/node/nodeRepoVirtualMachine.json
@@ -46,6 +46,5 @@
     "10.201.13.46"
   ],
   "additionalIpAddresses": [
-
   ]
 }
\ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetrieverTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetrieverTest.java
index cf9bc3e1b89..91646ba1cbe 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetrieverTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetrieverTest.java
@@ -75,7 +75,7 @@ public class DiskRetrieverTest {
     @Test
     public void parseDiskType_with_invalid_outputstream_does_not_contain_searchword_should_throw_exception() throws Exception {
         ArrayList<String> mockOutput = commandExecutor.outputFromString("Name  Rota");
-        try{
+        try {
             ParseResult parseResult = diskRetriever.parseDiskType(mockOutput);
             fail("Should have thrown IOException when outputstream doesn't contain search word");
         } catch (IOException e) {