Cleanup

1 files changed, 11 insertions, 12 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 d3dfae3a6be..e6d349ef481 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
@@ -480,22 +480,14 @@ public class ApplicationRepositoryTest {
         // so will be candidate for expiry)
         Session session = sessionRepository.createRemoteSession(7);
         sessionRepository.createSetStatusTransaction(session, Session.Status.UNKNOWN);
+        assertEquals(2, sessionRepository.getLocalSessions().size());  // Still 2, no new local session
 
-        sessionRepository.addLocalSession(localSession2);
-        assertEquals(2, sessionRepository.getLocalSessions().size());
-
-        // Check that trying to expire local session when there exists a local session with no zookeeper data works
-        tester.applicationRepository().deleteExpiredLocalSessions();
-        assertEquals(2, sessionRepository.getLocalSessions().size());
-
-        // Check that trying to expire when there are no active sessions works
-        tester.applicationRepository().deleteExpiredLocalSessions();
-        assertEquals(2, sessionRepository.getLocalSessions().size());
+        // Check that trying to expire local session when there exists a local session without any data in zookeeper should not delete session
+        deleteExpiredLocalSessionsAndAssertNumberOfSessions(2, tester, sessionRepository);
 
         // Set older created timestamp for session dir for local session without any data in zookeeper, should be deleted
         setCreatedTime(dir, Instant.now().minus(Duration.ofDays(31)));
-        tester.applicationRepository().deleteExpiredLocalSessions();
-        assertEquals(1, sessionRepository.getLocalSessions().size());
+        deleteExpiredLocalSessionsAndAssertNumberOfSessions(1, tester, sessionRepository);
     }
 
     @Test
@@ -836,4 +828,11 @@ public class ApplicationRepositoryTest {
         return tenantRepository.getTenant(applicationId.tenant()).getRequestHandler();
     }
 
+    private static void deleteExpiredLocalSessionsAndAssertNumberOfSessions(int expectedNumberOfSessions,
+                                                                            DeployTester tester,
+                                                                            SessionRepository sessionRepository) {
+        tester.applicationRepository().deleteExpiredLocalSessions();
+        assertEquals(expectedNumberOfSessions, sessionRepository.getLocalSessions().size());
+    }
+
 }