From 41417b9355c851761d8f6bdeb94e75c432e2ce7e Mon Sep 17 00:00:00 2001
From: oldrobot <49292718+oldrobotdev@users.noreply.github.com>
Date: Wed, 21 Oct 2026 21:17:13 +0200
Subject: [PATCH] Add FHIRPath cases for a unicode escape in a delimited
 identifier and an invalid unicode escape

---
 r4/fhirpath/tests-fhir-r4.xml   | 2 ++
 r4b/fhirpath/tests-fhir-r4b.xml | 2 ++
 r5/fhirpath/tests-fhir-r5.xml   | 2 ++
 r6/fhirpath/tests-fhir-r6.xml   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/r4/fhirpath/tests-fhir-r4.xml b/r4/fhirpath/tests-fhir-r4.xml
index 0e540555..d4d043a1 100644
--- a/r4/fhirpath/tests-fhir-r4.xml
+++ b/r4/fhirpath/tests-fhir-r4.xml
@@ -96,6 +96,7 @@ Any text enclosed within is ignored
 			<output type="string">Peter</output>
 			<output type="string">James</output>
 		</test>
+		<test name="testEscapedIdentifierUnicode" inputfile="patient-example.xml"><expression>Patient.`\u006eame`.given.first()</expression><output type="string">Peter</output></test>
 		<test name="testSimpleBackTick1" inputfile="patient-example.xml">
 			<expression>`Patient`.name.`given`</expression>
 			<output type="string">Peter</output>
@@ -311,6 +312,7 @@ Any text enclosed within is ignored
 		<test name="testLiteralDateTimeTZEqualTrue" inputfile="patient-example.xml"><expression>@2017-11-05T01:30:00.0-04:00 = @2017-11-05T00:30:00.0-05:00</expression><output type="boolean">true</output></test>
 
 		<test name="testLiteralUnicode" inputfile="patient-example.xml"><expression>Patient.name.given.first() = 'P\u0065ter'</expression><output type="boolean">true</output></test>
+		<test name="testLiteralUnicodeInvalid" inputfile="patient-example.xml"><expression invalid="syntax">'\u+041'</expression></test>
 
 		<test name="testCollectionNotEmpty" inputfile="patient-example.xml"><expression>Patient.name.given.empty().not()</expression><output type="boolean">true</output></test>
 		<test name="testCollectionNotEqualEmpty" inputfile="patient-example.xml"><expression>Patient.name.given != {}</expression></test>
diff --git a/r4b/fhirpath/tests-fhir-r4b.xml b/r4b/fhirpath/tests-fhir-r4b.xml
index 7da3fbce..c5025aaf 100644
--- a/r4b/fhirpath/tests-fhir-r4b.xml
+++ b/r4b/fhirpath/tests-fhir-r4b.xml
@@ -96,6 +96,7 @@ Any text enclosed within is ignored
 			<output type="string">Peter</output>
 			<output type="string">James</output>
 		</test>
+		<test name="testEscapedIdentifierUnicode" inputfile="patient-example.xml"><expression>Patient.`\u006eame`.given.first()</expression><output type="string">Peter</output></test>
 		<test name="testSimpleBackTick1" inputfile="patient-example.xml">
 			<expression>`Patient`.name.`given`</expression>
 			<output type="string">Peter</output>
@@ -311,6 +312,7 @@ Any text enclosed within is ignored
 		<test name="testLiteralDateTimeTZEqualTrue" inputfile="patient-example.xml"><expression>@2017-11-05T01:30:00.0-04:00 = @2017-11-05T00:30:00.0-05:00</expression><output type="boolean">true</output></test>
 
 		<test name="testLiteralUnicode" inputfile="patient-example.xml"><expression>Patient.name.given.first() = 'P\u0065ter'</expression><output type="boolean">true</output></test>
