Merge pull request #1695 from hmcts/AM-2920_Reenable_Tests

AM-2920 Intermittent Tests Enabled
hmcts · Jan 17, 2024 · 2294739 · 2294739
2 parents c0b1a64 + 15e2f6d
commit 2294739
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/.../java/uk/gov/hmcts/reform/orgrolemapping/controller/RefreshControllerIntegrationTest.java b/.../java/uk/gov/hmcts/reform/orgrolemapping/controller/RefreshControllerIntegrationTest.java
@@ -154,7 +154,6 @@ public void setUp() throws Exception {
         wiremockFixtures.resetRequests();
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete() throws Exception {
@@ -183,7 +182,6 @@ public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete() throws Exce
         assertNotNull(refreshJob.getLog());
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToAborted() throws Exception {
@@ -291,7 +289,6 @@ public void shouldProcessRefreshRoleAssignmentsWithJobIdToPartialComplete_status
         assertThat(refreshJob.getLog(), containsString(String.join(",", refreshJob.getUserIds())));
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithFailedUsersToComplete() throws Exception {
@@ -376,7 +373,6 @@ public void shouldFailProcessRefreshRoleAssignmentsWithOutJobID() throws Excepti
                 .andReturn();
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     public void shouldFailProcessRefreshRoleAssignmentsWithInvalidServiceToken() throws Exception {
         logger.info("Refresh request rejected with invalid service token");
@@ -394,7 +390,6 @@ public void shouldFailProcessRefreshRoleAssignmentsWithInvalidServiceToken() thr
         assertThat(result.getResolvedException().getMessage(), equalTo(UNAUTHORIZED_SERVICE));
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_retryFail() throws Exception {
@@ -419,7 +414,6 @@ public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_retryFail() t
         assertEquals("NEW", refreshJob.getStatus());// failed process should change the status to IN-PROGRESS
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_CRDRetry() throws Exception {

diff --git a/...ava/uk/gov/hmcts/reform/orgrolemapping/controller/RefreshControllerIntegrationV2Test.java b/...ava/uk/gov/hmcts/reform/orgrolemapping/controller/RefreshControllerIntegrationV2Test.java
@@ -2,7 +2,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.slf4j.Logger;
@@ -196,7 +195,6 @@ public void shouldFailProcessRefreshRoleAssignmentsWithOutJobID() throws Excepti
                 .andReturn();
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     public void shouldFailProcessRefreshRoleAssignmentsWithInvalidServiceToken() throws Exception {
         logger.info("Refresh request rejected with invalid service token");
@@ -214,7 +212,6 @@ public void shouldFailProcessRefreshRoleAssignmentsWithInvalidServiceToken() thr
         assertThat(result.getResolvedException().getMessage(), equalTo(UNAUTHORIZED_SERVICE));
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_retryFail() throws Exception {
@@ -239,7 +236,6 @@ public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_retryFail() t
         assertEquals("NEW", refreshJob.getStatus());// failed process should change the status to IN-PROGRESS
     }
 
-    @Disabled("Intermittent AM-2919")
     @Test
     @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:sql/insert_refresh_jobs.sql"})
     public void shouldProcessRefreshRoleAssignmentsWithJobIdToComplete_CRDRetry() throws Exception {