Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/FlowWinkelkarConverter/Sender/Test.cls.xml
===================================================================
diff -u -r39595 -r39658
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/FlowWinkelkarConverter/Sender/Test.cls.xml	(.../Test.cls.xml)	(revision 39595)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/FlowWinkelkarConverter/Sender/Test.cls.xml	(.../Test.cls.xml)	(revision 39658)
@@ -3,19 +3,32 @@
 <Class name="vhUnitTest.WSimpl.Vhisie4.Winkelkar.FlowWinkelkarConverter.Sender.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="aTest : Send doet ftp bestand en zet status op Bezig">
+<Method name="Test : Send doet ftp bestand en zet status op Bezig">
 <Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	
 	Set ExportStatusServiceMock = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService).%New()
-	Set FtpApiMock  = ##class(vhTest.Mock.TECH.Ftp.FtpAPI).%New()
+	
+	Set BezigResponse = ##class(WS.Vhisie4.WinkelkarExport.SendResponse).%New()
+	Set BezigResponse.Winkelkar.VanHoeckeId = 666
+	Set BezigResponse.Winkelkar.Status = "Bezig"
+	Do ExportStatusServiceMock.VerwachtMethodCall("Registreer",..Matches.DataTransferObject(BezigResponse)).ExactAantalKeer(1)
+	
+	Set SendResponse = ##class(WS.Vhisie4.WinkelkarExport.SendResponse).%New()
+	Set SendResponse.Winkelkar.VanHoeckeId = 666
+	Set SendResponse.Winkelkar.Status = "Geslaagd"
+	Do ExportStatusServiceMock.VerwachtMethodCall("Registreer",..Matches.DataTransferObject(SendResponse)).ExactAantalKeer(1)
+	
+	Set FtpApiMock = ##class(vhTest.Mock.TECH.Ftp.FtpAPI).%New()
+	Do FtpApiMock.IndienMethodCall("Connecteer",$$$ElkeWaarde).DanDoeNiks()
+	
+	Do FtpApiMock.VerwachtMethodCall("VerzendStream",..Matches.Stream("<Winkelkar><ID>666</ID><KlantID></KlantID></Winkelkar>"),"VH-666-2011-06-30-091500.xml").DanDoeNiks()
+	Do FtpApiMock.VerwachtMethodCall("VerbreekVerbinding").DanDoeNiks()
+	
 	Set Sender = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.FlowWinkelkarConverter.Sender).%New(FtpApiMock,ExportStatusServiceMock)
-	#Dim Winkelkar as WS.Vhisie4.Winkelkar.dto.Winkelkar = ..GeefWinkelkar()
-	#Dim SendResponse as WS.Vhisie4.WinkelkarExport.SendResponse
-
-	//hoe geraak ik aan een sendresponse voor de winkelkar op een correcte manier.
 	
-	Set SendResponse = Sender.Send(Winkelkar)
+	Set SendResponse = Sender.Send(..GeefWinkelkar())
 
-
 	Do FtpApiMock.Verifieer()
 	Do ExportStatusServiceMock.Verifieer()
 ]]></Implementation>
@@ -25,17 +38,11 @@
 <Private>1</Private>
 <ReturnType>WS.Vhisie4.Winkelkar.dto.Winkelkar</ReturnType>
 <Implementation><![CDATA[
-		Set Winkelkar = ##class(WS.Vhisie4.Winkelkar.dto.Winkelkar).%New()
-		Set Winkelkar.Id = 666
-		quit Winkelkar
+	Set Winkelkar = ##class(WS.Vhisie4.Winkelkar.dto.Winkelkar).%New()
+	Set Winkelkar.Id = 666
+	quit Winkelkar
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[	Do ##super(aTestName)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml
===================================================================
diff -u -r39595 -r39658
--- vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39595)
+++ vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39658)
@@ -15,11 +15,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Send",Winkelkar)
 ]]></Implementation>
 </Method>
-
-<Method name="ZetFtpConfiguratie">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetFtpConfiguratie")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml
===================================================================
diff -u -r39595 -r39658
--- vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39595)
+++ vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39658)
@@ -22,8 +22,7 @@
 </Method>
 
 <Method name="ZetFtpConfiguratie">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml
===================================================================
diff -u -r39595 -r39658
--- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39595)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/FlowWinkelkarConverter/Sender.cls.xml	(.../Sender.cls.xml)	(revision 39658)
@@ -9,25 +9,33 @@
 <Private>1</Private>
 </Property>
 
