honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix expected validation messages

This commit is contained in:
dotasek 2023-12-19 11:47:28 -05:00
parent 7a106a001f
commit 0e50724ae7
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2ValidateTest.java
View File

@ -124,7 +124,6 @@ public class FhirResourceDaoDstu2ValidateTest extends BaseJpaDstu2Test {
Observation input = new Observation(); Observation input = new Observation();
String profileUri = "http://example.com/StructureDefinition/" + methodName; String profileUri = "http://example.com/StructureDefinition/" + methodName;
ResourceMetadataKeyEnum.PROFILES.put(input, Collections.singletonList(new IdDt(profileUri))); ResourceMetadataKeyEnum.PROFILES.put(input, Collections.singletonList(new IdDt(profileUri)));
input.addIdentifier().setSystem("http://acme").setValue("12345"); input.addIdentifier().setSystem("http://acme").setValue("12345");
input.getEncounter().setReference("http://foo.com/Encounter/9"); input.getEncounter().setReference("http://foo.com/Encounter/9");
input.setStatus(ObservationStatusEnum.FINAL); input.setStatus(ObservationStatusEnum.FINAL);
@ -138,7 +137,7 @@ public class FhirResourceDaoDstu2ValidateTest extends BaseJpaDstu2Test {
assertHasErrors(oo); assertHasErrors(oo);
String ooString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo); String ooString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo);
ourLog.info(ooString); ourLog.info(ooString);
assertThat(ooString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it is unknown")); assertThat(ooString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it could not be found"));
} }
@Test @Test

2
hapi-fhir-jpaserver-test-dstu3/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java
View File

@ -329,7 +329,7 @@ public class FhirResourceDaoDstu3ValidateTest extends BaseJpaDstu3Test {
assertHasErrors(oo); assertHasErrors(oo);
String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo); String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo);
ourLog.info(outputString); ourLog.info(outputString);
assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it is unknown")); assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it could not be found"));
} }
@Test @Test

18
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java
View File

@ -135,7 +135,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
ourLog.info(encoded); ourLog.info(encoded);
assertEquals(1, oo.getIssue().size(), encoded); assertEquals(1, oo.getIssue().size(), encoded);
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
containsString("provided (http://cs#code99) is not in the value set")); containsString("provided (http://cs#code99) was not found in the value set"));
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
containsString("Unknown code 'http://cs#code99' for in-memory expansion of ValueSet 'http://vs'")); containsString("Unknown code 'http://cs#code99' for in-memory expansion of ValueSet 'http://vs'"));
assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity(), encoded); assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity(), encoded);
@ -169,7 +169,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
ourLog.info(encoded); ourLog.info(encoded);
assertEquals(1, oo.getIssue().size()); assertEquals(1, oo.getIssue().size());
assertThat(oo.getIssueFirstRep().getDiagnostics(), assertThat(oo.getIssueFirstRep().getDiagnostics(),
containsString("provided (http://cs#code99) is not in the value set")); containsString("provided (http://cs#code99) was not found in the value set"));
assertThat(oo.getIssueFirstRep().getDiagnostics(), assertThat(oo.getIssueFirstRep().getDiagnostics(),
containsString("Unknown code 'http://cs#code99' for in-memory expansion of ValueSet 'http://vs'")); containsString("Unknown code 'http://cs#code99' for in-memory expansion of ValueSet 'http://vs'"));
assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity()); assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity());
@ -209,7 +209,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
containsString("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code99'")); containsString("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code99'"));
assertEquals(OperationOutcome.IssueSeverity.WARNING, oo.getIssue().get(0).getSeverity()); assertEquals(OperationOutcome.IssueSeverity.WARNING, oo.getIssue().get(0).getSeverity());
assertThat(oo.getIssue().get(1).getDiagnostics(), assertThat(oo.getIssue().get(1).getDiagnostics(),
containsString("provided (http://cs#code99) is not in the value set 'ValueSet[http://vs]'")); containsString("provided (http://cs#code99) was not found in the value set 'ValueSet[http://vs]'"));
assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssue().get(1).getSeverity()); assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssue().get(1).getSeverity());
} }
@ -249,7 +249,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
ourLog.info(encoded); ourLog.info(encoded);
assertEquals(1, oo.getIssue().size()); assertEquals(1, oo.getIssue().size());
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
containsString("provided (http://cs#code99) is not in the value set")); containsString("provided (http://cs#code99) was not found in the value set"));
assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity()); assertEquals(OperationOutcome.IssueSeverity.ERROR, oo.getIssueFirstRep().getSeverity());
} }
@ -345,7 +345,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
ourLog.info(encoded); ourLog.info(encoded);
assertEquals(1, oo.getIssue().size()); assertEquals(1, oo.getIssue().size());
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
containsString("provided (http://cs#code1) is not in the value set")); containsString("provided (http://cs#code1) was not found in the value set"));
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
containsString("Failed to expand ValueSet 'http://vs' (in-memory). Could not validate code http://cs#code1")); containsString("Failed to expand ValueSet 'http://vs' (in-memory). Could not validate code http://cs#code1"));
assertThat(oo.getIssue().get(0).getDiagnostics(), assertThat(oo.getIssue().get(0).getDiagnostics(),
@ -519,7 +519,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
String outcomeStr = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome); String outcomeStr = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome);
ourLog.info("Validation outcome: {}", outcomeStr); ourLog.info("Validation outcome: {}", outcomeStr);
assertThat(outcomeStr, assertThat(outcomeStr,
containsString("provided (http://unitsofmeasure.org#cm) is not in the value set")); containsString("provided (http://unitsofmeasure.org#cm) was not found in the value set"));
// Before, the VS wasn't pre-expanded. Try again with it pre-expanded // Before, the VS wasn't pre-expanded. Try again with it pre-expanded
runInTransaction(() -> { runInTransaction(() -> {
@ -548,7 +548,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
outcomeStr = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome); outcomeStr = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome);
ourLog.info("Validation outcome: {}", outcomeStr); ourLog.info("Validation outcome: {}", outcomeStr);
assertThat(outcomeStr, assertThat(outcomeStr,
containsString("provided (http://unitsofmeasure.org#cm) is not in the value set")); containsString("provided (http://unitsofmeasure.org#cm) was not found in the value set"));
} }
@ -1483,7 +1483,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
assertHasErrors(oo); assertHasErrors(oo);
String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo); String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo);
ourLog.info(outputString); ourLog.info(outputString);
assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it is unknown")); assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it could not be found"));
} }
@Test @Test
@ -1516,7 +1516,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
assertHasErrors(oo); assertHasErrors(oo);
String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo); String outputString = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(oo);
ourLog.info(outputString); ourLog.info(outputString);
assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it is unknown")); assertThat(outputString, containsString("Profile reference 'http://example.com/StructureDefinition/testValidateResourceContainingProfileDeclarationInvalid' has not been checked because it could not be found"));
} }
@Test @Test

4
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java
View File

@ -69,7 +69,7 @@ public class RepositoryValidatingInterceptorHttpR4Test extends BaseJpaR4Test {
String operationOutcomeEncoded = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome.getOperationOutcome()); String operationOutcomeEncoded = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome.getOperationOutcome());
ourLog.info("Outcome: {}", operationOutcomeEncoded); ourLog.info("Outcome: {}", operationOutcomeEncoded);
assertThat(operationOutcomeEncoded, containsString("All observations should have a subject")); assertThat(operationOutcomeEncoded, containsString("In general, all observations should have a subject"));
} }
@Test @Test
@ -94,7 +94,7 @@ public class RepositoryValidatingInterceptorHttpR4Test extends BaseJpaR4Test {
String operationOutcomeEncoded = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome.getOperationOutcome()); String operationOutcomeEncoded = myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome.getOperationOutcome());
ourLog.info("Outcome: {}", operationOutcomeEncoded); ourLog.info("Outcome: {}", operationOutcomeEncoded);
assertThat(operationOutcomeEncoded, containsString("All observations should have a subject")); assertThat(operationOutcomeEncoded, containsString("In general, all observations should have a subject"));
} }