-
Notifications
You must be signed in to change notification settings - Fork 1
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
SCRUM-4436 integration test fix #1743
Conversation
SCRUM-3953 (update) Fix record counts
SCRUM-4608 Fix counts for disease annotation loads
SCRUM-4607 add sticky header to data loads page
There was a problem hiding this 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...
yes, I merged alpha into the branch I was working on so there's some unrelated changes |
@@ -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(); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
This fixes all integration tests