Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r936 -r1063
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 936)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1063)
@@ -33,6 +33,16 @@
 <Type>%TimeStamp</Type>
 </Property>
 
+<Property name="LopendeTestMethode">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DataExporteerder">
+<Type>Tools.Test.DataExporteerder</Type>
+<Private>1</Private>
+</Property>
+
 <Parameter name="SkipTestCase">
 <Description>
 Indien true wordt de gehele testcase niet uitgevoerd</Description>
@@ -61,11 +71,27 @@
 <Default>1</Default>
 </Parameter>
 
+<Parameter name="GebruikBestandTeller">
+<Type>%Boolean</Type>
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="GebruikFakeDataOverschrijver">
+<Type>%Boolean</Type>
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="VerwijderBestanden">
+<Type>%Boolean</Type>
+<Default>1</Default>
+</Parameter>
+
 <Method name="%OnNew">
 <FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	 Set r%Manager=AManager
+	 set ..DataExporteerder = ##class(Tools.Test.DataExporteerder).%New($this)
 	 Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -592,6 +618,42 @@
 	}
 ]]></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>
 
 
Index: Tools/Test/TestCaseRunner.cls.xml
===================================================================
diff -u -r719 -r1063
--- Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 719)
+++ Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 1063)
@@ -118,6 +118,7 @@
 <FormalSpec>MethodName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+ 	do ..TestCase.ZetLopendeTestMethode(MethodName)
  	#dim Exception As TECH.Exceptions.Exception 
  	set ..Manager.TestCount = ..Manager.TestCount + 1
  	Do ..Manager.LogStateBegin(..ClassName,MethodName)
@@ -148,7 +149,6 @@
  	#dim ValidException As %Boolean = 0
  	#dim Message As %String = ""
  	
- 	
  	if ..TestCase.IsExceptieVerwacht() {
 		set ValidException = ..IsGeldigeExceptie(Exception,.Message)
 	}
