Remove unneeded discriminator in content asserts

Author: pieter-edelman-nictiz

src/ELZ-0-2-0-beta/Test/Serving-XIS/elz-serving-xis-scenario-1-maximal.xml

@@ -44,8 +44,7 @@
             useToken="true"
             responseId="taskfromserver"/>
 
-        <nts:contentAsserts href="resources/task-hg-VerwijzingHuisartsParamedicusMaximaalbericht.xml" 
-            description="contains .code.coding.code = '3457005'" discriminator="code.where(coding.where(code = '3457005'))" nts:in-targets="CheckContent"/>
+        <nts:contentAsserts href="resources/task-hg-VerwijzingHuisartsParamedicusMaximaalbericht.xml" nts:in-targets="CheckContent"/>
     </test>
 
     <test id="02-serve-ServiceRequest">
@@ -57,8 +56,7 @@
             useToken="true"
             responseId="servicerequestfromserver"/>
 
-        <nts:contentAsserts href="resources/servicerequest-hg-VerwijzingHuisartsParamedicusMaximaalbericht.xml"
-            description="contains .category.coding.code = '1'" discriminator="category.where(coding.where(code = '1'))" nts:in-targets="CheckContent"/>
+        <nts:contentAsserts href="resources/servicerequest-hg-VerwijzingHuisartsParamedicusMaximaalbericht.xml" nts:in-targets="CheckContent"/>
     </test>
 
     <test id="03-serve-Composition">

src/ELZ-0-2-0-beta/Test/Serving-XIS/elz-serving-xis-scenario-2-minimal.xml

@@ -44,8 +44,7 @@
             useToken="true"
             responseId="taskfromserver"/>
 
-        <nts:contentAsserts href="resources/task-hg-VerwijzingHuisartsParamedicusMinimaalbericht.xml"
-            description="contains .code.coding.code = '3457005'" discriminator="code.where(coding.where(code = '3457005'))" nts:in-targets="CheckContent"/>            
+        <nts:contentAsserts href="resources/task-hg-VerwijzingHuisartsParamedicusMinimaalbericht.xml" nts:in-targets="CheckContent"/>            
 
     </test>
 
@@ -58,8 +57,7 @@
             useToken="true"
             responseId="servicerequestfromserver"/>
 
-        <nts:contentAsserts href="resources/servicerequest-hg-VerwijzingHuisartsParamedicusMinimaalbericht.xml"
-            description="contains .category.coding.code = '1'" discriminator="category.where(coding.where(code = '1'))" nts:in-targets="CheckContent"/>
+        <nts:contentAsserts href="resources/servicerequest-hg-VerwijzingHuisartsParamedicusMinimaalbericht.xml" nts:in-targets="CheckContent"/>
 
     </test>
 

src/ELZ-0-2-0-beta/Test/build-ELZ-0-2-0-beta-Test.sh

@@ -1,13 +1,2 @@
-#@setlocal enableextensions
-#@echo off
-JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-#PWD=`dirname $0`
-
-#echo "Removing ..."
-#rm -f "$PWD/_reference/resources/*.xml"
-#SOURCEDIR=`readlink -f "$PWD/../../../../HL7-mappings/ada_2_fhir/bgz_msz/1.2/beschikbaarstellen/fhir_instance/"`
-#echo "Copying from $SOURCEDIR"
-#echo "          to $PWD/_reference/resources/"
-#cp "$SOURCEDIR/*.xml" "$PWD/_reference/resources/"
-
-ant -f $PWD/../../build-single.xml -propertyfile $PWD/build.properties $*
+#!/bin/bash
+ant -f ../../build-single.xml -propertyfile build.properties $*