Skip to content

Commit 7ea00b5

Browse files
Hdj81Hdj81
committed
GZ-1620 Change test scripts
1 parent 9465272 commit 7ea00b5

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

‎src/Geboortezorg-3-2/Dev/PHR-Client/gbz-fhir3-0-2-izk-phr-2-1.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -422,20 +422,6 @@
422422
<nts:with-parameter name="code" value="77262006"></nts:with-parameter>
423423
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
424424
</nts:include>
425-
</test>
426-
427-
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
428-
<test id="8b-RetrieveObservations">
429-
<name value="8b-RetrieveObservations"/>
430-
<description value="Test Client query operation for Observations"/>
431-
<nts:include value="gbz-operation-search-phr">
432-
<nts:with-parameter name="resource" value="Observation"/>
433-
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
434-
</nts:include>
435-
<nts:include value="assert.response.numResources" scope="common">
436-
<nts:with-parameter name="resource" value="Observation"/>
437-
<nts:with-parameter name="count" value="2"/>
438-
</nts:include>
439425
<!-- alcoholgebruik -->
440426
<nts:include value="gbz-assert-returnCountWithCode">
441427
<nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
@@ -453,6 +439,20 @@
453439
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
454440
</nts:include>
455441
</test>
442+
443+
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
444+
<test id="8b-RetrieveObservations">
445+
<name value="8b-RetrieveObservations"/>
446+
<description value="Test Client query operation for Observations"/>
447+
<nts:include value="gbz-operation-search-phr">
448+
<nts:with-parameter name="resource" value="Observation"/>
449+
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
450+
</nts:include>
451+
<nts:include value="assert.response.numResources" scope="common">
452+
<nts:with-parameter name="resource" value="Observation"/>
453+
<nts:with-parameter name="count" value="0"/>
454+
</nts:include>
455+
</test>
456456

457457
<!-- Alle verrichtingen -->
458458
<test id="9-RetrieveProcedures">

‎src/Geboortezorg-3-2/Dev/PHR-Client/gbz-fhir3-0-2-izk-phr-2-2.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -390,21 +390,6 @@
390390
<nts:with-parameter name="code" value="11977-6"></nts:with-parameter>
391391
<nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
392392
</nts:include>
393-
394-
</test>
395-
396-
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
397-
<test id="8b-RetrieveObservations">
398-
<name value="8b-RetrieveObservations"/>
399-
<description value="Test Client query operation for Observations"/>
400-
<nts:include value="gbz-operation-search-phr">
401-
<nts:with-parameter name="resource" value="Observation"/>
402-
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
403-
</nts:include>
404-
<nts:include value="assert.response.numResources" scope="common">
405-
<nts:with-parameter name="resource" value="Observation"/>
406-
<nts:with-parameter name="count" value="2"/>
407-
</nts:include>
408393
<!-- alcoholgebruik -->
409394
<nts:include value="gbz-assert-returnCountWithCode">
410395
<nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
@@ -422,6 +407,21 @@
422407
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
423408
</nts:include>
424409
</test>
410+
411+
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
412+
<test id="8b-RetrieveObservations">
413+
<name value="8b-RetrieveObservations"/>
414+
<description value="Test Client query operation for Observations"/>
415+
<nts:include value="gbz-operation-search-phr">
416+
<nts:with-parameter name="resource" value="Observation"/>
417+
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
418+
</nts:include>
419+
<nts:include value="assert.response.numResources" scope="common">
420+
<nts:with-parameter name="resource" value="Observation"/>
421+
<nts:with-parameter name="count" value="0"/>
422+
</nts:include>
423+
424+
</test>
425425

426426
<!-- Alle verrichtingen -->
427427
<test id="9-RetrieveProcedures">

‎src/Geboortezorg-3-2/Dev/XIS-Server/gbz-fhir3-0-2-izk-xis-2-1.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -563,21 +563,7 @@
563563
<nts:contentAsserts href="Kraam-Casus1/medmij-gbz-bc-ChildObservation77262006-b7859b34-2291-11ec-8669-020000000000.xml" nts:in-targets="CheckContent">
564564
<nts:discriminator>code.where(coding.where(code = '77262006'))</nts:discriminator>
565565
</nts:contentAsserts>
566-
</test>
567-
568-
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
569-
<test id="8b-ServeObservations">
570-
<name value="8b-ServeObservations"/>
571-
<description value="Test Server query operation for Observations"/>
572-
<nts:include value="medmij/test.xis.successfulSearch" scope="common">
573-
<nts:with-parameter name="resource" value="Observation"/>
574-
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
575-
</nts:include>
576-
<nts:include value="assert.response.numResources" scope="common">
577-
<nts:with-parameter name="resource" value="Observation"/>
578-
<nts:with-parameter name="count" value="2"/>
579-
</nts:include>
580-
<!-- alcoholgebruik -->
566+
<!-- alcoholgebruik -->
581567
<nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
582568
<nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
583569
<nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
@@ -600,6 +586,20 @@
600586
<nts:discriminator>code.where(coding.where(code = '365980008'))</nts:discriminator>
601587
</nts:contentAsserts>
602588
</test>
589+
590+
<!-- Observations - Observaties gekoppeld aan prenatale controle -->
591+
<test id="8b-ServeObservations">
592+
<name value="8b-ServeObservations"/>
593+
<description value="Test Server query operation for Observations"/>
594+
<nts:include value="medmij/test.xis.successfulSearch" scope="common">
595+
<nts:with-parameter name="resource" value="Observation"/>
596+
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
597+
</nts:include>
598+
<nts:include value="assert.response.numResources" scope="common">
599+
<nts:with-parameter name="resource" value="Observation"/>
600+
<nts:with-parameter name="count" value="0"/>
601+
</nts:include>
602+
</test>
603603

