MM-2494: Directly generate a UUID in MedMij-Request-ID header (instea…

…d of using a variable as a workaround) in non-NTS maintained files Standards: all non-NTS-maintained Folders: Test/Cert
Nictiz · Nov 24, 2021 · 40aee1a · 40aee1a
1 parent 279133b
commit 40aee1a
Show file tree

Hide file tree

Showing 176 changed files with 730 additions and 1,610 deletions.
diff --git a/...ent/AllergyIntolerance/medmij-allergyintolerance-phr-1-1-retrieve-allergyintolerances.xml b/...ent/AllergyIntolerance/medmij-allergyintolerance-phr-1-1-retrieve-allergyintolerances.xml
@@ -54,11 +54,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-RetrieveAllergyIntolerance">
         <name value="01-RetrieveAllergyIntolerance"/>
         <description value="Test PHR Client retrieve search operation for known AllergyIntolerance resources of XXX-Yong. The expected response code is 200(OK) and content is a searchset Bundle resource where 2 entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -83,7 +78,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...t/AllergyIntolerance/medmij-allergyintolerance-phr-1-2-retrieve-0-allergyintolerances.xml b/...t/AllergyIntolerance/medmij-allergyintolerance-phr-1-2-retrieve-0-allergyintolerances.xml
@@ -44,11 +44,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test PHR Client query search operation for known AllergyIntolerance of XXX-Camp. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 entries are returned."/>
@@ -73,7 +68,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...Intolerance-2-2-0/PHR-Client/AllergyIntolerance20/medmij-allergyintolerance-phr-1-1-1.xml b/...Intolerance-2-2-0/PHR-Client/AllergyIntolerance20/medmij-allergyintolerance-phr-1-1-1.xml
@@ -54,11 +54,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-RetrieveAllergyIntolerance">
         <name value="01-RetrieveAllergyIntolerance"/>
         <description value="Test PHR Client retrieve search operation for known AllergyIntolerance resources of XXX-TEST-D. The expected response code is 200(OK) and content is a searchset Bundle resource with entries of found AllergyIntolerance resources."/>
@@ -83,7 +78,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...gyIntolerance-2-2-0/PHR-Client/AllergyIntolerance20/medmij-allergyintolerance-phr-1-2.xml b/...gyIntolerance-2-2-0/PHR-Client/AllergyIntolerance20/medmij-allergyintolerance-phr-1-2.xml
@@ -44,11 +44,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test PHR Client query search operation for known AllergyIntolerance of XXX-TEST-F. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 entries are returned."/>
@@ -73,7 +68,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-1-retrieve-allergyintolerances.xml b/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-1-retrieve-allergyintolerances.xml
@@ -44,11 +44,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-RetrieveAllergyIntolerance">
         <name value="01-RetrieveAllergyIntolerance"/>
         <description value="Test PHR Client retrieve known AllergyIntolerance resources of XXX-Stalewska. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned."/>
@@ -73,7 +68,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-2-retrieve-allergyintolerances.xml b/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-2-retrieve-allergyintolerances.xml
@@ -44,11 +44,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-RetrieveAllergyIntolerance">
         <name value="01-RetrieveAllergyIntolerance"/>
         <description value="Test PHR Client retrieve known AllergyIntolerance resources of XXX-Smits. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned."/>
@@ -73,7 +68,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-3-retrieve-allergyintolerances.xml b/...AllergyIntoleranceConv/medmij-allergyintolerance-phr-1-3-retrieve-allergyintolerances.xml
@@ -44,11 +44,6 @@
         <expression value="Patient.id"/>
         <sourceId value="patient-token-fixture"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-RetrieveAllergyIntolerance">
         <name value="01-RetrieveAllergyIntolerance"/>
         <description value="Test PHR Client retrieve known AllergyIntolerance resources of XXX-Daalen. The expected response code is 200(OK) and content is a searchset Bundle resource where no entries of AllergyIntolerance resources are returned."/>
@@ -73,7 +68,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...AllergyIntolerance/medmij-allergyintolerance-xis-1-1-serve-2-allergyintolerances-json.xml b/...AllergyIntolerance/medmij-allergyintolerance-xis-1-1-serve-2-allergyintolerances-json.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Yong"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Yong. The expected response code is 200(OK) and content is a searchset Bundle resource where 2 entries of found AllergyIntolerance resources are returned in JSON format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...rver/AllergyIntolerance/medmij-allergyintolerance-xis-1-1-serve-2-allergyintolerances.xml b/...rver/AllergyIntolerance/medmij-allergyintolerance-xis-1-1-serve-2-allergyintolerances.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Yong"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Yong. The expected response code is 200(OK) and content is a searchset Bundle resource where 2 entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...AllergyIntolerance/medmij-allergyintolerance-xis-1-2-serve-0-allergyintolerances-json.xml b/...AllergyIntolerance/medmij-allergyintolerance-xis-1-2-serve-0-allergyintolerances-json.xml
@@ -36,11 +36,6 @@
         <!--<defaultValue value="${patient1-token-id}"/>-->
         <description value="OAuth Token for patient XXX_Camp"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Camp. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 entries are returned in JSON format."/>
