Rwa 4067 refactor integration tests #1392

adityadwadasi · 2025-02-20T15:40:30Z

Before creating a pull request make sure that:

commit messages are meaningful and follow good commit message guidelines
README and other documentation has been updated / added (if needed)
tests have been updated / new tests has been added (if needed)

Please remove this line and everything above and fill the following sections:

JIRA link (if applicable)

https://tools.hmcts.net/jira/browse/RWA-4067

Change description

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[ ] No

adityadwadasi · 2025-02-20T15:49:44Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java


    private static SearchTaskRequest invalidCaseId() {
        return new SearchTaskRequest(List.of(
-            new SearchParameterList(CASE_ID, SearchOperator.IN, asList("000000", "", null))


If there is null here we are getting "SQLGrammarException: could not extract ResultSet: operator does not exist: text = bytea".
But post springboot upgrade we are not getting that exception.
If this PR is merged before Springboot upgrade, I will add null's in springboot PR.
If springboot PR is merged before this PR, I will put the null's back here.

Need add a ticket to review search request validations.

https://tools.hmcts.net/jira/browse/RWA-4142

adityadwadasi · 2025-02-20T15:49:54Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java


    private static SearchTaskRequest invalidUserId() {
        return new SearchTaskRequest(List.of(
-            new SearchParameterList(USER, SearchOperator.IN, asList("unknown", "", null))


same as above.

Need add a ticket to review search request validations.

adityadwadasi · 2025-02-20T15:54:50Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

                accessControlResponse
            ))
-            .hasNoCause()
-            .hasMessage("Offset index must not be less than zero");


In the Hibernate criteria's there's a method call to validate the pagination values.
This is the method "Pageable page = OffsetPageableRequest.of(firstResult, maxResults);"

But in the gin index approach we do not have such validations. So instead of looking for a message I was asserting the Exception directly.

Please suggest if anything needs to be changed.

Need add a ticket to review search request validations.

https://tools.hmcts.net/jira/browse/RWA-4142

adityadwadasi · 2025-02-20T15:55:16Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

                searchRequest,
                accessControlResponse
            ))
-            .hasNoCause()


Same as above.

Need add a ticket to review search request validations.

https://tools.hmcts.net/jira/browse/RWA-4142

adityadwadasi · 2025-02-20T15:56:53Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

            .roleAssignments(pagination(Classification.RESTRICTED))
            .searchTaskRequest(searchTaskRequest)
            .expectedAmountOfTasksInResponse(20)
-            .expectedTotalRecords(29)


Since the gin index approach we don't retrieve any other states except ASSIGNED and UNASSIGNED, I had to correct the expectation count here.

raghera · 2025-02-26T14:00:35Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

-        final TaskQueryScenario allTasks = TaskQueryScenario.builder()
-            .scenarioName("Search by state")
+        final TaskQueryScenario pendingAssignEmptyTasks = TaskQueryScenario.builder()
+            .scenarioName("Search by PENDING_AUTO_ASSIGN state, empty results")


You can probably remove this scenario if you like. It's not an observable state at the moment with the way things work. So I'd be happy with covering just COMPLETED and CANCELLED states for negative scenarios.

Removed the case suggested Ravi.

github-actions · 2025-07-13T03:52:23Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

raghera

I have had a look through but we probably want Ben's involvement so that tests maintain their value. Can also consider removing any that are not useful any more.

raghera · 2025-08-15T10:55:19Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/ia/CftQueryServiceITTest.java

        roleAssignment = RoleAssignment.builder().roleName("senior-tribunal-caseworker")
            .classification(classification)
-            .attributes(excludeddAttributes)
+            .attributes(Collections.emptyMap())


Why did you remove the excluded attributes?

raghera · 2025-08-15T10:56:18Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/ia/CftQueryServiceITTest.java

+        cftTaskDatabaseService = new CFTTaskDatabaseService(taskResourceRepository, cftTaskMapper);
    }

    @Disabled


This test still looks like it is Disabled?

raghera · 2025-08-15T11:10:19Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

-        final SearchTaskRequest searchTaskRequest = new SearchTaskRequest(List.of(
-            new SearchParameterList(JURISDICTION, SearchOperator.IN, List.of(WA_JURISDICTION))
+        final SearchTaskRequest searchTaskRequest = new SearchTaskRequest(
+            RequestContext.AVAILABLE_TASKS,


How come you added this? This will change the nature of the search and apply a set of permissions on it which were not there previously.

raghera · 2025-08-15T11:23:20Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

-            .expectedAmountOfTasksInResponse(2)
-            .expectedTotalRecords(2)
+            .expectedAmountOfTasksInResponse(0)
+            .expectedTotalRecords(0)


Not sure but maybe this test is better served by just removing the state clause or modifying it so ASSIGNED/UNASSIGNED is requested. Seems to lose it's value if it just returns nothing.

raghera · 2025-08-15T11:27:51Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java

-            .expectedAmountOfTasksInResponse(2)
-            .expectedTotalRecords(2)
+            .expectedAmountOfTasksInResponse(1)
+            .expectedTotalRecords(1)


Seems like it's worth keeping the result of this test as multiple. Appears to be sending in multiple work_types and then expecting both to hit a record in response? Would be good to modify the data so you have at least one hit per workType.

raghera · 2025-08-15T11:31:34Z

src/integrationTest/resources/scripts/ia/data.sql


 INSERT INTO cft_task_db.tasks (task_id, assignee, assignment_expiry, auto_assigned, business_context, case_id, case_name, case_type_id, created, description, due_date_time, has_warnings, jurisdiction, LOCATION, location_name, major_priority, minor_priority, notes, region, region_name, role_category, security_classification, state, task_name, task_system, task_type, termination_reason, title, work_type, execution_type_code, priority_date)
-values('8d6cc5cf-c973-11eb-bdba-0242ac111023', 'SELF', '2022-05-09T20:15:45.345875+01:00', FALSE, 'CFT_TASK', '1623278362431023', 'TestCase2', 'Asylum', '2021-05-09T20:15:45.345875+01:00', 'description', '2022-08-09T20:15:45.345875+01:00', FALSE, 'IA', '765324', 'Taylor House', 5000, 0, '[{"user": "userVal", "noteType": "noteTypeVal"}]', '1', 'TestRegion', 'JUDICIAL', 'PUBLIC', 'UNASSIGNED', 'taskName', 'SELF', 'startAppeal', NULL, 'title', 'hearing_work', 'MANUAL', '2022-08-09T20:15:45.345875+01:00');
+values('8d6cc5cf-c973-11eb-bdba-0242ac111023', null, '2022-05-09T20:15:45.345875+01:00', FALSE, 'CFT_TASK', '1623278362431023', 'TestCase2', 'Asylum', '2021-05-09T20:15:45.345875+01:00', 'description', '2022-08-09T20:15:45.345875+01:00', FALSE, 'IA', '765324', 'Taylor House', 5000, 0, '[{"user": "userVal", "noteType": "noteTypeVal"}]', '1', 'TestRegion', 'JUDICIAL', 'PUBLIC', 'UNASSIGNED', 'taskName', 'SELF', 'startAppeal', NULL, 'title', 'hearing_work', 'MANUAL', '2022-08-09T20:15:45.345875+01:00');


Any reason for this change in data? SELF

raghera · 2025-08-15T11:34:13Z

...ionTest/java/uk/gov/hmcts/reform/wataskmanagementapi/cft/query/wa/CftQueryServiceITTest.java


    }
+
+    private void indexRecord() {


Could we put this in it's own class?

github-actions · 2025-09-15T03:43:36Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

adityadwadasi added 2 commits February 20, 2025 15:23

RWA-4067: Integration tests refactored

366b8d9

Code corrections.

b33e6ee

adityadwadasi commented Feb 20, 2025

View reviewed changes

hmcts-jenkins-j-to-z bot deployed to preview February 20, 2025 16:05 View deployment

hmcts-jenkins-j-to-z bot added ns:wa prd:wa rel:wa-task-management-api-pr-1392 labels Feb 20, 2025

Merge branch 'master' into RWA-4067_refactor_integration_tests

f6ded7d

hmcts-jenkins-j-to-z bot deployed to preview February 25, 2025 16:08 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 25, 2025 17:02 View deployment

raghera reviewed Feb 26, 2025

View reviewed changes

adityadwadasi added 2 commits February 26, 2025 15:08

Removed PENDING_AUTO_ASSIGN Scenario

7ae36cc

Corrected test cases.

2504f1d

hmcts-jenkins-j-to-z bot deployed to preview February 26, 2025 16:56 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 26, 2025 17:18 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

e291add

hmcts-jenkins-j-to-z bot deployed to preview March 3, 2025 10:09 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

bd34f5d

hmcts-jenkins-j-to-z bot deployed to preview March 12, 2025 13:04 View deployment

adityadwadasi added 2 commits April 3, 2025 09:44

Merge branch 'master' into RWA-4067_refactor_integration_tests

36914e0

Merge branch 'master' into RWA-4067_refactor_integration_tests

487bca5

hmcts-jenkins-j-to-z bot deployed to preview April 10, 2025 13:54 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

a35cc22

hmcts-jenkins-j-to-z bot deployed to preview April 15, 2025 08:39 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

4341622

hmcts-jenkins-j-to-z bot deployed to preview April 15, 2025 14:28 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

b570a62

hmcts-jenkins-j-to-z bot deployed to preview April 16, 2025 08:47 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

86a3377

hmcts-jenkins-j-to-z bot deployed to preview May 1, 2025 08:28 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

f6bdfba

hmcts-jenkins-j-to-z bot deployed to preview May 1, 2025 14:06 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

f2f2449

hmcts-jenkins-j-to-z bot deployed to preview May 6, 2025 07:48 View deployment

larslnde approved these changes May 7, 2025

View reviewed changes

Merge branch 'master' into RWA-4067_refactor_integration_tests

460753d

hmcts-jenkins-j-to-z bot deployed to preview May 20, 2025 08:56 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

16b4bfe

hmcts-jenkins-j-to-z bot deployed to preview May 27, 2025 09:06 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

2599113

hmcts-jenkins-j-to-z bot deployed to preview June 2, 2025 09:09 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

7b2b849

hmcts-jenkins-j-to-z bot deployed to preview June 10, 2025 08:37 View deployment

Merge branch 'master' into RWA-4067_refactor_integration_tests

0e59c19

hmcts-jenkins-j-to-z bot deployed to preview June 12, 2025 08:17 View deployment

github-actions bot added the stale label Jul 13, 2025

Merge branch 'master' into RWA-4067_refactor_integration_tests

c08cfdc

hmcts-jenkins-j-to-z bot deployed to preview July 15, 2025 08:19 View deployment

github-actions bot removed the stale label Jul 16, 2025

raghera reviewed Aug 15, 2025

View reviewed changes

github-actions bot added the stale label Sep 15, 2025

github-actions bot closed this Sep 23, 2025

adityadwadasi reopened this Oct 1, 2025

github-actions bot removed the stale label Oct 2, 2025

Rwa 4067 refactor integration tests #1392

Are you sure you want to change the base?

Rwa 4067 refactor integration tests #1392

Uh oh!

Conversation

adityadwadasi commented Feb 20, 2025

JIRA link (if applicable)

Change description

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 13, 2025

Uh oh!

raghera left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants