Skip to content

NIAD-3366: Update test example data to show schema attributes for consent table. #343

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.

Sign up for GitHub

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

Merged
MartinWheelerMT merged 4 commits into from
Jul 22, 2025
Merged

NIAD-3366: Update test example data to show schema attributes for consent table. #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
514ceb9
NAID-3366: Update test data to reflect schema now shown for consent.
MartinWheelerMT Jul 21, 2025
cf4937c
NAID-3366: Update test data to reflect schema now shown for consent.
MartinWheelerMT Jul 21, 2025
66b67e4
NAID-3366: Update test data to reflect schema now shown for consent.
MartinWheelerMT Jul 21, 2025
3099bfa
NAID-3366: Update test data to reflect schema now shown for consent.
MartinWheelerMT Jul 21, 2025
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
2 changes: 1 addition & 1 deletion doc/json/primary-emergency-fhir-result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"id": "387eeaec-029d-4f75-ad04-e5f9792548b9",
"text": {
"status": "generated",
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n <table>\n <tbody>\n <tr>\n <th>Permission to view outcome</th>\n <td>Permission to view obtained</td>\n </tr>\n <tr>\n <th>Date obtained</th>\n <td>01-Jan-2017, 20:00</td>\n </tr>\n <tr>\n <th>Date expires</th>\n <td>15-Jan-2017, 20:00</td>\n </tr>\n </tbody>\n </table>\n </div>"
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n <table xmlns=\"urn:hl7-org:v3\" xmlns:npfitlc=\"NPFIT:HL7:Localisation\">\n <tbody>\n <tr>\n <th>Permission to view outcome</th>\n <td>Permission to view obtained</td>\n </tr>\n <tr>\n <th>Date obtained</th>\n <td>01-Jan-2017, 20:00</td>\n </tr>\n <tr>\n <th>Date expires</th>\n <td>15-Jan-2017, 20:00</td>\n </tr>\n </tbody>\n </table>\n </div>"
},
"identifier": {
"use": "usual",
Expand Down
2 changes: 1 addition & 1 deletion service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.apache.qpid:qpid-jms-client:2.6.1'
implementation 'org.springframework:spring-jms'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:5.7.2'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:8.2.1'
implementation 'uk.nhs.connect.iucds:iucds-schema:3.0.RC1.2'
implementation 'org.apache.xmlbeans:xmlbeans:3.1.0'
implementation 'com.rabbitmq.jms:rabbitmq-jms:3.4.0'
Expand Down
4 changes: 2 additions & 2 deletions ...gration-test/java/uk/nhs/adaptors/oneoneone/cda/report/controller/ReportControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private void postReportValidBody(String itkReportRequestPath, String expectedJso
overwriteJson(expectedJsonPath, messageBody);
assertThat(validator.isValid(messageBody)).isEqualTo(true);
assertThat(jmsMessage.getStringProperty(MESSAGE_ID)).isEqualTo(messageIdValue);
assertMessageContent(messageBody, readResourceAsString(expectedJsonPath));
assertMessageContent(readResourceAsString(expectedJsonPath), messageBody);
}

@SneakyThrows
Expand All @@ -321,7 +321,7 @@ private void overwriteJson(String expectedJsonPath, String messageBody) {
}
}

private void assertMessageContent(String actual, String expected) throws JSONException {
private void assertMessageContent(String expected, String actual) throws JSONException {
LOGGER.info("Validating message content:\n{}", actual);

//when comparing json objects, this will ignore various json paths that contain random values like ids or timestamps
Expand Down
2 changes: 1 addition & 1 deletion service/src/integration-test/resources/json/primary-emergency-fhir-result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"id": "387eeaec-029d-4f75-ad04-e5f9792548b9",
"text": {
"status": "generated",
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n <table>\n <tbody>\n <tr>\n <th>Permission to view outcome</th>\n <td>Permission to view obtained</td>\n </tr>\n <tr>\n <th>Date obtained</th>\n <td>01-Jan-2017, 20:00</td>\n </tr>\n <tr>\n <th>Date expires</th>\n <td>15-Jan-2017, 20:00</td>\n </tr>\n </tbody>\n </table>\n </div>"
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n <table xmlns=\"urn:hl7-org:v3\" xmlns:npfitlc=\"NPFIT:HL7:Localisation\">\n <tbody>\n <tr>\n <th>Permission to view outcome</th>\n <td>Permission to view obtained</td>\n </tr>\n <tr>\n <th>Date obtained</th>\n <td>01-Jan-2017, 20:00</td>\n </tr>\n <tr>\n <th>Date expires</th>\n <td>15-Jan-2017, 20:00</td>\n </tr>\n </tbody>\n </table>\n </div>"
},
"identifier": {
"use": "usual",
Expand Down