+		<test name="testLiteralUnicodeInvalid" inputfile="patient-example.xml"><expression invalid="syntax">'\u+041'</expression></test>
 
 		<test name="testCollectionNotEmpty" inputfile="patient-example.xml"><expression>Patient.name.given.empty().not()</expression><output type="boolean">true</output></test>
 		<test name="testCollectionNotEqualEmpty" inputfile="patient-example.xml"><expression>Patient.name.given != {}</expression></test>
diff --git a/r5/fhirpath/tests-fhir-r5.xml b/r5/fhirpath/tests-fhir-r5.xml
index 0aede08c..b1901b64 100644
--- a/r5/fhirpath/tests-fhir-r5.xml
+++ b/r5/fhirpath/tests-fhir-r5.xml
@@ -232,6 +232,7 @@ Any text enclosed within is ignored
 			<output type="string">Peter</output>
 			<output type="string">James</output>
 		</test>
+		<test name="testEscapedIdentifierUnicode" testing="paths" inputfile="patient-example.xml"><expression>Patient.`\u006eame`.given.first()</expression><output type="string">Peter</output></test>
 		<test name="testSimpleBackTick1" testing="paths" inputfile="patient-example.xml">
 			<expression>`Patient`.name.`given`</expression>
 			<output type="string">Peter</output>
@@ -448,6 +449,7 @@ Any text enclosed within is ignored
 		<test name="testLiteralDateTimeTZEqualTrue" testing="=" inputfile="patient-example.xml"><expression>@2017-11-05T01:30:00.0-04:00 = @2017-11-05T00:30:00.0-05:00</expression><output type="boolean">true</output></test>
 
 		<test name="testLiteralUnicode" testing="literal" inputfile="patient-example.xml"><expression>Patient.name.given.first() = 'P\u0065ter'</expression><output type="boolean">true</output></test>
+		<test name="testLiteralUnicodeInvalid" testing="literal" inputfile="patient-example.xml"><expression invalid="syntax">'\u+041'</expression></test>
 
 		<test name="testCollectionNotEmpty" testing="not" inputfile="patient-example.xml"><expression>Patient.name.given.empty().not()</expression><output type="boolean">true</output></test>
 		<test name="testCollectionNotEqualEmpty" testing="!=" inputfile="patient-example.xml"><expression>Patient.name.given != {}</expression></test>
diff --git a/r6/fhirpath/tests-fhir-r6.xml b/r6/fhirpath/tests-fhir-r6.xml
index 8b949a67..ea689703 100644
--- a/r6/fhirpath/tests-fhir-r6.xml
+++ b/r6/fhirpath/tests-fhir-r6.xml
@@ -232,6 +232,7 @@ Any text enclosed within is ignored
 			<output type="string">Peter</output>
 			<output type="string">James</output>
 		</test>
+		<test name="testEscapedIdentifierUnicode" testing="paths" inputfile="patient-example.xml"><expression>Patient.`\u006eame`.given.first()</expression><output type="string">Peter</output></test>
 		<test name="testSimpleBackTick1" testing="paths" inputfile="patient-example.xml">
 			<expression>`Patient`.name.`given`</expression>
 			<output type="string">Peter</output>
@@ -448,6 +449,7 @@ Any text enclosed within is ignored
 		<test name="testLiteralDateTimeTZEqualTrue" testing="=" inputfile="patient-example.xml"><expression>@2017-11-05T01:30:00.0-04:00 = @2017-11-05T00:30:00.0-05:00</expression><output type="boolean">true</output></test>
 
 		<test name="testLiteralUnicode" testing="literal" inputfile="patient-example.xml"><expression>Patient.name.given.first() = 'P\u0065ter'</expression><output type="boolean">true</output></test>
+		<test name="testLiteralUnicodeInvalid" testing="literal" inputfile="patient-example.xml"><expression invalid="syntax">'\u+041'</expression></test>
 
 		<test name="testCollectionNotEmpty" testing="not" inputfile="patient-example.xml"><expression>Patient.name.given.empty().not()</expression><output type="boolean">true</output></test>
 		<test name="testCollectionNotEqualEmpty" testing="!=" inputfile="patient-example.xml"><expression>Patient.name.given != {}</expression></test>