Skip to content
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.

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

SCRUM-4436 integration test fix #1743

Merged
merged 10 commits into from
Nov 25, 2024

Conversation

markquintontulloch
Copy link
Member

This fixes all integration tests

Copy link
Contributor

@cmpich cmpich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
I assume the changes in the BulkLoadFileHistory are picked up from a different ticket...

@markquintontulloch
Copy link
Member Author

yes, I merged alpha into the branch I was working on so there's some unrelated changes

@markquintontulloch markquintontulloch merged commit 3eb36d4 into SCRUM-4436 Nov 25, 2024
2 checks passed
@markquintontulloch markquintontulloch deleted the SCRUM-4436_integration_test_fix branch November 25, 2024 21:04
@@ -22,7 +22,8 @@ public class EvidenceAssociationDTOValidator extends BaseDTOValidator {

public <E extends EvidenceAssociation, D extends EvidenceAssociationDTO> ObjectResponse<E> validateEvidenceAssociationDTO(E association, D dto) {
ObjectResponse<E> assocResponse = validateAuditedObjectDTO(association, dto);

association = assocResponse.getEntity();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The association is directly changed in the validateAuditedObjectDTO, so need to pull it off the ObjectResponse.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, sorry - I misread the change and thought this was being removed instead of added

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hang on, this is my PR. So yes, this needed to be added for that reason.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants