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

Add support for $id$ in terminology tests

This commit is contained in:
Grahame Grieve 2024-10-09 23:10:35 +08:00
parent 447400daf9
commit 57926073bc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/CompareUtilities.java
View File

@ -64,6 +64,7 @@ public class CompareUtilities extends BaseTestingUtilities {
case "$$" : return "$$";
case "$instant$": return "\"An Instant\"";
case "$uuid$": return "\"A Uuid\"";
case "$id$": return "\"An Id\"";
default: return "Unhandled template: "+expected;
}
}
@ -465,6 +466,7 @@ public class CompareUtilities extends BaseTestingUtilities {
case "$$" : return true;
case "$instant$": return actualJsonString.matches("([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\\.[0-9]{1,9})?(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))");
case "$uuid$": return actualJsonString.matches("urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
case "$id$": return actualJsonString.matches("[A-Za-z0-9\\-\\.]{1,64}");
default:
throw new Error("Unhandled template: "+expectedJsonString);
}