diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index c4a5b28bba..6b74708454 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -86,7 +86,6 @@ withPipeline(type, product, component) { } before('functionalTest:aat') { - env.INITIATION_JOB_RUNNING = false env.MAX_FT_TESTS_PARALLEL_FORKS = 5 env.ENABLE_TEST_USER_DELETION = true } diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index d1a8caf532..368f45b243 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -74,7 +74,6 @@ withNightlyPipeline(type, product, component) { env.PACT_BROKER_SCHEME = "https" env.CCD_GW_URL = "https://gateway-ccd.aat.platform.hmcts.net" env.MAX_FT_TESTS_PARALLEL_FORKS = 3 - env.INITIATION_JOB_RUNNING = false env.WA_WORKFLOW_API_URL = "http://wa-workflow-api-aat.service.core-compute-aat.internal" diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTaskByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTaskByIdControllerTest.java index 12038a9875..2549b3f527 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTaskByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTaskByIdControllerTest.java @@ -21,20 +21,6 @@ public class DeleteTaskByIdControllerTest extends SpringBootFunctionalBaseTest { private static final String ENDPOINT_BEING_TESTED = "task/{task-id}"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } - - @After - public void cleanUp() { - common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); - } - @Test public void should_succeed_when_terminate_reason_is_cancelled() { TestVariables taskVariables = common.setupWATaskAndRetrieveIds(); diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTasksByCaseIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTasksByCaseIdControllerTest.java index 4850d2ad3e..eae9013e82 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTasksByCaseIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTasksByCaseIdControllerTest.java @@ -16,19 +16,12 @@ public class DeleteTasksByCaseIdControllerTest extends SpringBootFunctionalBaseTest { - private static final String ENDPOINT_BEING_TESTED = "task/delete"; - private TestAuthenticationCredentials caseworkerCredentials; - - @Before - public void setUp() { - caseworkerCredentials = authorizationProvider.getNewTribunalCaseworker("wa-ft-test-r2-"); - } @After public void cleanUp() { common.clearAllRoleAssignments(caseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername()); + } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetTaskByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetTaskByIdControllerTest.java index 8248ed7a9c..8c6faced2d 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetTaskByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetTaskByIdControllerTest.java @@ -25,20 +25,14 @@ public class GetTaskByIdControllerTest extends SpringBootFunctionalBaseTest { private static final String ENDPOINT_BEING_TESTED = "task/{task-id}"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); + } - + @Test public void should_return_a_200_with_task_and_correct_properties() { diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetWorkTypesControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetWorkTypesControllerTest.java index 7303379bc2..50a0304406 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetWorkTypesControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetWorkTypesControllerTest.java @@ -25,24 +25,6 @@ public class GetWorkTypesControllerTest extends SpringBootFunctionalBaseTest { private static final String ENDPOINT_BEING_TESTED = "work-types"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - caseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R2); - } - - @After - public void cleanUp() { - common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - - common.clearAllRoleAssignments(caseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername()); - - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); - } - @Test public void should_return_work_types_when_user_has_work_types() { common.setupWAOrganisationalRoleAssignmentWithWorkTypes(waCaseworkerCredentials.getHeaders(), diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskAssignByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskAssignByIdControllerTest.java index 9d54915d2c..b8f9900bc0 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskAssignByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskAssignByIdControllerTest.java @@ -1,9 +1,11 @@ package uk.gov.hmcts.reform.wataskmanagementapi.watasks.controllers; +import com.github.tomakehurst.wiremock.WireMockServer; import io.restassured.response.Response; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; import org.springframework.http.HttpStatus; import uk.gov.hmcts.reform.wataskmanagementapi.SpringBootFunctionalBaseTest; import uk.gov.hmcts.reform.wataskmanagementapi.controllers.request.AssignTaskRequest; @@ -17,30 +19,12 @@ public class PostTaskAssignByIdControllerTest extends SpringBootFunctionalBaseTe private static final String ENDPOINT_BEING_TESTED = "task/{task-id}/assign"; private String taskId; - @Before - public void setUp() { - assignerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - assigneeCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - secondAssigneeCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - caseworkerForReadCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } - @After public void cleanUp() { common.clearAllRoleAssignments(assignerCredentials.getHeaders()); - authorizationProvider.deleteAccount(assignerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(assigneeCredentials.getHeaders()); - authorizationProvider.deleteAccount(assigneeCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(secondAssigneeCredentials.getHeaders()); - authorizationProvider.deleteAccount(secondAssigneeCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(caseworkerForReadCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerForReadCredentials.getAccount().getUsername()); - - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCancelByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCancelByIdControllerTest.java index 207c01bd43..0e7d112206 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCancelByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCancelByIdControllerTest.java @@ -15,22 +15,12 @@ public class PostTaskCancelByIdControllerTest extends SpringBootFunctionalBaseTe private static final String ENDPOINT_BEING_TESTED = "task/{task-id}/cancel"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - caseworkerForReadCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(caseworkerForReadCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerForReadCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskClaimByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskClaimByIdControllerTest.java index e7fb9c512e..a222660f73 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskClaimByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskClaimByIdControllerTest.java @@ -16,22 +16,13 @@ public class PostTaskClaimByIdControllerTest extends SpringBootFunctionalBaseTes private static final String ENDPOINT_BEING_TESTED = "task/{task-id}/claim"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - currentCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } + @After public void cleanUp() { common.clearAllRoleAssignments(currentCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(currentCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test @@ -81,7 +72,7 @@ public void user_should_claim_task_when_role_assignment_verification_passed() { result.then().assertThat() .statusCode(HttpStatus.NO_CONTENT.value()); - + assertions.taskVariableWasUpdated(taskVariables.getProcessInstanceId(), "taskState", "assigned"); common.cleanUpTask(taskId); diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCompleteByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCompleteByIdControllerTest.java index 6d55fa8dc9..40977dc26d 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCompleteByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCompleteByIdControllerTest.java @@ -40,30 +40,16 @@ public class PostTaskCompleteByIdControllerTest extends SpringBootFunctionalBase @Before public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - caseworkerForReadCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - otherUser = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - caseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R2); - assigneeId = getAssigneeId(waCaseworkerCredentials.getHeaders()); } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(caseworkerForReadCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerForReadCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(otherUser.getHeaders()); - authorizationProvider.deleteAccount(otherUser.getAccount().getUsername()); - common.clearAllRoleAssignments(caseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test @@ -191,7 +177,6 @@ public void should_return_a_204_when_completing_a_task_by_id_and_null_terminatio result.then().assertThat() .statusCode(HttpStatus.NO_CONTENT.value()); String completionProcess = data[0]; - String terminationProcess = data[1]; result = restApiActions.post( ENDPOINT_BEING_TESTED + "?completion_process=" + completionProcess, taskId, diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskExecuteReconfigureControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskExecuteReconfigureControllerTest.java index f3102d5764..e1f4930b69 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskExecuteReconfigureControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskExecuteReconfigureControllerTest.java @@ -53,22 +53,12 @@ public class PostTaskExecuteReconfigureControllerTest extends SpringBootFunction private static final String ENDPOINT_BEING_TESTED = "/task/operation"; - @Before - public void setUp() { - assignerCredentials = authorizationProvider.getNewWaTribunalCaseworker(EMAIL_PREFIX_R3_5); - assigneeCredentials = authorizationProvider.getNewWaTribunalCaseworker(EMAIL_PREFIX_R3_5); - ginIndexCaseworkerCredentials = authorizationProvider.getNewWaTribunalCaseworker(EMAIL_PREFIX_GIN_INDEX); - } @After public void cleanUp() { common.clearAllRoleAssignments(assignerCredentials.getHeaders()); common.clearAllRoleAssignments(assigneeCredentials.getHeaders()); common.clearAllRoleAssignments(ginIndexCaseworkerCredentials.getHeaders()); - - authorizationProvider.deleteAccount(assignerCredentials.getAccount().getUsername()); - authorizationProvider.deleteAccount(assigneeCredentials.getAccount().getUsername()); - authorizationProvider.deleteAccount(ginIndexCaseworkerCredentials.getAccount().getUsername()); } @Test @@ -904,7 +894,7 @@ public void should_reconfigure_multiple_additional_properties_after_validation_r await().ignoreException(Exception.class) .atLeast(5, TimeUnit.SECONDS) - .pollInterval(5, SECONDS) + .pollInterval(2, SECONDS) .atMost(180, SECONDS) .untilAsserted(() -> { Response taskResult = restApiActions.get( @@ -1000,7 +990,7 @@ public void should_set_next_hearing_date_to_empty_if_dmn_evaluates_to_empty_when await().ignoreException(Exception.class) .atLeast(5, TimeUnit.SECONDS) - .pollInterval(5, SECONDS) + .pollInterval(2, SECONDS) .atMost(180, SECONDS) .untilAsserted(() -> { @@ -1095,7 +1085,7 @@ public void should_set_title_to_existing_value_if_dmn_evaluates_to_empty_when_ex await().ignoreException(Exception.class) .atLeast(5, TimeUnit.SECONDS) - .pollInterval(5, SECONDS) + .pollInterval(2, SECONDS) .atMost(180, SECONDS) .untilAsserted(() -> { @@ -1200,7 +1190,7 @@ public void should_reconfigure_camunda_task_attributes_after_validation_reconfig await().ignoreException(Exception.class) .atLeast(5, TimeUnit.SECONDS) - .pollInterval(5, SECONDS) + .pollInterval(2, SECONDS) .atMost(180, SECONDS) .untilAsserted(() -> { Response taskResult = restApiActions.get( @@ -1305,7 +1295,7 @@ public void should_set_additional_properties_to_null_if_dmn_evaluates_to_empty_w await().ignoreException(Exception.class) .atLeast(5, TimeUnit.SECONDS) - .pollInterval(5, SECONDS) + .pollInterval(2, SECONDS) .atMost(180, SECONDS) .untilAsserted(() -> { diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskForSearchCompletionControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskForSearchCompletionControllerTest.java index 41eb83fd3d..be1c279c3e 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskForSearchCompletionControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskForSearchCompletionControllerTest.java @@ -28,18 +28,12 @@ public class PostTaskForSearchCompletionControllerTest extends SpringBootFunctio private static final String ENDPOINT_BEING_TESTED = "task/search-for-completable"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } + @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskInitiateByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskInitiateByIdControllerTest.java index cb44f99421..fd95c1410a 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskInitiateByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskInitiateByIdControllerTest.java @@ -29,17 +29,11 @@ public class PostTaskInitiateByIdControllerTest extends SpringBootFunctionalBaseTest { - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskMarkReconfigureControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskMarkReconfigureControllerTest.java index c2dbd78ccd..a5c5ad603f 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskMarkReconfigureControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskMarkReconfigureControllerTest.java @@ -29,18 +29,11 @@ public class PostTaskMarkReconfigureControllerTest extends SpringBootFunctionalB private static final String ENDPOINT_BEING_TESTED = "/task/operation"; private String taskId; - @Before - public void setUp() { - assignerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - assigneeCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(assignerCredentials.getHeaders()); common.clearAllRoleAssignments(assigneeCredentials.getHeaders()); - authorizationProvider.deleteAccount(assignerCredentials.getAccount().getUsername()); - authorizationProvider.deleteAccount(assigneeCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskReplicationMIControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskReplicationMIControllerTest.java index 3dd240efef..47adcb3583 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskReplicationMIControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskReplicationMIControllerTest.java @@ -57,7 +57,6 @@ public void setUp() { @After public void cleanUp() { common.clearAllRoleAssignments(caseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskSearchControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskSearchControllerTest.java index c9095bd694..9a9d5cdd02 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskSearchControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskSearchControllerTest.java @@ -47,18 +47,12 @@ public class PostTaskSearchControllerTest extends SpringBootFunctionalBaseTest { private static final String ENDPOINT_BEING_TESTED = "task"; private static final String ASSIGNED_ENDPOINT = "task/{task-id}/assign"; - @Before - public void setUp() { - caseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - ginIndexCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_GIN_INDEX); - } + @After public void cleanUp() { common.clearAllRoleAssignments(caseworkerCredentials.getHeaders()); common.clearAllRoleAssignments(ginIndexCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername()); - authorizationProvider.deleteAccount(ginIndexCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskUnclaimByIdControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskUnclaimByIdControllerTest.java index 0c47cbde9d..0a4d95a593 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskUnclaimByIdControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskUnclaimByIdControllerTest.java @@ -20,22 +20,12 @@ public class PostTaskUnclaimByIdControllerTest extends SpringBootFunctionalBaseT private static final String ENDPOINT_BEING_TESTED = "task/{task-id}/unclaim"; private static final String CLAIM_ENDPOINT = "task/{task-id}/claim"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - unassignUser = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(unassignUser.getHeaders()); - authorizationProvider.deleteAccount(unassignUser.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostUpdateTaskWithNotesControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostUpdateTaskWithNotesControllerTest.java index 752ab1fb4b..b8a1089f7a 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostUpdateTaskWithNotesControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostUpdateTaskWithNotesControllerTest.java @@ -27,18 +27,11 @@ public class PostUpdateTaskWithNotesControllerTest extends SpringBootFunctionalB private static final String ENDPOINT_BEING_TESTED = "task/{task-id}/notes"; private static final String GET_TASK_ENDPOINT = "task/{task-id}"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } @Test diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/TaskTypeControllerTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/TaskTypeControllerTest.java index 4e68f0e852..23dc8b3877 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/TaskTypeControllerTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/TaskTypeControllerTest.java @@ -18,18 +18,12 @@ public class TaskTypeControllerTest extends SpringBootFunctionalBaseTest { private static final String ENDPOINT_BEING_TESTED = "/task/task-types"; - @Before - public void setUp() { - waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); - } + @After public void cleanUp() { common.clearAllRoleAssignments(waCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(waCaseworkerCredentials.getAccount().getUsername()); - common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } diff --git a/src/functionalTest/resources/application-functional.yaml b/src/functionalTest/resources/application-functional.yaml index aba3c54160..dbb4bddcbd 100644 --- a/src/functionalTest/resources/application-functional.yaml +++ b/src/functionalTest/resources/application-functional.yaml @@ -45,5 +45,3 @@ config: initiationRequestRequiredFields: ${INITIATION_REQUEST_REQUIRED_FIELDS:name,taskType,caseId} fieldsToExcludeFromTrim: ${FIELDS_TO_EXCLUDE_FROM_TRIM:description,title,caseName} dmnConfigFieldsWithInternalDefaults: ${DMN_CONFIG_FIELDS_WITH_INTERNAL_DEFAULTS:title} - -initiation_job_running: ${INITIATION_JOB_RUNNING:false} diff --git a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/SpringBootFunctionalBaseTest.java b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/SpringBootFunctionalBaseTest.java index 71f6e6cbe6..8c4cb8c58d 100755 --- a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/SpringBootFunctionalBaseTest.java +++ b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/SpringBootFunctionalBaseTest.java @@ -6,6 +6,7 @@ import net.serenitybdd.junit.spring.integration.SpringIntegrationSerenityRunner; import org.junit.After; import org.junit.Before; +import org.junit.jupiter.api.BeforeAll; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -83,9 +84,6 @@ public abstract class SpringBootFunctionalBaseTest { protected static String ROLE_ASSIGNMENT_VERIFICATION_TITLE = "Role Assignment Verification"; protected static String ROLE_ASSIGNMENT_VERIFICATION_DETAIL_REQUEST_FAILED = "Role Assignment Verification: The request failed the Role Assignment checks performed."; - protected static String ROLE_ASSIGNMENT_VERIFICATIONS_FAILED_ASSIGNER = - "Role Assignment Verification: The user assigning the Task has failed the Role Assignment checks performed."; - protected static String TASK_NOT_FOUND_ERROR = "Task Not Found Error: The task could not be found."; protected GivensBuilder given; protected Assertions assertions; protected Common common; @@ -100,14 +98,10 @@ public abstract class SpringBootFunctionalBaseTest { @Autowired protected CcdRetryableClient ccdRetryableClient; @Autowired - protected RoleAssignmentHelper roleAssignmentHelper; - @Autowired protected IdamService idamService; @Autowired protected RoleAssignmentServiceApi roleAssignmentServiceApi; @Autowired - protected TaskMandatoryFieldsValidator taskMandatoryFieldsValidator; - @Autowired protected IdamTokenGenerator idamTokenGenerator; @Value("${targets.camunda}") @@ -118,24 +112,42 @@ public abstract class SpringBootFunctionalBaseTest { private String testUrl; @Value("${launch_darkly.url}") private String launchDarklyUrl; - @Value("${initiation_job_running}") - private Boolean initiationJobRunning; - - protected TestAuthenticationCredentials baseCaseworkerCredentials; - protected TestAuthenticationCredentials waCaseworkerCredentials; - protected TestAuthenticationCredentials caseworkerCredentials; - protected TestAuthenticationCredentials assignerCredentials; - protected TestAuthenticationCredentials assigneeCredentials; - protected TestAuthenticationCredentials secondAssigneeCredentials; - protected TestAuthenticationCredentials caseworkerForReadCredentials; - protected TestAuthenticationCredentials currentCaseworkerCredentials; - protected TestAuthenticationCredentials unassignUser; - protected TestAuthenticationCredentials otherUser; - protected TestAuthenticationCredentials ginIndexCaseworkerCredentials; - protected String idamSystemUser; + + protected static TestAuthenticationCredentials baseCaseworkerCredentials; + protected static TestAuthenticationCredentials waCaseworkerCredentials; + protected static TestAuthenticationCredentials caseworkerCredentials; + protected static TestAuthenticationCredentials assignerCredentials; + protected static TestAuthenticationCredentials assigneeCredentials; + protected static TestAuthenticationCredentials secondAssigneeCredentials; + protected static TestAuthenticationCredentials caseworkerForReadCredentials; + protected static TestAuthenticationCredentials currentCaseworkerCredentials; + protected static TestAuthenticationCredentials unassignUser; + protected static TestAuthenticationCredentials otherUser; + protected static TestAuthenticationCredentials ginIndexCaseworkerCredentials; + protected static String idamSystemUser; + + private static boolean credentialsInitialized = false; + @Before - public void setUpGivens() throws IOException { + public void setUpGivens() { + if (!credentialsInitialized) { + secondAssigneeCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + caseworkerForReadCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + waCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + caseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R2); + baseCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + assignerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + assigneeCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + ginIndexCaseworkerCredentials = authorizationProvider.getNewWaTribunalCaseworker(EMAIL_PREFIX_GIN_INDEX); + + + idamSystemUser = idamTokenGenerator.getUserInfo(idamTokenGenerator.generate()).getUid(); + + credentialsInitialized = true; + } + + restApiActions = new RestApiActions(testUrl, SNAKE_CASE).setUp(); camundaApiActions = new RestApiActions(camundaUrl, LOWER_CAMEL_CASE).setUp(); workflowApiActions = new RestApiActions(workflowUrl, LOWER_CAMEL_CASE).setUp(); @@ -160,22 +172,20 @@ public void setUpGivens() throws IOException { roleAssignmentServiceApi, workflowApiActions); - idamSystemUser = idamTokenGenerator.getUserInfo(idamTokenGenerator.generate()).getUid(); - baseCaseworkerCredentials = authorizationProvider.getNewTribunalCaseworker(EMAIL_PREFIX_R3_5); + common.setupWAOrganisationalRoleAssignment(baseCaseworkerCredentials.getHeaders()); } @After public void cleanUp() { common.clearAllRoleAssignments(baseCaseworkerCredentials.getHeaders()); - authorizationProvider.deleteAccount(baseCaseworkerCredentials.getAccount().getUsername()); } public AtomicReference getTaskId(Object taskName, String filter) { AtomicReference response = new AtomicReference<>(); await().ignoreException(AssertionError.class) - .pollInterval(500, MILLISECONDS) - .atMost(30, SECONDS) + .pollInterval(250, MILLISECONDS) + .atMost(20, SECONDS) .until( () -> { Response camundaGetTaskResult = camundaApiActions.get( @@ -257,32 +267,23 @@ private void initiateTask(TestVariables testVariables, Headers headers, Map additionalProperties, Consumer assertConsumer) { - log.info("Task initiate with cron job {}", initiationJobRunning); - if (initiationJobRunning) { - await() - .pollInterval(10, SECONDS) - .atMost(120, SECONDS) - .until( - () -> { - Response response = restApiActions.get( - TASK_GET_ENDPOINT, - testVariables.getTaskId(), - headers - ); - - return HttpStatus.OK.value() == response.getStatusCode(); - } - ); - } else { + sendInitiateRequest(testVariables, additionalProperties,headers); - } - Response response = restApiActions.get( - TASK_GET_ENDPOINT, - testVariables.getTaskId(), - headers - ); - assertConsumer.accept(response); + await() + .pollInterval(1, SECONDS) + .atMost(60, SECONDS) + .until( + () -> { + Response response = restApiActions.get( + TASK_GET_ENDPOINT, + testVariables.getTaskId(), + headers + ); + + return HttpStatus.OK.value() == response.getStatusCode(); + } + ); } private Consumer defaultInitiationAssert(TestVariables testVariables) { @@ -342,7 +343,6 @@ protected InitiateTaskRequestMap initiateTaskRequestMap(TestVariables testVariab taskAttributes.put(SECURITY_CLASSIFICATION.value(), SecurityClassification.PUBLIC); taskAttributes.put(HAS_WARNINGS.value(), hasWarnings); taskAttributes.put(WARNING_LIST.value(), testVariables.getWarnings()); - taskAttributes.put(WARNING_LIST.value(), testVariables.getWarnings()); taskAttributes.put("__processCategory__Protection", true); Optional.ofNullable(additionalProperties).ifPresent(taskAttributes::putAll); @@ -395,8 +395,4 @@ protected String getAssigneeId(Headers headers) { return authorizationProvider.getUserInfo(headers.getValue(AUTHORIZATION)).getUid(); } - protected Boolean isInitiationJobRunning() { - return this.initiationJobRunning; - } - } diff --git a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/services/AuthorizationProvider.java b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/services/AuthorizationProvider.java index c27656ceaf..5e09a6cf5f 100644 --- a/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/services/AuthorizationProvider.java +++ b/src/testUtils/java/uk/gov/hmcts/reform/wataskmanagementapi/services/AuthorizationProvider.java @@ -99,93 +99,16 @@ public TestAuthenticationCredentials getNewWaTribunalCaseworker(String emailPref return new TestAuthenticationCredentials(caseworker, authenticationHeaders); } - public TestAuthenticationCredentials getNewLawFirm() { - /* - * This user is used to create cases in ccd - */ - TestAccount lawfirm = getIdamLawFirmCredentials("wa-ft-lawfirm-"); - - Headers authenticationHeaders = new Headers( - getAuthorizationOnly(lawfirm), - getServiceAuthorizationHeader() - ); - - return new TestAuthenticationCredentials(lawfirm, authenticationHeaders); - } - - public TestAuthenticationCredentials getJudgeAuthorization(String emailPrefix) { - /* - * This user is used to create cases in ccd - */ - TestAccount lawfirm = getIdamJudgeCredentials(emailPrefix); - - Headers headers = new Headers( - getJudgeAuthorizationOnly(emailPrefix), - getServiceAuthorizationHeader() - ); - - return new TestAuthenticationCredentials(lawfirm, headers); - } - - public TestAuthenticationCredentials getAdminCaseworker(String emailPrefix) { - /* - * This user is used to assign role assignments to on a per test basis. - * A clean up before assigning new role assignments is needed. - */ - TestAccount caseworker = getIdamLawFirmCredentials(emailPrefix); - - Headers authenticationHeaders = new Headers( - getAuthorizationOnly(caseworker), - getServiceAuthorizationHeader() - ); - - return new TestAuthenticationCredentials(caseworker, authenticationHeaders); - } - - public TestAuthenticationCredentials getAdminUserAuthorization(String emailPrefix) { - /* - * This user is used to create cases in ccd - */ - TestAccount caseworker = getAdministativeCredentials(emailPrefix); - - Headers authenticationHeaders = new Headers( - getAdminUserAuthorizationOnly(emailPrefix), - getServiceAuthorizationHeader() - ); - return new TestAuthenticationCredentials(caseworker, authenticationHeaders); - - } - public Header getCaseworkerAuthorizationOnly(String emailPrefix) { TestAccount caseworker = getIdamCaseWorkerCredentials(emailPrefix); return getAuthorization(caseworker.getUsername(), caseworker.getPassword()); } - public Header getLawFirmAuthorizationOnly() { - - TestAccount lawfirm = getIdamLawFirmCredentials("wa-ft-lawfirm-"); - return getAuthorization(lawfirm.getUsername(), lawfirm.getPassword()); - - } - public Header getAuthorizationOnly(TestAccount account) { return getAuthorization(account.getUsername(), account.getPassword()); } - public Header getJudgeAuthorizationOnly(String emailPrefix) { - - TestAccount lawfirm = getIdamJudgeCredentials(emailPrefix); - return getAuthorization(lawfirm.getUsername(), lawfirm.getPassword()); - - } - - public Header getAdminUserAuthorizationOnly(String emailPrefix) { - - TestAccount lawfirm = getAdministativeCredentials(emailPrefix); - return getAuthorization(lawfirm.getUsername(), lawfirm.getPassword()); - - } public UserInfo getUserInfo(String userToken) { return userInfo.computeIfAbsent( @@ -199,30 +122,6 @@ public Headers getServiceAuthorizationHeadersOnly() { return new Headers(getServiceAuthorizationHeader()); } - public Headers getWACaseworkerAAuthorization(String emailPrefix) { - /* - * This user is used to assign role assignments to on a per test basis. - * A clean up before assigning new role assignments is needed. - */ - return new Headers( - getWACaseworkerAAuthorizationOnly(emailPrefix), - getServiceAuthorizationHeader() - ); - } - - public Header getWACaseworkerAAuthorizationOnly(String emailPrefix) { - List requiredRoles = asList(new RoleCode("caseworker-wa-task-configuration"), - new RoleCode("payments"), - new RoleCode("caseworker-wa")); - TestAccount testAccount = generateIdamTestAccount(emailPrefix, requiredRoles); - return getAuthorization(testAccount.getUsername(), testAccount.getPassword()); - - } - - public String getUserId(Headers headers) { - return getUserInfo(headers.getValue(AUTHORIZATION)).getUid(); - } - private Header getAuthorization(String username, String password) { MultiValueMap body = createIdamRequest(username, password); @@ -248,22 +147,6 @@ private TestAccount getIdamLawFirmCredentials(String emailPrefix) { return generateIdamTestAccount(emailPrefix, requiredRoles); } - private TestAccount getIdamJudgeCredentials(String emailPrefix) { - List requiredRoles = asList(new RoleCode("caseworker-ia"), - new RoleCode("caseworker-ia-judiciary"), - new RoleCode("payments") - ); - return generateIdamTestAccount(emailPrefix, requiredRoles); - } - - private TestAccount getAdministativeCredentials(String emailPrefix) { - List requiredRoles = asList(new RoleCode("caseworker-ia"), - new RoleCode("caseworker-ia-admofficer"), - new RoleCode("payments") - ); - return generateIdamTestAccount(emailPrefix, requiredRoles); - } - private TestAccount getIdamWaTribunalCaseworkerCredentials(String emailPrefix) { List requiredRoles = asList(new RoleCode("caseworker-wa-task-configuration"), new RoleCode("payments"),