Fix flaky ChildControllerSubmittedTest #5635
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DanCatchpole
approved these changes
Oct 14, 2024
chak-shing-lo-justice
added a commit
that referenced
this pull request
Oct 18, 2024
* Update ChildrenEventData.java (#5617) * Update dependency org.postgresql:postgresql to v42.7.4 (#5629) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update ChildControllerSubmittedTest.java (#5635) * Update Jenkinsfile_CNP (#5634) * Update Jenkinsfile_CNP (#5637) * Update dependency org.projectlombok:lombok to v1.18.34 (#5638) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix caseLocalAuthority * Revert "Merge branch 'master' into DFPL-2557-fix-applicantLA" This reverts commit 60ee32f, reversing changes made to 3ace343. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
chak-shing-lo-justice
added a commit
that referenced
this pull request
Feb 27, 2025
* DFPL-2427 POC controllers for FPL API gateway (#5481) * add dummy controller for API gateway POC * update CafcassCasesController for POC * update CafcassCasesController for POC * Update CafcassCasesController.java * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * add all endpoint for POC * remove unused import * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * Update CafcassCasesController.java * update CafcassCasesController * DFPL-1761 Build GET /searchCases endpoint (#5495) * add dummy controller for API gateway POC * update CafcassCasesController for POC * update CafcassCasesController for POC * Update CafcassCasesController.java * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * add all endpoint for POC * remove unused import * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * Update CafcassCasesController.java * update CafcassCasesController * DFPL-2449 Add interceptor and exception handling for Cafcass API (#5493) * Fix ES/logstash configuration in preview (#5488) * Copy adoption configuration to attempt to persist ES a bit more between pipeline runs * fix template variable in ES * fix template variable in ES * DFPL-2427 POC controllers for FPL API gateway (#5481) * add dummy controller for API gateway POC * update CafcassCasesController for POC * update CafcassCasesController for POC * Update CafcassCasesController.java * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * add all endpoint for POC * remove unused import * Update CafcassCasesControllerTest.java * Update CafcassCasesController.java * Update CafcassCasesController.java * update CafcassCasesController * add interceptor for verifying user role * add other exception * add unit test * fix check style --------- Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> * fix unit test * implement es search * search case response object * response field child and other * remove converters chain * other application details * refactor to chain pattern * orders document and manage document * case documents * fix category * CafcassApiHelperTest and CafcassApiCaseServiceTest * applicantConverter test * CafcassApiChildrenConverterTest * refactor CafcassApiCaseDocumentsConverter to more FP style * Create CafcassApiFactorsParentingConverterTest.java * Create CafcassApiHearingDetailsConverterTest.java * add CafcassApiInternationalElementConverterTest * Create CafcassApiMetaDataConverterTest.java * Create CafcassApiOthersConverterTest.java * add CafcassApiPreviousProceedingsConverterTest * refactor and add CafcassApiRespondentsConverterTest * Create CafcassApiRisksConverterTest.java * add sdo and udo converter test * add draft oder converting test * refactor to service * original application test * add managed doc test * update controller test * fix style check * fix unit test * fix code check * rename to CafcassApiSearchCaseService * Update AmendOrderToDownloadPrePopulatorTest.java * Update CafcassApiInterceptor.java * use cafcass role until new role is set up * Update CafcassApiInterceptor.java * use object provider * remove comment --------- Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> * update CAFCASS_SYSTEM_UPDATE value (#5523) * fix code style * Dfpl 1761 ES query fix (#5524) * update es search query * fix and update test * query close case as well * Update CafcassApiSearchCaseServiceTest.java * DFPL 1760 (#5525) * document download endpoint * update user role crud * update use role * Update add-ccd-user-roles.sh * fix profile * Create CafcassApiDocumentServiceTest.java * Cafcass api fix conflict (#5538) * Async test verifications (fixing flaky async tests) (#5519) * fix running tests locally without the env vars * Add timeouts for async tests * DFPL-1269 Non-molestation order (FL404A) (#5455) * git dfpl1269 * fix test * fix check style * fix manageOrdersRecitalsAndPreamblesOptional and add unit test * allow selecting appllicant and respondent * fix test * Update OrderTest.java * update notification * fix check style * fix code check * Update NotifyTemplates.java * Update NonMolestationOrderEventHandler.java * Upped timeout to 110 seconds (#5528) * Update statement of truth wording - DFPL-2458 (#5502) * Update statement of truth wording at case submission and on C1 and C110a applications. * Update wording for tests. * Update wording to be two separated statements * Update Welsh C110a template and update order of wording in statement of truth. * Remove sentence * Remove sentence in welsh --------- Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk> Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> * Rename CFV Category - Judgments/facts and reasons (#5530) * NightlyUiTestFix (#5536) * FixCaseFlagAPICaseCreationAssertion * FixGatekeepingJudgesSearchListAndShareCase * FixGatekeepingJudgesSearchListAndShareCase --------- Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: gavinkeys <72936463+gavinkeys@users.noreply.github.com> Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk> Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com> * DFPL-1791: Add List for Guardian Report API call (#5531) * Async test verifications (fixing flaky async tests) (#5519) * fix running tests locally without the env vars * Add timeouts for async tests * DFPL-1269 Non-molestation order (FL404A) (#5455) * git dfpl1269 * fix test * fix check style * fix manageOrdersRecitalsAndPreamblesOptional and add unit test * allow selecting appllicant and respondent * fix test * Update OrderTest.java * update notification * fix check style * fix code check * Update NotifyTemplates.java * Update NonMolestationOrderEventHandler.java * Upped timeout to 110 seconds (#5528) * Update statement of truth wording - DFPL-2458 (#5502) * Update statement of truth wording at case submission and on C1 and C110a applications. * Update wording for tests. * Update wording to be two separated statements * Update Welsh C110a template and update order of wording in statement of truth. * Remove sentence * Remove sentence in welsh --------- Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk> Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> * DFPL-1791: Add List for Position statement API call * add event and guardian report document json for manage docs flow/removal * add standard system update for testing * fix spelling error and test for managedocs * fix tests and exclude guardian report from manage docs flow outside removeable * checkstyle * hidden document test fix * checkstyle * Rename CFV Category - Judgments/facts and reasons (#5530) * NightlyUiTestFix (#5536) * FixCaseFlagAPICaseCreationAssertion * FixGatekeepingJudgesSearchListAndShareCase * FixGatekeepingJudgesSearchListAndShareCase * add correct field type param to guardianReportsList * remove cafcasssystemupdate for now * add to json categories for CFV * add permissions for new cafcass system update user * fix merge conflict issue * add extra permissions * fix perms --------- Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Co-authored-by: gavinkeys <72936463+gavinkeys@users.noreply.github.com> Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk> Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com> * Dfpl 1790 (#5541) * update ccd config * update event name * Update 6_CasePeople.json * grant access to cafcass system user * update field permission * update Guardian fields * fix ccd definition after resolving conflict * Update system-update.json (#5544) * add genderIdentification to response (#5546) * DFPL-1762 (#5540) * update ccd config * update event name * Update 6_CasePeople.json * add guardian logic * grant access to cafcass system user * update field permission * update Guardian fields * update validation * add validation * Update Guardian.java * UpdateGuardianContentProvider * Create UpdateGuardianNotifyData.java * add update guardian notification * fix ccd definition after resolving conflict * update controller test * fix code style * fix guardian * simplify checkIfAnyGuardianUpdated * fix gender value in API response (#5548) * Push Master changes to cafcass api feature branch (#5554) * DFPL-2517: Increase core pool size for async task executor (#5543) * Increase core pool size for async task executor * Fix check style * DFPL-2257: Add updated court seals (#5533) * Add updated court seals * Add updated court seals * Change seal to be Welsh rather than bilingual and update sealed document for tests. * Update docmosis to use new court seal imgages in rdo docmosis. * Fix test failures * Rename seal files to be consistent with their names in docmosis. * DFPL-2488: Use the correct court code + fix caseManagementLocation when transferring LAs (#5527) * DFPL-2488: Use the correct court code + fix caseManagementLocation when transferring LAs * checkstyle * introduce constants for test --------- Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> * Update UploadTranslationsSubmittedControllerTest.java (#5551) * DFPL-2325: Add 4 New Details Boxes for C43 (#5499) * DFPL-2325: Add 4 New Details Boxes for C43 * add to order object through question block and fix generator test * add missing fields to test * add additional check * add to object so it persists through to the casedata for MI * fix persisting * fix generator test * checkstyle * fix scoped field test * change to append rather than concat * remove further directions * hide directions in child arrangement flow * fix test * remove very flakey test (for now) * unflakey --------- Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> * DFPL-2491: Migrate out of sync caseManagementLocation fields (#5553) * DFPL-2491: Fix caseManagementLocation after bug * correct migration ID * Add populate case - returned event (#5552) --------- Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> * Revert "Push Master changes to cafcass api feature branch (#5554)" This reverts commit 3515ecf. * fix unit test after merge * DFPL 2512 Cafcass API Feature toggling by region (court) (#5568) * add feature toggling for Cafcass API by region * Update CafcassNotificationService.java * feature flag json with whitelist * fix es query * DFPL-2506 add uploadTimestamp (#5529) * add uploadTimestamp * udpate CaseDocument field name * Update CafcassApiCaseDocument.java * Update CafcassApiConfiguration.java (#5585) * Update system-update.json (#5586) * DFPL-1767: Add POST endpoint for uploading documents from Cafcass API (#5547) * DFPL-1757: Add Post endpoint for uploading documents * change name of dummy event to match existing convention * add cafcass system update user to user type for doc notifications and use builder for cafcass event handler * add tests for file checking * checkstyle * remove unused file * add test for main controller method * add spy for event publisher * fix test! * fix test! * test change * more test fixtures * throw exception from get cases data method don't catch * throw exception from get cases data method don't catch * generate name for guardian report * checkstyle * change publish event to use self generated event object and move getCaseData for concurrency * add blank hashmaps for unused event object * add missing mocks * checkstyle * add position statement * checkstyle * comments! * DFPL 2214 Fix c2 draft order and duplicated doc (#5589) * fix c2 draft order and duplicated doc * Update CafcassApiCaseDocumentsConverterTest.java * Update CafcassApiCaseDocumentsConverter.java * fix managedDoc converting * DFPL 2548 (#5588) * fix caseId field and la * Update CafcassApiSearchCaseControllerTest.java * DFPL 2542 Apply feature toggling to all endpoint (#5587) * add feature toggling to all Cafcass API * Update CafcassApiInterceptorTest.java * Update CafcassApiInterceptorTest.java * Update CafcassCasesControllerTest.java * Update CafcassApiInterceptorTest.java * Update CafcassApiDocumentUploadControllerTest.java * Dfpl 2548 fix system update user permission (#5593) * Update system-update.json * Update system-update.json * Dfpl 2547 (#5591) * include non null field only * Update CafcassApiCaseDocument.java * update empty case * include non empty only * handle empty object on optional fields * handle possible empty object * refactor converter * fix code style check * update converters * Update CafcassApiRisksConverter.java * fix code style * DFPL-1767: Fix Guardian's Report document removal (#5600) * Update system-update.json (#5604) * DFPL-1767: Fix Guardian Report DocumentType and Category (#5607) * DFPL-1767-Fix: Swap Guardian Reports to standalone and be uploadable by CTSC * fix tests * fix document type order * DFPL-GUARDIANREPORT-FIX: Swap to U rather than R for removed reports (#5611) * update to Boolean (#5606) * DFPL-POSSTMT: Add Null handler for Position Statement Lists (#5616) * DFPL-POSTSTM: Add Null handler for position statement list * checkstyle * fix feature service after merge * Update application.yaml (#5624) * Cafcass api filtering out wales case (#5618) * udpate search case * Update CafcassApiSearchCaseServiceTest.java * udpate risks and internationalElement for sys user * DFPL 2557 specify ES query source field. (#5640) * add source * Update CafcassApiCaseDataConverter.java * fix code check * fix constrtuctor * Update CafcassApiSearchCaseService.java * update unit test * Dfpl 2557 fix applicant la (#5642) * Update ChildrenEventData.java (#5617) * Update dependency org.postgresql:postgresql to v42.7.4 (#5629) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update ChildControllerSubmittedTest.java (#5635) * Update Jenkinsfile_CNP (#5634) * Update Jenkinsfile_CNP (#5637) * Update dependency org.projectlombok:lombok to v1.18.34 (#5638) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix caseLocalAuthority * Revert "Merge branch 'master' into DFPL-2557-fix-applicantLA" This reverts commit 60ee32f, reversing changes made to 3ace343. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix CafcassApiCaseDocumentsConverterTest after merging * Dfpl 2588 Include solicitor's address in search response (#5660) * add solicitor address to response * fix unit test * Dfpl 2588 fix when UnregisteredOrganisation exist (#5669) * add solicitor address to response * fix unit test * fix when empty UnregisteredOrganisation exist * Dfpl 2601 Revert solicitor's address changes (#5689) * revert solicitor address changes This reverts commit 456c463. Revert "Dfpl 2588 Include solicitor's address in search response (#5660)" This reverts commit eeb4a73. * Update CafcassApiHelperTest.java * fix hearing notice * Update CafcassApiCaseDocumentsConverter.java * Revert "Update CafcassApiCaseDocumentsConverter.java" This reverts commit 85d6a31. * Revert "fix hearing notice" This reverts commit 753ddb8. * DFPL-2602 Cafcass API fix mapping of new expert report types (#5687) * Update DocumentType.java * fix permission missing for document download * fix hearingNotices and noticeOfActingNoticeOfIssue * map all new export report to expertReports * Update DocumentType.java * fix code check * DFPL 2617 Cafcass API - Fix cancelled hearings are not included in the response (#5727) * add cancelled hearing * fix code scan * add source * empty commit * CAFCASS-API fix merge 20250217 (#5844) * fix addressKnown after updating from master * renam typo * Update CafcassApiRespondentsConverterTest.java * update check * Update CafcassEmailContentProviderTest.java * Update CafcassApiHelper.java * Update CafcassApiHelper.java * Update CafcassApiHelper.java --------- Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: gavinkeys <72936463+gavinkeys@users.noreply.github.com> Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk> Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com> Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com> Co-authored-by: Alistair Osborne <alistair.osborne@justice.gov.uk> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA link (if applicable)
Change description
Fix flaky ChildControllerSubmittedTest by clearing context after each method
Does this PR introduce a breaking change? (check one with "x")