@@ -60,7 +55,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...rver/AllergyIntolerance/medmij-allergyintolerance-xis-1-2-serve-0-allergyintolerances.xml b/...rver/AllergyIntolerance/medmij-allergyintolerance-xis-1-2-serve-0-allergyintolerances.xml
@@ -36,11 +36,6 @@
         <!--<defaultValue value="${patient1-token-id}"/>-->
         <description value="OAuth Token for patient XXX_Camp"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Camp. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 entries are returned in XML format."/>
@@ -60,7 +55,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...lergyIntolerance20/medmij-allergyintolerance20-xis-1-1-serve-allergyintolerances-json.xml b/...lergyIntolerance20/medmij-allergyintolerance20-xis-1-1-serve-allergyintolerances-json.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX-TEST-D"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-TEST-D. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in JSON format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...er/AllergyIntolerance20/medmij-allergyintolerance20-xis-1-1-serve-allergyintolerances.xml b/...er/AllergyIntolerance20/medmij-allergyintolerance20-xis-1-1-serve-allergyintolerances.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX-TEST-D"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-TEST-D. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...rgyIntolerance20/medmij-allergyintolerance20-xis-1-2-serve-0-allergyintolerances-json.xml b/...rgyIntolerance20/medmij-allergyintolerance20-xis-1-2-serve-0-allergyintolerances-json.xml
@@ -36,11 +36,6 @@
         <!--<defaultValue value="${patient1-token-id}"/>-->
         <description value="OAuth Token for patient XXX_Camp"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-TEST-F. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 AllergyIntolerances entries are returned in JSON format."/>
@@ -60,7 +55,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/.../AllergyIntolerance20/medmij-allergyintolerance20-xis-1-2-serve-0-allergyintolerances.xml b/.../AllergyIntolerance20/medmij-allergyintolerance20-xis-1-2-serve-0-allergyintolerances.xml
@@ -36,11 +36,6 @@
         <!--<defaultValue value="${patient1-token-id}"/>-->
         <description value="OAuth Token for patient XXX_Camp"/>
     </variable>
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-Serve-0-AllergyIntolerances">
         <name value="01-Serve-0-AllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-TEST-F. The expected response code is 200(OK) and content is a searchset Bundle resource with 0 AllergyIntolerances entries are returned in XML format."/>
@@ -60,7 +55,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...lergyIntoleranceConv/medmij-allergyintolerance-xis-1-1-serve-allergyintolerances-json.xml b/...lergyIntoleranceConv/medmij-allergyintolerance-xis-1-1-serve-allergyintolerances-json.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Stalewska"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Stalewska. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...er/AllergyIntoleranceConv/medmij-allergyintolerance-xis-1-1-serve-allergyintolerances.xml b/...er/AllergyIntoleranceConv/medmij-allergyintolerance-xis-1-1-serve-allergyintolerances.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Stalewska"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Stalewska. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...lergyIntoleranceConv/medmij-allergyintolerance-xis-1-2-serve-allergyintolerances-json.xml b/...lergyIntoleranceConv/medmij-allergyintolerance-xis-1-2-serve-allergyintolerances-json.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Smits"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Smits. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in JSON format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>

diff --git a/...er/AllergyIntoleranceConv/medmij-allergyintolerance-xis-1-2-serve-allergyintolerances.xml b/...er/AllergyIntoleranceConv/medmij-allergyintolerance-xis-1-2-serve-allergyintolerances.xml
@@ -37,11 +37,6 @@
         <description value="OAuth Token for patient XXX_Smits"/>
     </variable>
     <!-- No Setup -->
-    <variable>
-        <name value="MedMij-Request-ID"/>
-        <defaultValue value="${UUID}"/>
-        <description value="MedMij-Request-ID, by default a UUID. Does not have to be edited, see MM-2254 for more information"/>
-    </variable>
     <test id="01-ServeAllergyIntolerances">
         <name value="01-ServeAllergyIntolerances"/>
         <description value="Test XIS Server query search operation for known AllergyIntolerance of XXX-Smits. The expected response code is 200(OK) and content is a searchset Bundle resource where entries of found AllergyIntolerance resources are returned in XML format."/>
@@ -61,7 +56,7 @@
                 </requestHeader>
                 <requestHeader>
                     <field value="MedMij-Request-ID"/>
-                    <value value="${MedMij-Request-ID}"/>
+                    <value value="${UUID}"/>
                 </requestHeader>
             </operation>
         </action>