move asserts from teardown into check method

ls1intum · Dec 3, 2024 · 2232df3 · 2232df3
1 parent f6ed392
commit 2232df3
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/.../de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java b/.../de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java
@@ -410,10 +410,6 @@ class UserSshPublicKeyExpiryNotificationServiceShould {
 
         @AfterEach
         void tearDown() {
-            assertThat(sentNotifications.getFirst()).isInstanceOf(SingleUserNotification.class);
-            assertThat(((SingleUserNotification) sentNotifications.getFirst()).getRecipient()).isEqualTo(user);
-            assertThat((sentNotifications.getFirst()).getText()).isEqualTo(SSH_KEY_ADDED_TEXT);
-
             userSshPublicKeyRepository.deleteAll();
         }
 
@@ -424,6 +420,7 @@ void notifyUserAboutNewlyCreatedSshKeyWithExpirationDate() throws GeneralSecurit
             userSshPublicKeyService.createSshKeyForUser(user, AuthorizedKeyEntry.parseAuthorizedKeyEntry(keyDTO.publicKey()), keyDTO);
 
             sentNotifications = notificationRepository.findAll();
+            checkFirstNotification();
         }
 
         @Test
@@ -433,6 +430,7 @@ void notifyUserAboutNewlyCreatedSshKeyWithNoDate() throws GeneralSecurityExcepti
             userSshPublicKeyService.createSshKeyForUser(user, AuthorizedKeyEntry.parseAuthorizedKeyEntry(keyDTO.publicKey()), keyDTO);
 
             sentNotifications = notificationRepository.findAll();
+            checkFirstNotification();
         }
 
         @Test
@@ -446,6 +444,7 @@ void notifyUserAboutUpcomingSshKeyExpiry() throws GeneralSecurityException, IOEx
             assertThat(sentNotifications).hasSize(2);
             assertThat(((SingleUserNotification) sentNotifications.getFirst()).getRecipient()).isEqualTo(user);
             assertThat((sentNotifications.get(1)).getText()).isEqualTo(SSH_KEY_EXPIRES_SOON_TEXT);
+            checkFirstNotification();
         }
 
         @Test
@@ -459,6 +458,7 @@ void notifyUserAboutExpiredSshKey() throws GeneralSecurityException, IOException
             assertThat(sentNotifications).hasSize(2);
             assertThat(((SingleUserNotification) sentNotifications.getFirst()).getRecipient()).isEqualTo(user);
             assertThat((sentNotifications.get(1)).getText()).isEqualTo(SSH_KEY_HAS_EXPIRED_TEXT);
+            checkFirstNotification();
         }
 
         @Test
@@ -470,6 +470,7 @@ void notNotifyUserAboutUpcomingSshKeyExpiryWhenKeyDoesNotExpireSoon() throws Gen
 
             sentNotifications = notificationRepository.findAll();
             assertThat(sentNotifications).hasSize(1);
+            checkFirstNotification();
         }
 
         @Test
@@ -481,6 +482,13 @@ void notNotifyUserAboutExpiredSshKeyWhenKeyIsNotExpired() throws GeneralSecurity
 
             sentNotifications = notificationRepository.findAll();
             assertThat(sentNotifications).hasSize(1);
+            checkFirstNotification();
+        }
+
+        void checkFirstNotification() {
+            assertThat(sentNotifications.getFirst()).isInstanceOf(SingleUserNotification.class);
+            assertThat(((SingleUserNotification) sentNotifications.getFirst()).getRecipient()).isEqualTo(user);
+            assertThat((sentNotifications.getFirst()).getText()).isEqualTo(SSH_KEY_ADDED_TEXT);
         }
     }