fix(tests): Use JUnit vintage engine so Spock tests still run (#2766)

spinnaker · Mar 18, 2019 · ce443d8 · ce443d8
1 parent 9effbd7
commit ce443d8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/orca-clouddriver/orca-clouddriver.gradle b/orca-clouddriver/orca-clouddriver.gradle
@@ -17,7 +17,9 @@
 apply from: "$rootDir/gradle/groovy.gradle"
 
 test {
-  useJUnitPlatform()
+  useJUnitPlatform {
+    includeEngines "junit-vintage", "junit-jupiter"
+  }
 }
 
 dependencies {
@@ -39,4 +41,5 @@ dependencies {
   testCompile "org.mockito:mockito-core:2.25.0"
 
   testRuntime spinnaker.dependency("junitJupiterEngine")
+  testRuntime "org.junit.vintage:junit-vintage-engine:${spinnaker.version('jupiter')}"
 }
diff --git a/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/PollerSupport.java b/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pollers/PollerSupport.java
@@ -26,18 +26,18 @@
 
 import static java.lang.String.format;
 
-class PollerSupport {
+public class PollerSupport {
   private final ObjectMapper objectMapper;
   private final RetrySupport retrySupport;
   private final OortService oortService;
 
-  PollerSupport(ObjectMapper objectMapper, RetrySupport retrySupport, OortService oortService) {
+  public PollerSupport(ObjectMapper objectMapper, RetrySupport retrySupport, OortService oortService) {
     this.objectMapper = objectMapper;
     this.retrySupport = retrySupport;
     this.oortService = oortService;
   }
 
-  Optional<ServerGroup> fetchServerGroup(String account, String region, String name) {
+  public Optional<ServerGroup> fetchServerGroup(String account, String region, String name) {
     return retrySupport.retry(() -> {
       try {
         Response response = oortService.getServerGroup(account, region, name);

diff --git a/...roovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java b/...roovy/com/netflix/spinnaker/orca/clouddriver/pollers/RestorePinnedServerGroupsPoller.java
@@ -50,7 +50,7 @@
 @Slf4j
 @Component
 @ConditionalOnExpression(value = "${pollers.restorePinnedServerGroups.enabled:false}")
-class RestorePinnedServerGroupsPoller extends AbstractPollingNotificationAgent {
+public class RestorePinnedServerGroupsPoller extends AbstractPollingNotificationAgent {
   private static final Logger log = LoggerFactory.getLogger(RestorePinnedServerGroupsPoller.class);
 
   private final ObjectMapper objectMapper;
@@ -89,7 +89,7 @@ public RestorePinnedServerGroupsPoller(NotificationClusterLock notificationClust
   }
 
   @VisibleForTesting
-  RestorePinnedServerGroupsPoller(NotificationClusterLock notificationClusterLock,
+  public RestorePinnedServerGroupsPoller(NotificationClusterLock notificationClusterLock,
                                   ObjectMapper objectMapper,
                                   OortService oortService,
                                   RetrySupport retrySupport,
@@ -184,7 +184,7 @@ protected void tick() {
     }
   }
 
-  List<PinnedServerGroupTag> fetchPinnedServerGroupTags() {
+  public List<PinnedServerGroupTag> fetchPinnedServerGroupTags() {
     List<EntityTags> allEntityTags = retrySupport.retry(() -> objectMapper.convertValue(
       oortService.getEntityTags(ImmutableMap.<String, String>builder()
         .put("tag:" + PINNED_CAPACITY_TAG, "*")
@@ -211,7 +211,7 @@ List<PinnedServerGroupTag> fetchPinnedServerGroupTags() {
       .collect(Collectors.toList());
   }
 
-  boolean hasCompletedExecution(PinnedServerGroupTag pinnedServerGroupTag) {
+  public boolean hasCompletedExecution(PinnedServerGroupTag pinnedServerGroupTag) {
     try {
       Execution execution = executionRepository.retrieve(
         pinnedServerGroupTag.executionType, pinnedServerGroupTag.executionId
@@ -276,7 +276,7 @@ private Map<String, Object> buildResizeOperation(PinnedServerGroupTag pinnedServ
       .build();
   }
 
-  private static class PinnedServerGroupTag {
+  public static class PinnedServerGroupTag {
     public String id;
 
     public String cloudProvider;

diff --git a/...pinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java b/...pinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java
@@ -139,7 +139,7 @@ Map<String, Object> getPreviousServerGroupFromCluster(String application,
     }, 10, 3000, false); // retry for up to 30 seconds
   }
 
-  Map<String, Object> getPreviousServerGroupFromClusterByTarget(String application,
+  public Map<String, Object> getPreviousServerGroupFromClusterByTarget(String application,
                                                                 String account,
                                                                 String cluster,
                                                                 String cloudProvider,