1 files changed, 11 insertions, 2 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 90f0b5ee4e5..17cbe41fde5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -27,6 +27,7 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -76,18 +77,26 @@ public class ApplicationRepositoryTest {
 
     @Test
     public void createAndPrepareAndActivate() throws IOException {
-        PrepareResult result = createAndPrepareAndActivateApp();
+        PrepareResult result = deployApp();
         assertTrue(result.configChangeActions().getRefeedActions().isEmpty());
         assertTrue(result.configChangeActions().getRestartActions().isEmpty());
     }
 
+    @Test
+    public void deleteUnusedTenants() throws IOException {
+        deployApp();
+        assertTrue(applicationRepository.removeUnusedTenants().isEmpty());
+        applicationRepository.remove(applicationId());
+        assertEquals(tenantName, applicationRepository.removeUnusedTenants().iterator().next());
+    }
+
     private PrepareResult prepareAndActivateApp(File application) throws IOException {
         FilesApplicationPackage appDir = FilesApplicationPackage.fromFile(application);
         long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, appDir.getAppDir());
         return applicationRepository.prepareAndActivate(tenant, sessionId, prepareParams(), false, false, Instant.now());
     }
 
-    private PrepareResult createAndPrepareAndActivateApp() throws IOException {
+    private PrepareResult deployApp() throws IOException {
         File file = CompressedApplicationInputStreamTest.createTarFile();
         return applicationRepository.deploy(CompressedApplicationInputStream.createFromCompressedStream(
                                                     new FileInputStream(file), ApplicationApiHandler.APPLICATION_X_GZIP),