Fix CloudHub integration test

avioconsulting · Dec 11, 2023 · 0cdb04c · 0cdb04c
1 parent a98b48e
commit 0cdb04c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/library/src/test/java/com/avioconsulting/mule/integrationtest/IntegrationTest.groovy b/library/src/test/java/com/avioconsulting/mule/integrationtest/IntegrationTest.groovy
@@ -31,7 +31,6 @@ class IntegrationTest implements MavenInvoke {
     private static final String ANYPOINT_CLIENT_ID = System.getProperty('anypoint.client.id')
     private static final String ANYPOINT_CLIENT_SECRET = System.getProperty('anypoint.client.secret')
     private static final String ON_PREM_SERVER_NAME = System.getProperty('mule4.onprem.server.name')
-    private static final String CLOUDHUB_APP_PREFIX = 'avio'
 
     public static final String AVIO_ENVIRONMENT_DEV = 'DEV'
     private CloudHubDeployer cloudHubDeployer
@@ -64,8 +63,7 @@ class IntegrationTest implements MavenInvoke {
                                    request.appName.normalizedAppName,
                                    'integration test app cleanup')
         println 'Waiting for app deletion to finish'
-        waitForAppDeletion(request.environment,
-                           appName,null)
+        waitForAppDeletion(cloudhubDeploymentRequest, request.environment, appName, null)
     }
 
     def deleteOnPremApp(OnPremDeploymentRequest request) {

diff --git a/library/src/test/java/com/avioconsulting/mule/integrationtest/TestUtils.groovy b/library/src/test/java/com/avioconsulting/mule/integrationtest/TestUtils.groovy
@@ -3,7 +3,6 @@ package com.avioconsulting.mule.integrationtest
 import com.avioconsulting.mule.deployment.internal.models.AppStatus
 import com.avioconsulting.mule.deployment.internal.models.AppStatusPackage
 import com.avioconsulting.mule.deployment.internal.models.DeploymentItem
-import com.avioconsulting.mule.deployment.internal.subdeployers.BaseDeployer
 import com.avioconsulting.mule.deployment.internal.subdeployers.CloudHubDeployer
 import com.avioconsulting.mule.deployment.internal.subdeployers.CloudHubV2Deployer
 import org.apache.http.auth.AuthScope
@@ -59,10 +58,10 @@ class TestUtils {
         }
     }
 
-    static waitForAppDeletion(BaseDeployer deployer,
+    static waitForAppDeletion(def deployer,
                               String environment,
                               String appName,
-                              String groupId) {
+                              String groupId = null) {
         def tries = 0
         def deleted = false
         def failed = false