Skip to content

Commit 28a6765

Browse files
hvroege-nictizhvroege-nictiz
committed
Merge remote-tracking branch 'origin/main' into MP9-3.0.0-rc.1
2 parents f59bcc2 + e980e3a commit 28a6765

File tree

3,776 files changed

+196905
-144591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,776 files changed

+196905
-144591
lines changed

‎Configuration/QualificationTokens.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,11 +899,25 @@
899899
"qualificationScript": "BgZ voor medisch-specialistische zorg"
900900
},
901901
{
902-
"accessToken": "Bearer a6edff5b-773e-44f8-b5d6-912167d50656",
902+
"accessToken": "Bearer ed6287ff-0ac9-440d-b779-83d17035b61c",
903903
"resourceId": "DE-HERDER",
904904
"familyName": "de Herder",
905905
"bsn": "999901370",
906906
"qualificationScript": "BgZ voor medisch-specialistische zorg"
907+
},
908+
{
909+
"accessToken": "Bearer f1e2ccd9-ad09-4961-aeb3-5222b63b6128",
910+
"resourceId": "AST",
911+
"familyName": "AST",
912+
"bsn": "999906276",
913+
"qualificationScript": "BgZ voor medisch-specialistische zorg"
914+
},
915+
{
916+
"accessToken": "Bearer bf06e5ef-1a89-4035-b9d2-b6a5ea4be92f",
917+
"resourceId": "OLIVIA-MADELIEF-O-M-W--OLIJF-DE-WILSON-ELIK",
918+
"familyName": "Çelik-de Wilson",
919+
"bsn": "999906410",
920+
"qualificationScript": "BgZ voor medisch-specialistische zorg"
907921
},
908922
{
909923
"accessToken": "Bearer b8d781c9-04ca-4cd3-9773-e08efdb419e3",
@@ -1308,5 +1322,11 @@
13081322
"familyName": "XXX_Walsmit",
13091323
"bsn": "999909162",
13101324
"qualificationScript": "MP9 3-beta"
1325+
},
1326+
{
1327+
"accessToken": "Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7",
1328+
"resourceId": "patient-",
1329+
"familyName": "Reebeen",
1330+
"qualificationScript": "NL-PS-GPI-1-0"
13111331
}
13121332
]

