Delete app before tenant. Add test

1 files changed, 8 insertions, 1 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleMaintainerMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleMaintainerMock.java
index df39f51b6fe..a2b6ad612da 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleMaintainerMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/RoleMaintainerMock.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.user;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -11,6 +12,8 @@ import java.util.List;
  */
 public class RoleMaintainerMock implements RoleMaintainer {
 
+    private List<Tenant> tenantsToDelete = new ArrayList<>();
+
     @Override
     public void deleteLeftoverRoles(List<Tenant> tenants, List<ApplicationId> applications) {
 
@@ -18,6 +21,10 @@ public class RoleMaintainerMock implements RoleMaintainer {
 
     @Override
     public List<Tenant> tenantsToDelete(List<Tenant> tenants) {
-        return List.of();
+        return tenantsToDelete;
+    }
+
+    public void mockTenantToDelete(Tenant tenant) {
+        tenantsToDelete.add(tenant);
     }
 }