604604
<!-- Alle verrichtingen -->
605605
<test id="9-ServeProcedures">

‎src/Geboortezorg-3-2/Dev/XIS-Server/gbz-fhir3-0-2-izk-xis-2-2.xml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,28 @@
378378
<nts:with-parameter name="code" value="11977-6"/>
379379
<nts:with-parameter name="system" value="http://loinc.org"/>
380380
</nts:include>
381+
<!-- alcoholgebruik -->
382+
<nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
383+
<nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
384+
<nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
385+
<nts:with-parameter name="count" value="1"></nts:with-parameter>
386+
<nts:with-parameter name="code" value="228273003"></nts:with-parameter>
387+
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
388+
</nts:include>
389+
<nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-AlcoholUse228273003-48c8a133-ec39-4907-ba76-b1c5eb98bd95.xml" nts:in-targets="CheckContent">
390+
<nts:discriminator>code.where(coding.where(code=228273003))</nts:discriminator>
391+
</nts:contentAsserts>
392+
<!-- tabakgebruik -->
393+
<nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
394+
<nts:with-parameter name="additionalDescription" value="(tobacco use)"></nts:with-parameter>
395+
<nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
396+
<nts:with-parameter name="count" value="1"></nts:with-parameter>
397+
<nts:with-parameter name="code" value="365980008"></nts:with-parameter>
398+
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
399+
</nts:include>
400+
<nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-TobaccoUse365980008-003653d0-140a-45ab-8c14-d5e11be28bf3.xml" nts:in-targets="CheckContent">
401+
<nts:discriminator>code.where(coding.where(code=365980008))</nts:discriminator>
402+
</nts:contentAsserts>
381403
<nts:contentAsserts href="Kraam-Casus2/medmij-gbz-bc-AbilityToTakeCareOfChild129879003-8b35ed8a-8d86-4b2d-ab59-f54d7d73c3d3.xml" nts:in-targets="CheckContent">
382404
<nts:discriminator>code.where(coding.where(code=129879003))</nts:discriminator>
383405
</nts:contentAsserts>
@@ -463,30 +485,8 @@
463485
</nts:include>
464486
<nts:include value="assert.response.numResources" scope="common">
465487
<nts:with-parameter name="resource" value="Observation"/>
466-
<nts:with-parameter name="count" value="2"/>
467-
</nts:include>
468-
<!-- alcoholgebruik -->
469-
<nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
470-
<nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
471-
<nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
472-
<nts:with-parameter name="count" value="1"></nts:with-parameter>
473-
<nts:with-parameter name="code" value="228273003"></nts:with-parameter>
474-
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
475-
</nts:include>
476-
<nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-AlcoholUse228273003-48c8a133-ec39-4907-ba76-b1c5eb98bd95.xml" nts:in-targets="CheckContent">
477-
<nts:discriminator>code.where(coding.where(code=228273003))</nts:discriminator>
478-
</nts:contentAsserts>
479-
<!-- tabakgebruik -->
480-
<nts:include value="gbz-assert-returnCountWithCode" nts:in-targets="#default">
481-
<nts:with-parameter name="additionalDescription" value="(tobacco use)"></nts:with-parameter>
482-
<nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
483-
<nts:with-parameter name="count" value="1"></nts:with-parameter>
484-
<nts:with-parameter name="code" value="365980008"></nts:with-parameter>
485-
<nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
488+
<nts:with-parameter name="count" value="0"/>
486489
</nts:include>
487-
<nts:contentAsserts href="Kraam-Casus2/medmij-gbz-zib-TobaccoUse365980008-003653d0-140a-45ab-8c14-d5e11be28bf3.xml" nts:in-targets="CheckContent">
488-
<nts:discriminator>code.where(coding.where(code=365980008))</nts:discriminator>
489-
</nts:contentAsserts>
490490
</test>
491491

492492
<!-- Alle verrichtingen -->

0 commit comments

Comments
 (0)