Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1154 -r1208
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1154)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1208)
@@ -8,8 +8,8 @@
 Test case class. All test cases are derived from here.
 Every test method should start with prefix "Test".</Description>
 <ClassType/>
-<IncludeCode>%outUnitTest,Tools.UnitTest,vhLib.Macro</IncludeCode>
-<IncludeGenerator>%outUnitTest,Tools.UnitTest</IncludeGenerator>
+<IncludeCode>Tools.UnitTest,vhLib.Macro</IncludeCode>
+<IncludeGenerator>Tools.UnitTest</IncludeGenerator>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 
@@ -43,6 +43,10 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Asserter">
+<Type>Tools.Test.Asserter</Type>
+</Property>
+
 <Parameter name="SkipTestCase">
 <Description>
 Indien true wordt de gehele testcase niet uitgevoerd</Description>
@@ -92,6 +96,7 @@
 <Implementation><![CDATA[
 	 Set r%Manager=AManager
 	 set ..DataExporteerder = ##class(Tools.Test.DataExporteerder).%New($this)
+	 set ..Asserter = ##class(Tools.Test.Asserter).%New($this,AManager)
 	 Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -251,93 +256,39 @@
 ]]></Implementation>
 </Method>
 
-<Method name="AssertContainsViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue1_"=="_aValue2_"):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"contains")_"]"
-	 Set success = aValue1[aValue2
-	 Do manager.LogAssert(success,"AssertContains",aMessage)
-	 Quit success
+<Method name="GeefLopendeTestMethode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..LopendeTestMethode
 ]]></Implementation>
 </Method>
 
-<Method name="AssertEqualsViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue1_"=="_aValue2_"):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
-	 Set success = aValue1=aValue2
-	 Do manager.LogAssert(success,"AssertEquals",aMessage)
-	 Quit success
+<Method name="ZetLopendeTestMethode">
+<FormalSpec>TestMethode:%String</FormalSpec>
+<Implementation><![CDATA[	set ..LopendeTestMethode = TestMethode
 ]]></Implementation>
 </Method>
 
-<Method name="AssertNotEqualsViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String</FormalSpec>
+<Method name="GebruiktBestandTeller">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue1_"'="_aValue2_"):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
-	 Set success=aValue1'=aValue2
-	 Do manager.LogAssert(success,"AssertNotEquals",aMessage)
-	 Quit success
+<Implementation><![CDATA[	quit ..#GebruikBestandTeller
 ]]></Implementation>
 </Method>
 
-<Method name="AssertAlmostEqualsViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue1:%String,aValue2:%String,aDifference:%String,aMessage:%String</FormalSpec>
+<Method name="GebruiktFakeDataOverschrijver">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue1_"="_aValue2_" [margin = "_ aDifference _"]):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
-	 Set success=($zabs(aValue1-aValue2))'>(aDifference)
-	 Do manager.LogAssert(success,"AssertAlmostEquals",aMessage)
-	 Quit success
+<Implementation><![CDATA[	quit ..#GebruikFakeDataOverschrijver
 ]]></Implementation>
 </Method>
 
-<Method name="AssertEqualsListViaMacro">
-<FormalSpec>aAutoQuoted:%String,List1:%ListOfDataTypes,List2:%ListOfDataTypes,aMessage:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim success As %Boolean = ( List1.Count() = List2.Count() )
-	Set aMessage=$g(aMessage)_":"
-	if success {
-		set itList1 = ##class(TECH.ListIterator).%New(List1)
-		set itList2 = ##class(TECH.ListIterator).%New(List2)
-		while itList1.HasNext() && success {
-			#dim Value1 As %String = itList1.Next()
-			#dim Value2 As %String = itList2.Next()
-			set success = ( Value1 = Value2)
-			if 'success set aMessage = aMessage _ "Item "_itList1.Key()_" verschillend : *"_Value1 _ "* <> *"_Value2_"*"
-		}
-	}
- 	Set manager=r%Manager
- 	
- 		
- 	if List1.Count() '= List2.Count() {
-	 	set aMessage = aMessage _ "# Items differs "_List1.Count()_"="_List2.Count()
- 	}
- 	Do manager.LogAssert(success,"AssertEqualsList",aMessage)
- 	Quit success
-]]></Implementation>
+<Method name="GeefBestandLocatie">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
 </Method>
 
-<Method name="AssertEqualsListbuildViaMacro">
-<FormalSpec>aAutoQuoted:%String,List1:%List,List2:%List,aMessage:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	quit ..AssertEqualsViaMacro(.aAutoQuoted,$$$LCVT(.List1),$$$LCVT(.List2),.aMessage)
+<Method name="VerwijderBestanden">
+<Final>1</Final>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().Delete(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
@@ -364,181 +315,12 @@
 		if 'success set aMessage = aMessage _ Exception.GeefOmschrijving() _ " = "_ ExceptionMessage _$$$CRLF
 		
 	 }