Index: Tools/Test/DataExporteerder.cls.xml
===================================================================
diff -u
--- Tools/Test/DataExporteerder.cls.xml	(revision 0)
+++ Tools/Test/DataExporteerder.cls.xml	(revision 1063)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.DataExporteerder">
+<IncludeCode>Tools.UnitTest</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="TestCase">
+<Type>Tools.Test.TestCase</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BestandTeller">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FileWriter">
+<Type>TECH.File.FileWriter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>TestCase:Tools.Test.TestCase</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..TestCase = TestCase
+	set ..FileWriter = ##class(TECH.File.impl.FileWriter).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ResetBestandTeller">
+<Final>1</Final>
+<Implementation><![CDATA[
+	do ##class(TECH.FrequentieTabel).Instance().ResetItems()
+	set ..BestandTeller = 0
+]]></Implementation>
+</Method>
+
+<Method name="ExporteerExceptie">
+<Final>1</Final>
+<FormalSpec>Exceptie:TECH.Exceptions.Exception,BestandNaam:%String="Exceptie.txt",SubLocatie:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(BestandNaam,SubLocatie)
+ 	Do ..FileWriter.Open(BestandVolledigeNaam)
+	do ..FileWriter.WriteLine(Exceptie.GeefExceptionCode())
+	do ..FileWriter.WriteLine(Exceptie.GeefOmschrijving())
+	do ..FileWriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="ExporteerDataTransferObject">
+<Final>1</Final>
+<FormalSpec>Object:%XML.Adaptor,BestandNaam:%String,Subfolder:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	#dim FakeObject As %XML.Adaptor = ..PlaatsFakeData(Object)
+	
+	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(BestandNaam,Subfolder)
+	Do ..FileWriter.Open(BestandVolledigeNaam)
+	do ..FileWriter.WriteXML(FakeObject)
+	do ..FileWriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="ExporteerMultiDim">
+<Final>1</Final>
+<FormalSpec><![CDATA[&MultiDim:%String,BestandNaam:%String,Subfolder:%String=""]]></FormalSpec>
+<Implementation><![CDATA[
+	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(BestandNaam,Subfolder)
+	
+	Do ..FileWriter.Open(BestandVolledigeNaam)
+	do ..FileWriter.WriteLine($$ArrayToText^vhLib("MultDim",.MultiDim))
+	do ..FileWriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="ExporteerObject">
+<Final>1</Final>
+<FormalSpec>Object:%Library.Base,BestandNaam:%String,Subfolder:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	#dim BestandVolledigeNaam As %String = ..BepaalBestandVolledigeNaam(BestandNaam,Subfolder)
+	
+	Do ..FileWriter.Open(BestandVolledigeNaam)
+	set LineIterator = ##class(TECH.ListIterator).%New(##class(Tools.ObjectDumper.Dumper).%New(Object).GetResult())
+	while LineIterator.HasNext() {
+		#dim Line As %String = LineIterator.Next()
+		if ##class(TECH.StringUtils).StartsWith(Line,"SessieSleutel") {
+			set Line = "SessieSleutel = "_$$$DummyString
+		}
+		Do ..FileWriter.WriteLine(Line)
+	}
+	do ..FileWriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="PlaatsFakeData">
+<FormalSpec><![CDATA[&Object:%Library.Base]]></FormalSpec>
+<Private>1</Private>
+<ReturnType>%Library.Base</ReturnType>
+<Implementation><![CDATA[
+	#dim FakeObject As %Library.Base = Object.%ConstructClone()
+	
+	if ..TestCase.GebruiktFakeDataOverschrijver() {
+		
+	#dim arrProperties As %String 
+		do arrProperties^vhLib.Class(FakeObject.%ClassName(1),.arrProperties,"A","A","A","F")
+		set PropertyIterator = ##class(TECH.ArrayOneDimIterator).%New(.arrProperties)
+		while PropertyIterator.HasNext() {
+			#dim PropertyInfo As %List = PropertyIterator.Next()
+			#dim PropertyName As %String = PropertyIterator.Key()
+			#dim PropertyType As %String = $listget(PropertyInfo,1)
+			
+			if (PropertyType = "%Library.Date") do:$length($$ValueInMem^vhLib.Class(FakeObject,PropertyName)) SetValueInMem^vhLib.Class(FakeObject,PropertyName,$$$DummyDate)
+			if (PropertyType = "%Library.Time") do:$length($$ValueInMem^vhLib.Class(FakeObject,PropertyName)) SetValueInMem^vhLib.Class(FakeObject,PropertyName,$$$DummyTime)
+			if (PropertyType = "%Library.TimeStamp") do:$length($$ValueInMem^vhLib.Class(FakeObject,PropertyName)) SetValueInMem^vhLib.Class(FakeObject,PropertyName,$$$DummyTimeStamp)
+		}
+	}
+	
+	quit FakeObject
+]]></Implementation>
+</Method>
+
+<Method name="BepaalBestandVolledigeNaam">
+<FormalSpec>BestandNaam:%String,SubLocatie:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),SubLocatie)
+	set BestandNaam = ..BepaalBestandNaam(BestandNaam)
+	#dim BestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(BestandLocatie,BestandNaam)
+	quit BestandVolledigeNaam
+]]></Implementation>
+</Method>
+
+<Method name="BepaalBestandNaam">
+<Final>1</Final>
+<FormalSpec>BestandNaam:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	if ..TestCase.GebruiktBestandTeller() {
+		#dim Naam As %String = ##class(TECH.StringUtils).StripLastPart(BestandNaam,".")
+		#dim Extentie As %String = ##class(TECH.StringUtils).GetLastPart(BestandNaam,".")
+		set ..BestandTeller = ..BestandTeller + 1
+		set BestandNaam = Naam _ "_"_ ##class(TECH.StringUtils).AlignRight(..BestandTeller,0,3) _ "."_Extentie
+	}
+	quit BestandNaam
+]]></Implementation>
+</Method>
+
+<Method name="GeefBestandLocatie">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..TestCase.GeefBestandLocatie()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>