refactor: replace hardcoded MAX_RETRIES with TestConstants.DEFAULT_MA…

…X_RETRIES in integration tests
Hack23 · Jan 17, 2025 · 77ce90c · 77ce90c
1 parent d5c1663
commit 77ce90c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 32 deletions.
diff --git a/...gence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AdminEmailTest.java b/...gence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AdminEmailTest.java
@@ -22,7 +22,7 @@ public void shouldSendValidEmail() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -36,6 +36,6 @@ public void shouldFailWithInvalidEmail() {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 }
diff --git a/...nce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/AuthorizationTest.java b/...nce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/AuthorizationTest.java
@@ -26,7 +26,7 @@ public void shouldDenyAccessToAdminPages() {
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
-            }, MAX_RETRIES);
+            }, TestConstants.DEFAULT_MAX_RETRIES);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -46,7 +46,7 @@ public void shouldAllowAccessToPublicPages() {
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
-            }, MAX_RETRIES);
+            }, TestConstants.DEFAULT_MAX_RETRIES);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

diff --git a/...ligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/PartyViewTest.java b/...ligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/PartyViewTest.java
@@ -10,7 +10,6 @@
 
 @Category(IntegrationTest.class)
 public final class PartyViewTest extends AbstractUITest {
-    private static final int MAX_RETRIES = 3;
 
     @Test(timeout = DEFAULT_TIMEOUT)
     public void shouldViewPartyCommitteeRoles() throws Exception {
@@ -22,7 +21,7 @@ public void shouldViewPartyCommitteeRoles() throws Exception {
                 throw new RuntimeException("Failed to visit party committee roles page", e);
             }
             pageVisit.verifyPageContent("Committee Roles");
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -35,7 +34,7 @@ public void shouldViewPartyDocumentHistory() throws Exception {
                 e.printStackTrace();
             }
             pageVisit.verifyPageContent("Document History");
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     // ... other party view tests

diff --git a/...igence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/SearchViewTest.java b/...igence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/SearchViewTest.java
@@ -9,7 +9,6 @@
 
 @Category(IntegrationTest.class)
 public class SearchViewTest extends AbstractUITest {
-    private static final int DEFAULT_MAX_RETRIES = 3;
 
     @Test(timeout = DEFAULT_TIMEOUT)
     public void testSearch() throws Exception {

diff --git a/...agency/src/test/java/com/hack23/cia/systemintegrationtest/user/SessionManagementTest.java b/...agency/src/test/java/com/hack23/cia/systemintegrationtest/user/SessionManagementTest.java
@@ -10,10 +10,7 @@
 
 @Category(IntegrationTest.class)
 public final class SessionManagementTest extends AbstractUITest {
-    private static final int DEFAULT_MAX_RETRIES = 3;
-    private static final int MAX_RETRIES = 3;
-    private static final int DEFAULT_TIMEOUT = 60000;
-
+
     @Test(timeout = DEFAULT_TIMEOUT)
     public void shouldHandleSessionPagination() throws Exception {
         retryOnFailure(() -> {
@@ -51,6 +48,6 @@ public void shouldShowSessionDetails() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 }
diff --git a/...gency/src/test/java/com/hack23/cia/systemintegrationtest/user/UserAuthenticationTest.java b/...gency/src/test/java/com/hack23/cia/systemintegrationtest/user/UserAuthenticationTest.java
@@ -15,7 +15,6 @@
 
 @Category(IntegrationTest.class)
 public final class UserAuthenticationTest extends AbstractUITest {
-    private static final int MAX_RETRIES = TestConstants.DEFAULT_MAX_RETRIES;
     private static final String EMAIL_SUFFIX = "@test.com";
     private static final String PATH_PREFIX = "main/";
     private static final String ERROR_USER_EXISTS = "USER_ALREADY_EXISTS";
@@ -46,7 +45,7 @@ public void shouldRegisterNewUser() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -66,7 +65,7 @@ public void shouldRegisterUserWithWeakPasswordFail() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -93,7 +92,7 @@ public void shouldNotRegisterDuplicateUser() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -128,7 +127,7 @@ public void shouldManageUserSecurity() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -152,7 +151,7 @@ public void shouldFailLoginWithWrongPassword() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = TestConstants.DEFAULT_TIMEOUT)
@@ -179,6 +178,6 @@ public void shouldEnableAndDisableGoogleAuthenticator() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 }
diff --git a/...ce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/UserNavigationTest.java b/...ce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/UserNavigationTest.java
@@ -13,7 +13,6 @@
 
 @Category(IntegrationTest.class)
 public final class UserNavigationTest extends AbstractUITest {
-    private static final int MAX_RETRIES = 3;
     // Constants for page modes
     private static final String DOCUMENT_ACTIVITY = "DOCUMENTACTIVITY";
     private static final String ROLE_SUMMARY = "ROLESUMMARY";
@@ -43,7 +42,7 @@ public void shouldNavigatePoliticianViews() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -67,7 +66,7 @@ public void shouldNavigateParliamentViews() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -79,7 +78,7 @@ public void shouldNavigateCommitteeRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -91,7 +90,7 @@ public void shouldNavigateMinistryRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -106,7 +105,7 @@ public void shouldNavigatePartyRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -118,7 +117,7 @@ public void shouldNavigatePoliticianRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     // Other navigation tests...

diff --git a/...ce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ViewNavigationTest.java b/...ce-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ViewNavigationTest.java
@@ -25,7 +25,7 @@ public void shouldNavigateCommitteeRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -37,7 +37,7 @@ public void shouldNavigateMinistryRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -49,7 +49,7 @@ public void shouldNavigatePartyRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -61,7 +61,7 @@ public void shouldNavigatePoliticianRanking() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 
     @Test(timeout = DEFAULT_TIMEOUT)
@@ -80,6 +80,6 @@ public void shouldNavigatePoliticianViews() throws Exception {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-        }, DEFAULT_MAX_RETRIES);
+        }, TestConstants.DEFAULT_MAX_RETRIES);
     }
 }