-<Property name="FtpConfiguratie">
-<Type>TECH.Ftp.FtpConfiguratie</Type>
+<Property name="ExportStatusService">
+<Type>WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="ExportStatusService">
-<Type>WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService</Type>
+<Property name="DateTimeApi">
+<Type>TECH.DateTime.DateTimeAPI</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="FormatApi">
+<Type>TECH.Format.FormatAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FtpAPI:TECH.Ftp.FtpAPI="",ExportStatusService:WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService</FormalSpec>
+<FormalSpec>FtpAPI:TECH.Ftp.FtpAPI="",ExportStatusService:WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService,DateTimeApi:TECH.DateTime.DateTimeAPI,FormatApi:TECH.Format.FormatAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FtpAPI = $$$Inject(FtpAPI,##class(TECH.Context).Instance().GeefFtpAPI())
 	Set ..ExportStatusService = $$$Inject(ExportStatusService,##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.ExportStatusService).%New())
+	set ..DateTimeApi = $$$Inject(DateTimeApi,##class(TECH.Context).Instance().GeefDateTimeAPI())
+	set ..FormatApi = $$$Inject(FormatApi,##class(TECH.Context).Instance().GeefFormatAPI())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -37,18 +45,19 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>WS.Vhisie4.WinkelkarExport.SendResponse</ReturnType>
 <Implementation><![CDATA[
-	#Dim Response as WS.Vhisie4.WinkelkarExport.SendResponse = ##class(WS.Vhisie4.WinkelkarExport.SendResponse).%New()
+	Set Response = ##class(WS.Vhisie4.WinkelkarExport.SendResponse).%New()
 	Do ..ExportStatusService.Registreer(..GeefBezigSendResponse(Winkelkar))
 	try {
-		Do ..ZetFtpConfiguratie()
-		Do ..FtpAPI.Connecteer(..FtpConfiguratie)
+		Do ..FtpAPI.Connecteer(##class(TECH.Ftp.FtpConfiguratie).%New("username:passworword@ftp.com"))
 		Do ..FtpAPI.VerzendStream(..GeefXMLStream(Winkelkar),..GeefNaamBestand(Winkelkar) )
 		Do ..FtpAPI.VerbreekVerbinding()
 		Do ..ExportStatusService.Registreer(..GeefVerzondenSendResponse(Winkelkar))		
 	} catch {
 		#Dim Exception as TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		Do ..ExportStatusService.Registreer(..GeefVerzondenGefaaldSendResponse(Winkelkar),Exception.ToString())
+		Do ..ExportStatusService.Registreer(..GeefVerzondenGefaaldSendResponse(Winkelkar,Exception.ToString()))
 	}
+	
+	quit Response
 ]]></Implementation>
 </Method>
 
@@ -57,8 +66,9 @@
 <Private>1</Private>
 <ReturnType>%Stream</ReturnType>
 <Implementation><![CDATA[
-	Set WinkelkarStream = ##class(%GlobalCharacterStream).%New()
-	Quit Winkelkar.XMLExportToStream(.WinkelkarStream)
+	#dim WinkelkarStream As %GlobalCharacterStream
+	do Winkelkar.XMLExportToStream(.WinkelkarStream)
+	quit WinkelkarStream
 ]]></Implementation>
 </Method>
 
@@ -67,11 +77,8 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Context As TECH.Context = ##class(TECH.Context).Instance()
-	#dim HuidigeDatumTijd As TECH.Horolog = Context.GeefDateTimeAPI().CurrentHorolog()
-	#dim NieuwFormaatDatumTijd As %String = Context.GeefFormatAPI().FormatHorolog(HuidigeDatumTijd, "yyyy-mm-dd-hhnnss")
-
-	Quit "VH-"_Winkelkar.Id_"-"_NieuwFormaatDatumTijd_".xml"
+	#dim DatumTijd As %String = ..FormatApi.FormatHorolog(..DateTimeApi.CurrentHorolog(), "yyyy-mm-dd-hhnnss")
+	Quit "VH-"_Winkelkar.Id_"-"_DatumTijd_".xml"
 ]]></Implementation>
 </Method>
 
@@ -119,14 +126,6 @@
 	Quit SendResponse
 ]]></Implementation>
 </Method>
-
-<Method name="ZetFtpConfiguratie">
-<Implementation><![CDATA[
-	#Dim FtpConnectionString as %String
-	Set FtpConnectionString = "username:passworword@ftp.com"
-	Set ..FtpConfiguratie  = ##class(TECH.Ftp.FtpConfiguratie).%New(FtpConnectionString)
-]]></Implementation>
-</Method>
 </Class>