Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Content asserts #208

Draft
wants to merge 104 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
64009a7
WIP
jd-nictiz Jul 10, 2023
3d1e263
WIP2
jd-nictiz Jul 10, 2023
e8cd43b
Merge remote-tracking branch 'origin/main' into contentAsserts
jd-nictiz Jul 10, 2023
23ec27c
WIP3
jd-nictiz Jul 10, 2023
ebcae39
Reverse
jd-nictiz Jul 10, 2023
a921093
WIP4
jd-nictiz Jul 11, 2023
9c3f6e7
Get ANT build working
jd-nictiz Jul 11, 2023
7025d23
Refactoring1
jd-nictiz Jul 11, 2023
d9f4df8
Refactoring2
jd-nictiz Jul 11, 2023
613e4fe
Add BackboneElement support
jd-nictiz Jul 11, 2023
ca0ddaa
WIP
jd-nictiz Jul 25, 2023
1ae6c24
Fix build
jd-nictiz Aug 1, 2023
0951f2e
Remove all materials except receive
jd-nictiz Aug 1, 2023
9110b8c
Add sourceId to variable
jd-nictiz Aug 1, 2023
d9a12f6
Fixes
jd-nictiz Aug 4, 2023
f3dcf15
wip
jd-nictiz Aug 8, 2023
6a06fff
Add missing descriptions
jd-nictiz Aug 25, 2023
a5e5097
Add BackboneElement sub-asserts and count resources
jd-nictiz Aug 25, 2023
36c8af7
Add support for extensions
jd-nictiz Aug 25, 2023
b9d69c3
Add extra extension asserts
jd-nictiz Aug 28, 2023
fc56904
Add labels to asserts
jd-nictiz Aug 28, 2023
290f3d2
Attempt at referring to other asserts in descriptions
jd-nictiz Aug 28, 2023
87c3516
Fix extension descriptions
jd-nictiz Aug 28, 2023
cbcbc90
Shorten descriptions
jd-nictiz Aug 29, 2023
b013401
String equality to equivalence
jd-nictiz Aug 29, 2023
1faf498
Expand SelfMeasurement tests
jd-nictiz Aug 31, 2023
3123be9
Improved responseId, add Narrative assert
jd-nictiz Aug 31, 2023
282c8c7
Refactor dataType determination to allow lookback and lookahead to se…
jd-nictiz Aug 31, 2023
91efa4e
Add single dateTime handling and Narrative description
jd-nictiz Sep 1, 2023
2a930bd
Start adding support for Condition, start refactoring for better hand…
jd-nictiz Sep 1, 2023
774728d
Improve SelfMeas Respiration id expressions
jd-nictiz Sep 1, 2023
6d370a5
Refactoring Quantity, Meta, Extension
jd-nictiz Sep 1, 2023
611c072
Fixing simple data type with extension, code-specification warningOnly
jd-nictiz Sep 1, 2023
3e16c4a
Compare between 2 dates
jd-nictiz Sep 1, 2023
6ebee99
Annotation support
jd-nictiz Sep 1, 2023
9064986
Add ofType check for polymorphic elements
jd-nictiz Sep 1, 2023
74aa5ec
Rebuild SelfMeasurements
jd-nictiz Sep 1, 2023
d731602
KT-393 - Move away from using exists(...)
jd-nictiz Sep 1, 2023
0c632c9
Add ofType do dateTime comparison
jd-nictiz Sep 4, 2023
1c63a5b
Split up assert for elements that have @value and children
jd-nictiz Sep 4, 2023
bfb857e
Add missing descriptions, refactor dateTime handling
jd-nictiz Sep 4, 2023
3cc7c51
Refactor and expand descriptions
jd-nictiz Sep 4, 2023
533ee31
Add remaining Conditions to BgZ
jd-nictiz Sep 4, 2023
ad661f6
Additional BgZ Observations. Add support for Period
jd-nictiz Sep 5, 2023
6a89b54
Refactor to make src-input shorter
jd-nictiz Sep 5, 2023
524c462
Add Procedure, Encounter
jd-nictiz Sep 5, 2023
803b21b
Add Period description
jd-nictiz Sep 5, 2023
f159bd5
Better extension handling
jd-nictiz Sep 5, 2023
7706905
Add Immunization plus fixes
jd-nictiz Sep 7, 2023
4943679
Fix quantities in BgZ materials
jd-nictiz Sep 7, 2023
de5ef8d
Add Consent, NutritionOrder, Attachment, fixes
jd-nictiz Sep 8, 2023
bb94719
Improve respiration id asserts
jd-nictiz Sep 8, 2023
61474e4
Add AllergyIntolerance, Device, DeviceUseStatement, Flag. Whitespace …
jd-nictiz Sep 11, 2023
3c05fb0
Slight improvement. Went down a rabbit hole regarding differences bet…
jd-nictiz Sep 11, 2023
939f6f0
First attempt at R4 conversion
jd-nictiz Sep 11, 2023
ec0e46d
KT-393 - Add additional .exists() statments for R4
jd-nictiz Sep 12, 2023
df62d2a
Shorten descriptions
jd-nictiz Sep 12, 2023
27a6ac4
Regression
jd-nictiz Sep 12, 2023
52dbe66
Add all missing ResourceTypes and DataTypes StructureDefinitions for …
jd-nictiz Sep 12, 2023
4c21432
Add checks to Patient. Fixes concerning 'container data types' and ma…
jd-nictiz Sep 12, 2023
7ebee4d
Huge refactoring effort, including regression in max cardinality hand…
jd-nictiz Sep 15, 2023
b3fc17c
Expression fixes
jd-nictiz Sep 16, 2023
08a6456
Extension max cardinality fix
jd-nictiz Sep 26, 2023
f9048ba
Add additional BgZ fixtures
jd-nictiz Sep 26, 2023
08d91e1
SelfMeasurements update WIP
jd-nictiz Sep 26, 2023
f0bad42
Modify the way strings are compared
jd-nictiz Sep 26, 2023
72925ff
Add tmp to gitignore
jd-nictiz Sep 26, 2023
04d9606
Testing refactoring on R4, incl fixes (KT-393)
jd-nictiz Sep 29, 2023
810107a
Add SelfMeasurement improvemenets
jd-nictiz Oct 3, 2023
c5ada53
Revert "Remove all materials except receive"
jd-nictiz Oct 3, 2023
26e2193
Merge remote-tracking branch 'origin/main' into contentAsserts
jd-nictiz Oct 3, 2023
4f7983b
Remove dateTime comparisons for the time being
jd-nictiz Oct 5, 2023
905ad4a
Add Medication and PlannedCare to BgZ-Test
jd-nictiz Oct 5, 2023
f2fc943
Cleanup build files (removed generate build.xml for gitignore to show…
jd-nictiz Oct 6, 2023
4c07815
Edit the script to include Send use cases
jd-nictiz Oct 6, 2023
61923ee
Reverse fixes for KT-393
jd-nictiz Oct 9, 2023
36aa1d0
BgZ description fix
jd-nictiz Oct 16, 2023
9af179b
Add type check to R4 Reference
jd-nictiz Oct 17, 2023
39e8ac1
R4 Immunization XIS Test update
Nov 3, 2023
33419bd
Immunization fixes
Nov 3, 2023
291a6d9
Merge remote-tracking branch 'origin/main' into contentAsserts
Nov 3, 2023
3756011
GZ WIP
Nov 7, 2023
992e8f0
Modifications to ANT
Nov 7, 2023
e9423f3
Add remaining checks to GZ 1.1
Nov 7, 2023
f88c4fc
Work on BgZ MSZ, update build files
Nov 21, 2023
efcf94b
Cleanup
Feb 15, 2024
38ab565
Fix contentAsserts build to correct branch, regenerate all tests that…
Feb 15, 2024
19aa60b
Merge branch 'release-february' into contentAsserts
Feb 20, 2024
a2ab6c0
Merge branch 'BgZ-Msz' into contentAsserts
Feb 20, 2024
f08b562
Set Java 1.8 and run build-single.xml
ahenket Feb 27, 2024
30b20c1
Merge branches 'contentAsserts' and 'contentAsserts' of https://githu…
ahenket Feb 27, 2024
f1b1cae
Reset to original from main
ahenket Mar 4, 2024
8a50a36
Updated with new patient data from BgZ-Msz
ahenket Mar 4, 2024
f77f34f
Reset to main
ahenket Mar 4, 2024
fffc250
Fix token for BgZ MSZ PatB
ahenket Mar 4, 2024
6b44de5
Fixed mismatches
ahenket Mar 4, 2024
064a6e7
Regenerated
ahenket Mar 4, 2024
b0f47c9
Update 1.1 marked scenarios in 1.2 scripts
ahenket Mar 5, 2024
a7a3e45
MSZ-94 Fixed incorrect category parameters
ahenket Mar 19, 2024
8efc97e
MSZ-94 Regenerated
ahenket Mar 19, 2024
97dff26
Merge branch 'main' into contentAsserts
ahenket Mar 22, 2024
eda1142
Adopt changed syntax of nts:contentAsserts
pieter-edelman-nictiz Jun 4, 2024
69558ff
Merge branch 'main' into contentAsserts
pieter-edelman-nictiz Jun 4, 2024
e3140d0
Adapt build files to changed NTS build tooling
pieter-edelman-nictiz Jun 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
lib/
build/
tmp/
.project
*.log
/bin/
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
</meta>
<url value="http://nictiz.nl/fhir/TestScript/bgz-msz-xis-1-2-retrieve-bgz"/>
<version value="stu3-3.0-patchlevel 2024-02"/>
<version value="stu3-3.0-patchlevel 2024-01"/>
<name value="BgZ MSZ - Retrieving XIS - Scenario 1.2 - Retrieve BgZ resources of M van 't Hoen"/>
<status value="active"/>
<publisher value="Nictiz"/>
Expand Down Expand Up @@ -275,7 +275,7 @@
</action>
</test>
<test id="04-retrieve-ContactPerson">
<name value="Scenario 1.2 - ContactPerson"/>
<name value="Scenario 1.1 - ContactPerson"/>
<description value="Query Patient resource (which contains the patient's first contact person) for HCIM ContactPerson"/>
<action>
<operation>
Expand Down Expand Up @@ -1232,7 +1232,7 @@
</action>
</test>
<test id="14b-retrieve-LaboratoryTestResult-last">
<name value="Scenario 1.2 - LaboratoryTestResult (last)"/>
<name value="Scenario 1.1 - LaboratoryTestResult (last)"/>
<description value="Query Observation resource(s) including specimen and related observations for last known chemistry related HCIM LaboratoryTestResult"/>
<action>
<operation>
Expand Down Expand Up @@ -1408,7 +1408,7 @@
</action>
</test>
<test id="16b-retrieve-Contact-hospital-admission">
<name value="Scenario 1.2 - Contact (hospital admission)"/>
<name value="Scenario 1.1 - Contact (hospital admission)"/>
<description value="Query Encounter resource(s) for hospital admission related HCIM Contact"/>
<action>
<operation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</extension>
</extension>
<url value="http://nictiz.nl/fhir/TestScript/bgz-msz-xis-1-2-serve-bgz-json"/>
<version value="stu3-3.0-patchlevel 2024-02"/>
<version value="stu3-3.0-patchlevel 2024-01"/>
<name value="BgZ MSZ - Serving XIS - Scenario 1.2 - Serve BgZ resources of M van 't Hoen - JSON Format"/>
<status value="active"/>
<publisher value="Nictiz"/>
Expand Down Expand Up @@ -4587,7 +4587,7 @@
</action>
</test>
<test id="14b-serve-LaboratoryTestResult-last">
<name value="Scenario 1.2 - LaboratoryTestResult (last)"/>
<name value="Scenario 1.1 - LaboratoryTestResult (last)"/>
<description value="Serve Observation resource(s) including specimen and related observations for last known chemistry related HCIM LaboratoryTestResult"/>
<action>
<operation>
Expand Down Expand Up @@ -5241,7 +5241,7 @@
</action>
</test>
<test id="16b-serve-Contact-hospital-admission">
<name value="Scenario 1.2 - Contact (hospital admission)"/>
<name value="Scenario 1.1 - Contact (hospital admission)"/>
<description value="Serve Encounter resource(s) for hospital admission related HCIM Contact"/>
<action>
<operation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</extension>
</extension>
<url value="http://nictiz.nl/fhir/TestScript/bgz-msz-xis-1-2-serve-bgz-xml"/>
<version value="stu3-3.0-patchlevel 2024-02"/>
<version value="stu3-3.0-patchlevel 2024-01"/>
<name value="BgZ MSZ - Serving XIS - Scenario 1.2 - Serve BgZ resources of M van 't Hoen - XML Format"/>
<status value="active"/>
<publisher value="Nictiz"/>
Expand Down Expand Up @@ -4587,7 +4587,7 @@
</action>
</test>
<test id="14b-serve-LaboratoryTestResult-last">
<name value="Scenario 1.2 - LaboratoryTestResult (last)"/>
<name value="Scenario 1.1 - LaboratoryTestResult (last)"/>
<description value="Serve Observation resource(s) including specimen and related observations for last known chemistry related HCIM LaboratoryTestResult"/>
<action>
<operation>
Expand Down Expand Up @@ -5241,7 +5241,7 @@
</action>
</test>
<test id="16b-serve-Contact-hospital-admission">
<name value="Scenario 1.2 - Contact (hospital admission)"/>
<name value="Scenario 1.1 - Contact (hospital admission)"/>
<description value="Serve Encounter resource(s) for hospital admission related HCIM Contact"/>
<action>
<operation>
Expand Down
Loading
Loading