refactor(tests): convert junit4 based testcases to junit5 and clean up in clouddriver

cats/cats-core/cats-core.gradle

@@ -13,4 +13,8 @@ dependencies {
   testImplementation project(":cats:cats-test")
 
   testImplementation "org.spockframework:spock-core"
+  testImplementation "org.junit.jupiter:junit-jupiter-api"
+}
+test{
+  useJUnitPlatform()
 }

cats/cats-redis/cats-redis.gradle

@@ -17,4 +17,5 @@ dependencies {
   testImplementation "org.assertj:assertj-core"
   testImplementation "org.mockito:mockito-core"
   testImplementation "org.spockframework:spock-core"
+  testImplementation "org.junit.jupiter:junit-jupiter-api"
 }

cats/cats-redis/src/test/java/com/netflix/spinnaker/cats/redis/cluster/ClusteredSortAgentSchedulerTest.java

@@ -39,8 +39,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
@@ -56,7 +56,7 @@ public class ClusteredSortAgentSchedulerTest {
 
   private Optional<Semaphore> runningAgents;
 
-  @Before
+  @BeforeEach
   public void setUp() throws IllegalAccessException {
     when(jedisPool.getResource()).thenReturn(jedis);
     when(jedis.scriptLoad(anyString())).thenReturn("testScriptSha");

cats/cats-sql/cats-sql.gradle

@@ -54,8 +54,6 @@ dependencies {
   testImplementation "org.hamcrest:hamcrest-core"
   testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.junit.jupiter:junit-jupiter-engine"
-  testImplementation "org.junit.platform:junit-platform-launcher"
-  testImplementation "org.junit.vintage:junit-vintage-engine"
   testImplementation "org.objenesis:objenesis"
   testImplementation "org.spockframework:spock-core"
   testImplementation "org.spockframework:spock-spring"

cats/cats-test/cats-test.gradle

@@ -13,4 +13,9 @@ dependencies {
   compileOnly "org.projectlombok:lombok"
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
+
+  testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
+}
+test{
+  useJUnitPlatform()
 }

cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/cache/CacheSpec.groovy

@@ -16,8 +16,7 @@
 
 package com.netflix.spinnaker.cats.cache
 
-import org.junit.Rule
-import org.junit.rules.TestName
+import org.junit.jupiter.api.BeforeEach
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
@@ -27,10 +26,9 @@ abstract class CacheSpec extends Specification {
     @Subject
     Cache cache
 
-    @Rule TestName testName = new TestName()
-
+    @BeforeEach
     def setup() {
-        println "--------------- Test " + testName.getMethodName()
+      println "--------------- Test " + specificationContext.currentIteration.name
         cache = getSubject()
     }
 

clouddriver-api/clouddriver-api.gradle

@@ -29,13 +29,4 @@ dependencies {
 
   compileOnly("org.projectlombok:lombok")
   annotationProcessor("org.projectlombok:lombok")
-
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
-}
-
-test {
-  useJUnitPlatform {
-    includeEngines "junit-vintage", "junit-jupiter"
-  }
 }

clouddriver-appengine/src/test/java/com/netflix/spinnaker/clouddriver/appengine/deploy/converters/DeployAppengineConfigAtomicOperationConverterTest.java

@@ -17,7 +17,7 @@
 
 package com.netflix.spinnaker.clouddriver.appengine.deploy.converters;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -28,16 +28,16 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeployAppengineConfigAtomicOperationConverterTest {
 
   DeployAppengineConfigAtomicOperationConverter converter;
   CredentialsRepository<AppengineNamedAccountCredentials> credentialsRepository;
   AppengineNamedAccountCredentials mockCredentials;
 
-  @Before
+  @BeforeEach
   public void init() {
     converter = new DeployAppengineConfigAtomicOperationConverter();
     credentialsRepository = mock(CredentialsRepository.class);

clouddriver-appengine/src/test/java/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineConfigAtomicOperationTest.java

@@ -17,7 +17,7 @@
 
 package com.netflix.spinnaker.clouddriver.appengine.deploy.ops;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -36,8 +36,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
 public class DeployAppengineConfigAtomicOperationTest {
@@ -47,7 +47,7 @@ public class DeployAppengineConfigAtomicOperationTest {
   ObjectMapper mapper;
   ArtifactDownloader artifactDownloader = mock(ArtifactDownloader.class);
 
-  @Before
+  @BeforeEach
   public void init() {
     deployAppengineConfigAtomicOperation = new DeployAppengineConfigAtomicOperation(description);
     mapper = new ObjectMapper();

clouddriver-artifacts/clouddriver-artifacts.gradle

@@ -61,7 +61,6 @@ dependencies {
   testImplementation "org.junit-pioneer:junit-pioneer:0.3.0"
   testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.junit.jupiter:junit-jupiter-params"
-  testImplementation "org.junit.platform:junit-platform-runner"
   testImplementation "org.mockito:mockito-core"
   testImplementation "org.springframework.boot:spring-boot-starter-test"
   testImplementation "org.testcontainers:testcontainers"

clouddriver-aws/clouddriver-aws.gradle

@@ -65,7 +65,6 @@ dependencies {
   testImplementation "com.natpryce:hamkrest"
   testImplementation "com.google.guava:guava"
   testImplementation "org.junit.jupiter:junit-jupiter-api"
-  testImplementation "org.junit.platform:junit-platform-runner"
   testImplementation "org.objenesis:objenesis"
   testImplementation "org.spockframework:spock-core"
   testImplementation "org.spockframework:spock-spring"

clouddriver-aws/src/test/java/com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonLoadBalancerInstanceStateCachingAgentTest.java

@@ -44,13 +44,10 @@
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.ApplicationContext;
 
-@RunWith(JUnitPlatform.class)
 @ExtendWith(MockitoExtension.class)
 class AmazonLoadBalancerInstanceStateCachingAgentTest {
   private static final String region = "region";

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/DeleteCloudrunLoadBalancerAtomicOperationConverterTest.java

@@ -1,6 +1,6 @@
 package com.netflix.spinnaker.clouddriver.cloudrun.deploy.converters;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -10,8 +10,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeleteCloudrunLoadBalancerAtomicOperationConverterTest {
 
@@ -26,7 +26,7 @@ public class DeleteCloudrunLoadBalancerAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     deleteCloudrunLoadBalancerAtomicOperationConverter =
         new DeleteCloudrunLoadBalancerAtomicOperationConverter();

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/DeployCloudrunAtomicOperationConverterTest.java

@@ -9,8 +9,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeployCloudrunAtomicOperationConverterTest {
   DeployCloudrunAtomicOperationConverter deployCloudrunAtomicOperationConverter;
@@ -23,7 +23,7 @@ public class DeployCloudrunAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     deployCloudrunAtomicOperationConverter = new DeployCloudrunAtomicOperationConverter();
     credentialsRepository = mock(CredentialsRepository.class);

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/DestroyCloudrunAtomicOperationConverterTest.java

@@ -1,6 +1,6 @@
 package com.netflix.spinnaker.clouddriver.cloudrun.deploy.converters;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -10,8 +10,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DestroyCloudrunAtomicOperationConverterTest {
   DestroyCloudrunAtomicOperationConverter destroyCloudrunAtomicOperationConverter;
@@ -24,7 +24,7 @@ public class DestroyCloudrunAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     destroyCloudrunAtomicOperationConverter = new DestroyCloudrunAtomicOperationConverter();
     credentialsRepository = mock(CredentialsRepository.class);

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/DisableCloudrunAtomicOperationConverterTest.java

@@ -1,6 +1,6 @@
 package com.netflix.spinnaker.clouddriver.cloudrun.deploy.converters;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -10,8 +10,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DisableCloudrunAtomicOperationConverterTest {
   DisableCloudrunAtomicOperationConverter disableCloudrunAtomicOperationConverter;
@@ -24,7 +24,7 @@ public class DisableCloudrunAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     disableCloudrunAtomicOperationConverter = new DisableCloudrunAtomicOperationConverter();
     credentialsRepository = mock(CredentialsRepository.class);

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/EnableCloudrunAtomicOperationConverterTest.java

@@ -1,6 +1,6 @@
 package com.netflix.spinnaker.clouddriver.cloudrun.deploy.converters;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -10,8 +10,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class EnableCloudrunAtomicOperationConverterTest {
   EnableCloudrunAtomicOperationConverter enableCloudrunAtomicOperationConverter;
@@ -24,7 +24,7 @@ public class EnableCloudrunAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     enableCloudrunAtomicOperationConverter = new EnableCloudrunAtomicOperationConverter();
     credentialsRepository = mock(CredentialsRepository.class);

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/converters/UpsertCloudrunLoadBalancerAtomicOperationConverterTest.java

@@ -1,6 +1,6 @@
 package com.netflix.spinnaker.clouddriver.cloudrun.deploy.converters;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -10,8 +10,8 @@
 import com.netflix.spinnaker.credentials.CredentialsRepository;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class UpsertCloudrunLoadBalancerAtomicOperationConverterTest {
   UpsertCloudrunLoadBalancerAtomicOperationConverter
@@ -25,7 +25,7 @@ public class UpsertCloudrunLoadBalancerAtomicOperationConverterTest {
         }
       };
 
-  @Before
+  @BeforeEach
   public void init() {
     upsertCloudrunLoadBalancerAtomicOperationConverter =
         new UpsertCloudrunLoadBalancerAtomicOperationConverter();

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/ops/DeleteCloudrunLoadBalancerAtomicOperationTest.java

@@ -14,8 +14,8 @@
 import com.netflix.spinnaker.clouddriver.jobs.JobExecutor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeleteCloudrunLoadBalancerAtomicOperationTest {
   DeleteCloudrunLoadBalancerAtomicOperation deleteCloudrunLoadBalancerAtomicOperation;
@@ -28,7 +28,7 @@ public class DeleteCloudrunLoadBalancerAtomicOperationTest {
   CloudrunLoadBalancer loadBalancer;
   JobExecutor executor;
 
-  @Before
+  @BeforeEach
   public void init() {
     mockcredentials =
         new CloudrunNamedAccountCredentials.Builder()

clouddriver-cloudrun/src/test/java/com/netflix/spinnaker/clouddriver/cloudrun/deploy/ops/DestroyCloudrunAtomicOperationTest.java

@@ -14,8 +14,8 @@
 import com.netflix.spinnaker.clouddriver.data.task.Task;
 import com.netflix.spinnaker.clouddriver.data.task.TaskRepository;
 import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DestroyCloudrunAtomicOperationTest {
 
@@ -29,7 +29,7 @@ public class DestroyCloudrunAtomicOperationTest {
 
   CloudrunServerGroup serverGroup;
 
-  @Before
+  @BeforeEach
   public void init() {
     mockcredentials =
         new CloudrunNamedAccountCredentials.Builder()