‎Configuration/roles.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
roles = PHR-Client, XIS-Server, Sending-System, Receiving-System, Serving-System, Retrieving-System, Retrieving-XIS, Serving-XIS, Retrieving-PHR, Sending-PHR, Receiving-XIS
1+
roles = PHR-Client, XIS-Server, Sending-System, Receiving-System, Serving-System, Retrieving-System, Retrieving-XIS, Serving-XIS, Validation-Retrieving-XIS, Validation-Serving-XIS, Retrieving-PHR, Sending-PHR, Receiving-XIS
22
role.description.PHR-Client = Personal Health Record (PHR/PGO) in MedMij context
33
role.description.XIS-Server = XIS (DVA) in MedMij context
44
role.description.Sending-System = System that sends information to a receiving system
@@ -7,6 +7,8 @@ role.description.Serving-System = Server that can be queried by a client (Retrie
77
role.description.Retrieving-System = Client that queries information from a server (Serving-System)
88
role.description.Serving-XIS = XIS that can be queried by a client
99
role.description.Retrieving-XIS = XIS that queries information from a server
10+
role.description.Validation-Serving-XIS = XIS that can be queried by a client for validation
11+
role.description.Validation-Retrieving-XIS = XIS that queries information from a server for validation
1012
role.description.Retrieving-PHR = PHR that queries information from a server
1113
role.description.Sending-PHR = PHR that sends information to a receiving
1214
role.description.Receiving-XIS = XIS that receives information from a sending system

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Parameters to specify additional information:
8181
* [`goal`] (required if it cannot be inferred from the folder name) - The goal of this set of scripts, either "Test" or "Cert". By convention, these terms are also used for the name of the NTS folder, and in this case the `goal` parameter is inferred from the folder name.
8282
* [`version.addition`] (optional) - A string that will be added verbatim to the value in the `TestScript.version` from the input file. The default is defined in the folder `buildscripts/version.addition.properties`.
8383
* [`packages`] (optional) - Comma separated list with the canonicals of the FHIR packages that should be used when the test engine performs profile validation.
84-
* `package.[canonical].version` (required for each package) - For each package listed using the `packages` property, the version of the package used. This is normally set in the common file `Configuration/package.version.properties`.
84+
* `package.[canonical]` (required for each package) - For each package listed using the `packages` property, the version of the package used. This is normally set in the common file `Configuration/package.version.properties`.
8585
* `target.description.[additional target]` (required for each additional target) - For each defined additional target, a human readable description of the target.
8686
* [`targets.adminOnly`] (optional) - Comma separated list of additional targets (see above) that in the test platform should be marked "admin only", i.e. not for end users.
8787
* [`roles`] (normally not needed) - The folder roles are organized by the role that the user (system under test) plays in the exchange. This setting is used to indicate which roles are recognized. It is required information, but a number of default roles is defined in `Configuration.roles.properties`.
@@ -94,4 +94,4 @@ Parameters to specify additional information:
9494
* `generateContentAssertsForProjects.tool.version` overrides the version for the script that converts a multiple NTS folders.
9595
* `addNarrativesForFolder.tool.version` overrides the version for the narrative generator (this should be the name of a release, not a branch or tag).
9696
* `convertFixtures.tool.version` overrides the version of the tool that converts fixture from XML to JSON.
97-
* `buildCLPropertiesFiles.tool.version` overrides the version of the tool that generates Conformancelab properties files.
97+
* `buildCLPropertiesFiles.tool.version` overrides the version of the tool that generates Conformancelab properties files.

‎buildscripts/BgZ-MSZ-1.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
input.dirs = src/BgZ-MSZ-1-0/Cert, src/BgZ-MSZ-1-2/Cert, src/BgZ-MSZ-1-2/Test, src/BgZ-MSZ-1-2-2/Cert, src/BgZ-MSZ-1-2-2/Test
1+
input.dirs = src/BgZ-MSZ-1-0/Cert, src/BgZ-MSZ-1-2/Cert, src/BgZ-MSZ-1-2/Test, src/BgZ-MSZ-1-2-2/Cert, src/BgZ-MSZ-1-2-2/Test, src/BgZ-MSZ-2-0/Cert,src/BgZ-MSZ-2-0/Test
22
subdirs = FHIR3-0-2-BgZ-MSZ-1-0
33
generate.narratives.pattern = output/STU3/BgZ-MSZ-1-*
44
fhir.version = STU3

‎buildscripts/eOverdracht-4-complete.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@setlocal enabledelayedexpansion
22
@echo off
33

4-
call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/eOverdracht-4-0/Test,src/eOverdracht-4-0/Cert,src/eOverdracht-4-1/Test"
4+
call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/eOverdracht-4-0/Test,src/eOverdracht-4-0/Cert,src/eOverdracht-4-1/Test,src/eOverdracht-HeO/Test"
55

66
pause

‎buildscripts/version.addition.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version.addition =-patchlevel 2025.31
1+
version.addition =-patchlevel 2025.35

‎output/R4/Immunization-2-0/MedMij/Cert/PHR-Client/imm-retrieve-cert-1-1.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
33
<id value="imm-retrieve-cert-1-1"/>
44
<url value="http://nictiz.nl/fhir/TestScript/imm-retrieve-cert-1-1"/>
5-
<version value="r4-1.0.0-patchlevel 2025.31"/>
5+
<version value="r4-1.0.0-patchlevel 2025.35"/>
66
<name value="Immunization - Client - Scenario 1.1 - Retrieve Immunization resources of XXX_Boekwijt"/>
77
<status value="active"/>
88
<publisher value="Nictiz"/>

‎output/R4/Immunization-2-0/MedMij/Cert/PHR-Client/imm-retrieve-cert-1-2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
33
<id value="imm-retrieve-cert-1-2"/>
44
<url value="http://nictiz.nl/fhir/TestScript/imm-retrieve-cert-1-2"/>
5-
<version value="r4-1.0.0-patchlevel 2025.31"/>
5+
<version value="r4-1.0.0-patchlevel 2025.35"/>
66
<name value="Immunization - Client - Scenario 1.2 - Retrieve Immunization resources of 'Brechtje Maria (Brechtje) van XXX_Boeters-der Teeuwen'"/>
77
<status value="active"/>
88
<publisher value="Nictiz"/>

‎output/R4/Immunization-2-0/MedMij/Cert/PHR-Client/properties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
{ "name" : "nictiz.fhir.nl.stu3.nl-core",
1515
"version" : "0.11.0-beta.1" } ],
16-
"serverAlias" : "nictiz" }
16+
"serverAlias" : "nictizmedmij" }

‎output/R4/Immunization-2-0/MedMij/Cert/XIS-Server-CheckContent/imm-serve-cert-1-1-json.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</extension>
1111
</extension>
1212
<url value="http://nictiz.nl/fhir/TestScript/imm-serve-cert-1-1-CheckContent-json"/>
13-
<version value="r4-1.0.0-patchlevel 2025.31"/>
13+
<version value="r4-1.0.0-patchlevel 2025.35"/>
1414
<name value="Immunization - XIS Server - Scenario 1.1 - Serve Immunization resources of XXX_Boekwijt - target CheckContent - JSON Format"/>
1515
<status value="active"/>
1616
<publisher value="Nictiz"/>

0 commit comments

Comments
 (0)