-	 set aMessage = aMessage _ "["_..ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
+	 set aMessage = aMessage _ "["_..Asserter.ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
 	 Do manager.LogAssert(success,"AssertException",aMessage)
 	 Quit success
 ]]></Implementation>
 </Method>
 
-<Method name="AssertTrueViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue_"=TRUE):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
-	 Set success=''aValue
-	 Do manager.LogAssert(success,"AssertTrue",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
-<Method name="AssertNotTrueViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue_"=FALSE):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
-	 Set success='aValue
-	 Do manager.LogAssert(success,"AssertNotTrue",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
-<Method name="AssertStatusOKViaMacro">
-<FormalSpec>aAutoQuoted:%String,status:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)_"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
-	 Set success=$$$ISOK(status)
-	 If $$$ISERR(status) Do
-	 . Do $system.Status.DecomposeStatus(status,.errorarray,"-d")
-	 . Set aMessage=aMessage_" => "_$g(errorarray(1))
-	 Do manager.LogAssert(success,"AssertStatusOK",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
-<Method name="AssertCorrectGemaakteBestandenViaMacro">
-<FormalSpec>aAutoQuoted:%String,Folder:%String,aMessage:%String=""</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	 #dim manager As Tools.Test.Manager =r%Manager
-	 Set aMessage=aMessage_"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
-	  Set aMessage=aMessage_" "_Folder
-	 #dim success As %Boolean = $$$Not(..ReferentieInhoudVerschillend(Folder))
-	 if 'success {
-		set aMessage = aMessage _ ": inhoud van de bestanden verschillend"
-	 } else {
-		set success = ..ReferentieRecentAangepast(Folder)	 
-		if 'success set aMessage = aMessage _ " : minstens 1 bestand is niet recente aangepast "_##class(TECH.DateTime).CurrentTimeStamp()
-	 }
-	 Do manager.LogAssert(success,"AssertReferentieBestanden",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
-<Method name="AssertObjectViaMacro">
-<FormalSpec>aAutoQuoted:%String,Object:%RegisteredObject,VerwachtObject:%RegisteredObject,aMessage:%String=""</FormalSpec>
-<Implementation><![CDATA[
-    #dim manager As Tools.Test.Manager =r%Manager
-   	#dim success As %Boolean = 1
-	
-	set Verschillen = ##class(%ListOfDataTypes).%New()
-   
-   	set aMessage=$g(aMessage)_":"
-	
-	#dim arrProperties As %String = ""
-	do arrProperties^vhLib.Class(Object.%ClassName(1),.arrProperties,"A","A","A")
-	
-	set itProperties = ##class(TECH.ArrayOneDimIterator).%New(.arrProperties)
-	while itProperties.HasNext() {
-		#dim PropertyInfo As %list = itProperties.Next()
-		#dim Property As %String = itProperties.Key()
-		
-		#dim PropertyIsCollection As %Boolean = $length($list(PropertyInfo,3))
-
-		#dim WaardePropertyObject As %CacheString = $property(Object,Property)
-		#dim WaardePropertyVerwachtObject As %CacheString = $property(VerwachtObject,Property)
-		
-		if PropertyIsCollection {
-			if $method(WaardePropertyObject,"Count") '= $method(WaardePropertyVerwachtObject,"Count") {
-				do Verschillen.Insert(Property_" : "_$method(WaardePropertyObject,"Count") _" <> "_ $method(WaardePropertyVerwachtObject,"Count") )
-			} else {
-				set itList1 = ##class(TECH.ListIterator).%New(WaardePropertyObject)
-				set itList2 = ##class(TECH.ListIterator).%New(WaardePropertyVerwachtObject)
-				while itList1.HasNext() && success {
-					#dim Value1 As %String = itList1.Next()
-					#dim Value2 As %String = itList2.Next()
-					set success = ( Value1 = Value2)
-					if 'success do Verschillen.Insert("Item "_itList1.Key()_" verschillend : *"_Value1 _ "* <> *"_Value2_"*")
-				}
-			}
-		} elseif WaardePropertyObject '= WaardePropertyVerwachtObject {
-			do Verschillen.Insert(Property_" : "_WaardePropertyObject _" <> "_ WaardePropertyVerwachtObject )
-		}
-	}
-	
-	if Verschillen.Count() {
-		set aMessage = aMessage _ ##class(TECH.ListUtils).ListToPieces(Verschillen,$$$CRLF)
-		set success = 0
-	}
-	
-	Do manager.LogAssert(success,"AssertObject",aMessage)
-	
-	Quit success
-]]></Implementation>
-</Method>
-
-<Method name="ReferentieInhoudVerschillend">
-<FormalSpec>Path:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	set svnCommand = ##class(svn.Command).%New($listbuild(Path))
-	set svnCommand.SubCommand="status"
-	set svnCommand.File = Path
-	do svnCommand.Execute()
-	set itResults = ##class(TECH.ListIterator).%New(svnCommand.Results)
-	#dim Result As %Boolean = ( itResults.HasNext() || ( svnCommand.Errors.Count() > 0) )
-	quit Result
-]]></Implementation>
-</Method>
-
-<Method name="ReferentieRecentAangepast">
-<FormalSpec>Path:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim manager As Tools.Test.Manager = r%Manager
-	#dim CurrentTimeStamp As %Timestamp = ##class(TECH.DateTime).CurrentTimeStamp()
-	
-	#dim FileList As list of TECH.FileInfo = ##class(TECH.Files).%New().GetFileList(Path,"*.*")
-	#dim RecentAangepast As %Boolean = ( FileList.Count() > 0)
-	set itFiles = ##class(TECH.ListIterator).%New(FileList)
-	while ( itFiles.HasNext() ) && ( RecentAangepast ) {
-		#dim File As TECH.FileInfo = itFiles.Next()
-		if ..ControleBestandNodigOpRecenteAanpassing(File) {
-			set RecentAangepast = '##class(TECH.Comparator.TimeStampComparator).%New().IsKleinerDan(File.DateModified,..StartTime)
-		}
-	}
-	quit RecentAangepast
-]]></Implementation>
-</Method>
-
-<Method name="ControleBestandNodigOpRecenteAanpassing">
-<FormalSpec>FileInfo:TECH.FileInfo</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit 1
-]]></Implementation>
-</Method>
-
-<Method name="AssertStatusNotOKViaMacro">
-<FormalSpec>aAutoQuoted:%String,status:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	 #dim manager As Tools.Test.Manager = r%Manager
-	 Set aMessage=$g(aMessage)_"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
-	 Set success=$$$ISERR(status)
-	 Do manager.LogAssert(success,"AssertStatusNotOK",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
 <Method name="Fail">
 <FormalSpec>aMessage:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -549,49 +331,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="AssertFilesSameViaMacro">
-<FormalSpec>aAutoQuoted:%String,file1:%String,file2:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage,"'"_file1_"'=='"_file2_"'")
-	 If file1=$tr(file1,"/","\") If file1'["\" Set file1=manager.CurrentDir_"\"_file1
-	 If file2=$tr(file2,"/","\") If file2'["\" Set file2=manager.CurrentDir_"\"_file2
-	 Set success=$$isfilesame^%qccKeyword(file1,file2)
-	 Do manager.LogAssert(success,"AssertFilesSame",aMessage)
-	 Quit success
-]]></Implementation>
-</Method>
-
-<Method name="LogMessage">
-<FormalSpec>message:%String</FormalSpec>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Do manager.LogMessage($g(message))
-	 Quit
-]]></Implementation>
-</Method>
-
-<Method name="ParseAutoQuoted">
-<Description>
-[Previously private]</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>argline:%String,type:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	 s p=0,q=0,ptr=1,piece=0
-	 f i=1:1:$l(argline)+1 q:i>$l(argline)  s c=$e(argline,i) d
-	 . i c="""" s q='q
-	 . i c="("  s p=p+1
-	 . i c=")"  s p=p-1
-	 . i c=",",q=0,p=0 s args($increment(piece))=$e(argline,ptr,i-1),ptr=i+1
-	 s args($increment(piece))=$e(argline,ptr,i-1)
-	 i type="expr"   q $g(args(1))
-	 i type="equals" q $g(args(1))_"=="_$g(args(2))
-	 q ""
-]]></Implementation>
-</Method>
-
 <Method name="SchakelUitEvent">
 <FormalSpec>EventType:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -617,57 +356,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="AssertPatternViaMacro">
-<FormalSpec>aAutoQuoted:%String,aValue1:%String,Pattern:%String,aMessage:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Set aMessage=$g(aMessage)
-	     _":("_aValue1_"?"_Pattern_"):"
-	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
-	 #dim successExecute As %String = "("""_aValue1_"""?"_Pattern_")"
-	 #dim Resultaat As %Boolean = ##class(TECH.Executor).ExecuteFunction(successExecute)
-	 Do manager.LogAssert(Resultaat,"AssertPattern",aMessage)
-	 Quit Resultaat
-]]></Implementation>
-</Method>
-
-<Method name="GeefLopendeTestMethode">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..LopendeTestMethode
-]]></Implementation>
-</Method>
-
-<Method name="ZetLopendeTestMethode">
-<FormalSpec>TestMethode:%String</FormalSpec>
-<Implementation><![CDATA[	set ..LopendeTestMethode = TestMethode
-]]></Implementation>
-</Method>
-
-<Method name="GebruiktBestandTeller">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..#GebruikBestandTeller
-]]></Implementation>
-</Method>
-
-<Method name="GebruiktFakeDataOverschrijver">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..#GebruikFakeDataOverschrijver
-]]></Implementation>
-</Method>
-
-<Method name="GeefBestandLocatie">
-<Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
-</Method>
-
-<Method name="VerwijderBestanden">
-<Final>1</Final>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().Delete(..GeefBestandLocatie())
-]]></Implementation>
-</Method>
 </Class>