Skip to content

Functional test refactor #1504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Functional test refactor #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Jenkinsfile_CNP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile_nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
14 changes: 0 additions & 14 deletions ...ov/hmcts/reform/wataskmanagementapi/watasks/controllers/DeleteTaskByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
9 changes: 1 addition & 8 deletions ...cts/reform/wataskmanagementapi/watasks/controllers/DeleteTasksByCaseIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions ...k/gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetTaskByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
18 changes: 0 additions & 18 deletions .../gov/hmcts/reform/wataskmanagementapi/watasks/controllers/GetWorkTypesControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
20 changes: 2 additions & 18 deletions ...mcts/reform/wataskmanagementapi/watasks/controllers/PostTaskAssignByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
10 changes: 0 additions & 10 deletions ...mcts/reform/wataskmanagementapi/watasks/controllers/PostTaskCancelByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 2 additions & 11 deletions ...hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskClaimByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down
15 changes: 0 additions & 15 deletions ...ts/reform/wataskmanagementapi/watasks/controllers/PostTaskCompleteByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
20 changes: 5 additions & 15 deletions ...orm/wataskmanagementapi/watasks/controllers/PostTaskExecuteReconfigureControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(() -> {

Expand Down Expand Up @@ -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(() -> {

Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(() -> {

Expand Down
8 changes: 1 addition & 7 deletions ...rm/wataskmanagementapi/watasks/controllers/PostTaskForSearchCompletionControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions ...ts/reform/wataskmanagementapi/watasks/controllers/PostTaskInitiateByIdControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions ...reform/wataskmanagementapi/watasks/controllers/PostTaskMarkReconfigureControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...s/reform/wataskmanagementapi/watasks/controllers/PostTaskReplicationMIControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public void setUp() {
@After
public void cleanUp() {
common.clearAllRoleAssignments(caseworkerCredentials.getHeaders());
authorizationProvider.deleteAccount(caseworkerCredentials.getAccount().getUsername());
}

@Test
Expand Down
8 changes: 1 addition & 7 deletions ...ov/hmcts/reform/wataskmanagementapi/watasks/controllers/PostTaskSearchControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading