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

- remove-JSON-round-trip-guard (#2472) 

hapi-fhir-structures-r4/.../RDFParserTest.java included a guard to NOT
report round-trip errors if JSON didn't round-trip due to changed
ordering of contained resources (and entries in Bundles). be50a46
appears to have fixed these issues so the guard is no longer
necessary.
This commit is contained in:
Eric Prud'hommeaux 2021-03-17 10:51:29 +01:00 committed by GitHub
parent bdee1f1269
commit d92a6787c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/RDFParserTest.java
View File

@ -1,3 +1,5 @@
// hapi-fhir/hapi-fhir-structures-r4$ mvn -Dtest=ca.uhn.fhir.parser.RDFParserTest test
package ca.uhn.fhir.parser; package ca.uhn.fhir.parser;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
@ -54,15 +56,6 @@ public class RDFParserTest extends BaseTest {
fhirSchema = GenParser.parseSchema(schemaFile, Collections.emptyList()); fhirSchema = GenParser.parseSchema(schemaFile, Collections.emptyList());
} }
// If we can't round-trip JSON, we skip the Turtle round-trip test.
private static ArrayList<String> jsonRoundTripErrors = new ArrayList<String>();
@AfterAll
static void reportJsonRoundTripErrors() {
System.out.println(jsonRoundTripErrors.size() + " tests disqualified because of JSON round-trip errors");
for (String e : jsonRoundTripErrors)
System.out.println(e);
}
/** /**
* This test method has a method source for each JSON file in the resources/rdf-test-input directory (see #getInputFiles). * This test method has a method source for each JSON file in the resources/rdf-test-input directory (see #getInputFiles).
* Each input file is expected to be a JSON representation of an R4 FHIR resource. * Each input file is expected to be a JSON representation of an R4 FHIR resource.
@ -86,34 +79,20 @@ public class RDFParserTest extends BaseTest {
String turtleString = serializeRdf(ourCtx, referenceResource); String turtleString = serializeRdf(ourCtx, referenceResource);
validateRdf(turtleString, referenceFileName, referenceResource); validateRdf(turtleString, referenceFileName, referenceResource);
// If we can round-trip JSON // Parse RDF content as resource
IBaseResource viaJsonResource = parseJson(new ByteArrayInputStream(referenceJson.getBytes())); IBaseResource viaTurtleResource = parseRdf(ourCtx, new StringReader(turtleString));
if (((Base)viaJsonResource).equalsDeep((Base)referenceResource)) { assertNotNull(viaTurtleResource);
// Parse RDF content as resource // Compare original JSON-based resource against RDF-based resource
IBaseResource viaTurtleResource = parseRdf(ourCtx, new StringReader(turtleString)); String viaTurtleJson = serializeJson(ourCtx, viaTurtleResource);
assertNotNull(viaTurtleResource); if (!((Base)viaTurtleResource).equalsDeep((Base)referenceResource)) {
String failMessage = referenceFileName + ": failed to round-trip Turtle ";
// Compare original JSON-based resource against RDF-based resource if (referenceJson.equals(viaTurtleJson))
String viaTurtleJson = serializeJson(ourCtx, viaTurtleResource); throw new Error(failMessage
if (!((Base)viaTurtleResource).equalsDeep((Base)referenceResource)) { + "\nttl: " + turtleString
String failMessage = referenceFileName + ": failed to round-trip Turtle "; + "\nexp: " + referenceJson);
if (referenceJson.equals(viaTurtleJson)) else
throw new Error(failMessage assertEquals(referenceJson, viaTurtleJson, failMessage + "\nttl: " + turtleString);
+ "\nttl: " + turtleString
+ "\nexp: " + referenceJson);
else
assertEquals(referenceJson, viaTurtleJson, failMessage + "\nttl: " + turtleString);
}
} else {
String gotString = serializeJson(ourCtx, viaJsonResource);
String skipMessage = referenceFileName + ": failed to round-trip JSON" +
(referenceJson.equals(gotString)
? "\ngot: " + gotString + "\nexp: " + referenceJson
: "\nsome inequality not visible in: " + referenceJson);
System.out.println(referenceFileName + " skipped");
// Specific messages are printed at end of run.
jsonRoundTripErrors.add(skipMessage);
} }
} }