Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
463956b
[NIAD-3217] Add test data
martin-nhs Oct 23, 2024
1fdc9e0
[NIAD-3217] Rename test data filename for clarity
martin-nhs Oct 23, 2024
2b17133
[NIAD-3217] Create initial test skeleton
martin-nhs Oct 24, 2024
80b83cf
Merge branch 'main' into NIAD-3217
martin-nhs Oct 24, 2024
e032788
[NIAD-3217] Basic test implementation, fixed test data
martin-nhs Oct 25, 2024
65d36d0
Minor changes.
Alex-Nita Oct 30, 2024
df9bd62
Adding JSON and XML files for unit tests
stevenmccullaghmadetech Nov 1, 2024
48c16b7
Adding missing specimen
stevenmccullaghmadetech Nov 4, 2024
4da233e
Adding basic test case
stevenmccullaghmadetech Nov 4, 2024
ff830ba
Adjust format of JSON
stevenmccullaghmadetech Nov 4, 2024
3a7c375
Fixed test data
Alex-Nita Nov 4, 2024
553d2e2
Added logic for creating and assigning dummy specimens.
Alex-Nita Nov 5, 2024
7a5be66
Improve test name
stevenmccullaghmadetech Nov 5, 2024
af99965
Added better assertion.
Alex-Nita Nov 5, 2024
5032009
Cleaner
stevenmccullaghmadetech Nov 5, 2024
f5afeb8
Break lines up for readability.
stevenmccullaghmadetech Nov 5, 2024
fd5bf52
Adding conditions for both types of test result, linked and unlinked
stevenmccullaghmadetech Nov 5, 2024
5b51bde
Changed matches to contains
stevenmccullaghmadetech Nov 5, 2024
a08509e
Check the ids of dummy specimens map to the expected observations
stevenmccullaghmadetech Nov 5, 2024
983e4ab
Making code more DRY.
stevenmccullaghmadetech Nov 5, 2024
84dce4a
Refactoring the logic for assigning specimens to observations.
Alex-Nita Nov 5, 2024
79dffa3
Merge branch 'NIAD-3217' of https://github.com/NHSDigital/integration…
Alex-Nita Nov 5, 2024
d511258
Added check for orphaned results before dummy specimens are assigned.
Alex-Nita Nov 5, 2024
cc146ea
Added better marking in tests for mapped specimens.
Alex-Nita Nov 6, 2024
71cdc9f
Fixed test data from ehr extract mapper.
Alex-Nita Nov 6, 2024
b978804
Merge branch 'main' into NIAD-3217
Alex-Nita Nov 6, 2024
57f792f
Fixed checkstyle violations
Alex-Nita Nov 6, 2024
5aeea1e
Fixed checkstyle violations in the test file
Alex-Nita Nov 6, 2024
4370cba
Updating test result XML
stevenmccullaghmadetech Nov 7, 2024
4002ef9
Updating test result XML
stevenmccullaghmadetech Nov 7, 2024
b4abbbc
Merge branch 'NIAD-3217' of https://github.com/NHSDigital/integration…
Alex-Nita Nov 7, 2024
38b9eef
Reverted some unnecessary changes
Alex-Nita Nov 7, 2024
5641eb7
Reverted unnecessary change
Alex-Nita Nov 7, 2024
c2433e3
Reverted unnecessary change
Alex-Nita Nov 7, 2024
05b6209
Reverted unnecessary change
Alex-Nita Nov 7, 2024
545ecab
Scenario: Diagnostic Report with no Specimen or Observation
stevenmccullaghmadetech Nov 7, 2024
dd1a5fc
Updating mapped dummy observations test cases
stevenmccullaghmadetech Nov 7, 2024
fb9d12d
Linking dummy observations to dummy specimen
stevenmccullaghmadetech Nov 7, 2024
663c0a3
Adding injected dummy specimen
stevenmccullaghmadetech Nov 7, 2024
2f29e6c
Adding injected block from scenario where the only changes made are t…
stevenmccullaghmadetech Nov 8, 2024
13c6ea7
Removing superfluous XML, generated by our other changed tests.
stevenmccullaghmadetech Nov 8, 2024
6a270e4
Removed unused import
Alex-Nita Nov 11, 2024
92b9c30
Adjusting indention
stevenmccullaghmadetech Nov 11, 2024
a1163fc
Adjusting indentation
stevenmccullaghmadetech Nov 11, 2024
297b9d7
Adjusting indentation
stevenmccullaghmadetech Nov 11, 2024
5f5d31a
Adjust indentation
stevenmccullaghmadetech Nov 11, 2024
6bf1f21
Adjusting indentation
stevenmccullaghmadetech Nov 11, 2024
f11a18b
Adjusting indentation
stevenmccullaghmadetech Nov 11, 2024
52dda17
Adjusting indentation
stevenmccullaghmadetech Nov 11, 2024
3a16cbf
Adjust indentation
stevenmccullaghmadetech Nov 11, 2024
03eea81
Adjusting whitespace
stevenmccullaghmadetech Nov 11, 2024
d81a55b
Fixing whitespace
stevenmccullaghmadetech Nov 11, 2024
05887ca
Adjust whitespace
stevenmccullaghmadetech Nov 11, 2024
22c05ea
Adjust Whitespace
Alex-Nita Nov 12, 2024
2082116
Adjust Whitespace
Alex-Nita Nov 12, 2024
1ef50df
Adjust Whitespace
Alex-Nita Nov 12, 2024
cccf39c
Adjust Whitespace
Alex-Nita Nov 12, 2024
844cb90
Adjust Whitespace
Alex-Nita Nov 12, 2024
fdc3bd7
Adjust whitespace
Alex-Nita Nov 12, 2024
eb8eb57
Adjust Whitespace
Alex-Nita Nov 12, 2024
1f4bfbe
Adjust Whitespace
Alex-Nita Nov 12, 2024
bfff936
Adjust Whitespace
Alex-Nita Nov 12, 2024
84cc604
Adjust Whitespace
Alex-Nita Nov 12, 2024
e0ffd56
Adjusted Whitespace
Alex-Nita Nov 12, 2024
0518832
Adjusted Whitespace
Alex-Nita Nov 12, 2024
b168f8b
Adjusted Whitespace
Alex-Nita Nov 12, 2024
e589b9b
Adjusted Whitespace
Alex-Nita Nov 12, 2024
b4090a6
Adjusted Whitespace
Alex-Nita Nov 12, 2024
656e384
Adjusted Whitespace
Alex-Nita Nov 12, 2024
5a854f1
Adjusted Whitespace
Alex-Nita Nov 12, 2024
913631b
Adjusted Whitespace
Alex-Nita Nov 12, 2024
ea96588
Merge remote-tracking branch 'origin/main' into NIAD-3217
adrianclay Nov 13, 2024
9b83a08
Remove test file which appears to be duplicate
adrianclay Nov 13, 2024
97d6bd4
Remove unused test file
adrianclay Nov 13, 2024
baf4a8a
Remove unused Observation
adrianclay Nov 13, 2024
58eb397
Remove unused Observation
adrianclay Nov 13, 2024
b7a998d
Replaces references to Observation for one which already exists in bu…
adrianclay Nov 13, 2024
b53d885
Reverted test test files with filing comments associated with specimens
Alex-Nita Nov 13, 2024
f630524
Removed filtering of filing comments from Specimen mapper and added i…
Alex-Nita Nov 13, 2024
99f4f83
Moved filing comment filter to diagnostic report mapper
Alex-Nita Nov 13, 2024
75738f2
Reverted expected-components-1.xml
Alex-Nita Nov 13, 2024
9051dbb
Updated test file
Alex-Nita Nov 13, 2024
69b58ca
Renamed methods.
Alex-Nita Nov 13, 2024
93c2eb9
Renamed Variable
Alex-Nita Nov 13, 2024
b7e60d6
Renamed variable
Alex-Nita Nov 13, 2024
fea624b
Fixed indentation
Alex-Nita Nov 13, 2024
db4bec9
Fixed whitespace
Alex-Nita Nov 13, 2024
efddaef
Removed redundant test.
Alex-Nita Nov 13, 2024
47656e5
Add new lines to make test file clearer
adrianclay Nov 14, 2024
c07f007
Refactoring
Alex-Nita Nov 14, 2024
30ad880
Added changelog entry
Alex-Nita Nov 14, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,11 @@ void When_DiagnosticReport_With_NoReferencedSpecimenAndFilingCommentWithNoCommen
assertThat(actualXml).isEqualToIgnoringWhitespace(expectedXml);
}

@Test
void When_DiagnosticReport_With_SpecimenAndTestResultWithNoSpecimen_Expect_TestResultDataToBePresentWithinObservationStatement() {

}

private Bundle getBundleResourceFromJson(String filename) {
final String filePath = TEST_FILE_DIRECTORY + filename;
return FileParsingUtility.parseResourceFromJsonFile(filePath, Bundle.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"resource": {
"resourceType": "DiagnosticReport",
"id": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC",
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-DiagnosticReport-1"
]
},
"identifier": [
{
"system": "https://wiremock/",
"value": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC"
}
],
"status": "unknown",
"code": {
"coding": [
{
"system": "http://snomed.info/sct",
"code": "721981007",
"display": "Diagnostic studies report"
}
]
},
"subject": {
"reference": "Patient/DAED5527-1985-45D9-993E-C5FF51F36828"
},
"issued": "2001-02-03T09:00:00+00:00",
"specimen": [
{
"reference": "Specimen/NON-SIGNIFICANT-SPECIMEN"
}
],
"result": [
{
"reference": "Observation/TEST-RESULT-NO-SPECIMEN"
}
]
}
}
Loading