Minor tidies to tests

Author: chadlwilson

src/test/java/cd/go/contrib/elasticagents/docker/BaseIntegrationTest.java

@@ -21,7 +21,6 @@
 import com.spotify.docker.client.exceptions.ContainerNotFoundException;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.exceptions.VolumeNotFoundException;
-
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 

src/test/java/cd/go/contrib/elasticagents/docker/ClusterProfilePropertiesTest.java

@@ -20,7 +20,6 @@
 import cd.go.contrib.elasticagents.docker.requests.JobCompletionRequest;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,7 +29,7 @@ public class ClusterProfilePropertiesTest {
 
     @Test
     public void shouldGenerateSameUUIDForClusterProfileProperties() {
-        Map<String, String> clusterProfileConfigurations = Collections.singletonMap("go_server_url", "http://go-server-url/go");
+        Map<String, String> clusterProfileConfigurations = Map.of("go_server_url", "http://go-server-url/go");
         ClusterProfileProperties clusterProfileProperties = ClusterProfileProperties.fromConfiguration(clusterProfileConfigurations);
 
         assertThat(clusterProfileProperties.uuid(), is(clusterProfileProperties.uuid()));

src/test/java/cd/go/contrib/elasticagents/docker/CpusSpecificationTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -22,7 +22,7 @@ public void cpusIsTranslatedToCpuPeriodAndCpuQuota() {
 
     @Test
     public void cpusParsedWithErrors() {
-        assertEquals(Collections.singletonList("Invalid float number: 0,3"), new CpusSpecification("0,3").getErrors());
-        assertEquals(Collections.singletonList("Invalid float number: abc"), new CpusSpecification("abc").getErrors());
+        assertEquals(List.of("Invalid float number: 0,3"), new CpusSpecification("0,3").getErrors());
+        assertEquals(List.of("Invalid float number: abc"), new CpusSpecification("abc").getErrors());
     }
 }

src/test/java/cd/go/contrib/elasticagents/docker/MemorySpecificationTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -18,10 +18,10 @@ public void memorySpecificationIsParsedCorrectly() {
 
     @Test
     public void memorySpecificationParsingErrors() {
-        assertEquals(Collections.singletonList("Invalid size: 5K. Wrong size unit"), new MemorySpecification("5K").getErrors());
-        assertEquals(Collections.singletonList("Invalid size: 5"), new MemorySpecification("5").getErrors());
-        assertEquals(Collections.singletonList("Invalid size: A"), new MemorySpecification("A").getErrors());
-        assertEquals(Collections.singletonList("Invalid size: .3M"), new MemorySpecification(".3M").getErrors());
-        assertEquals(Collections.singletonList("Invalid size: 1,3M"), new MemorySpecification("1,3M").getErrors());
+        assertEquals(List.of("Invalid size: 5K. Wrong size unit"), new MemorySpecification("5K").getErrors());
+        assertEquals(List.of("Invalid size: 5"), new MemorySpecification("5").getErrors());
+        assertEquals(List.of("Invalid size: A"), new MemorySpecification("A").getErrors());
+        assertEquals(List.of("Invalid size: .3M"), new MemorySpecification(".3M").getErrors());
+        assertEquals(List.of("Invalid size: 1,3M"), new MemorySpecification("1,3M").getErrors());
     }
 }

src/test/java/cd/go/contrib/elasticagents/docker/NetworksTest.java

@@ -1,16 +1,16 @@
 package cd.go.contrib.elasticagents.docker;
 
 import com.spotify.docker.client.messages.Network;
-
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.*;
-import static org.junit.jupiter.api.Assertions.*;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class NetworksTest {
 
     @Test

src/test/java/cd/go/contrib/elasticagents/docker/executors/AgentStatusReportExecutorTest.java

@@ -43,7 +43,7 @@ public class AgentStatusReportExecutorTest {
 
     @BeforeEach
     public void setup() {
-        clusterProfileConfigurations = Collections.singletonMap("go_server_url", "http://go-server-url/go");
+        clusterProfileConfigurations = Map.of("go_server_url", "http://go-server-url/go");
         clusterProfile = ClusterProfileProperties.fromConfiguration(clusterProfileConfigurations);
     }
 

src/test/java/cd/go/contrib/elasticagents/docker/executors/ClusterProfilePropertiesValidateRequestExecutorTest.java

@@ -48,7 +48,7 @@ public void shouldValidateMandatoryKeys() throws Exception {
     @Test
     public void shouldBarfWhenUnknownKeysArePassed() throws Exception {
         ClusterProfileValidateRequestExecutor executor = new ClusterProfileValidateRequestExecutor(
-                new ClusterProfileValidateRequest(Collections.singletonMap("foo", "bar")));
+                new ClusterProfileValidateRequest(Map.of("foo", "bar")));
         String json = executor.execute().responseBody();
         String expectedStr = "[" +
                 mandatoryFieldsBaseErrorString +

src/test/java/cd/go/contrib/elasticagents/docker/executors/ProfileValidateRequestExecutorTest.java

@@ -22,11 +22,12 @@
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 import java.util.Collections;
+import java.util.Map;
 
 public class ProfileValidateRequestExecutorTest {
     @Test
     public void shouldBarfWhenUnknownKeysArePassed() throws Exception {
-        ProfileValidateRequestExecutor executor = new ProfileValidateRequestExecutor(new ProfileValidateRequest(Collections.singletonMap("foo", "bar")));
+        ProfileValidateRequestExecutor executor = new ProfileValidateRequestExecutor(new ProfileValidateRequest(Map.of("foo", "bar")));
         String json = executor.execute().responseBody();
         JSONAssert.assertEquals("[{\"message\":\"Image must not be blank.\",\"key\":\"Image\"},{\"key\":\"foo\",\"message\":\"Is an unknown property\"}]", json, JSONCompareMode.NON_EXTENSIBLE);
     }

src/test/java/cd/go/contrib/elasticagents/docker/requests/ClusterStatusReportRequestTest.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
+import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -19,7 +19,7 @@ public void shouldDeserializeFromJSON() {
 
         ClusterStatusReportRequest clusterStatusReportRequest = ClusterStatusReportRequest.fromJSON(jsonObject.toString());
 
-        ClusterStatusReportRequest expected = new ClusterStatusReportRequest(Collections.singletonMap("go_server_url", "https://go-server/go"));
+        ClusterStatusReportRequest expected = new ClusterStatusReportRequest(Map.of("go_server_url", "https://go-server/go"));
         assertThat(clusterStatusReportRequest, is(expected));
     }
 }