Index: vhUnitTest/APPS/OV/impl/OrderBevestiging/Verstuurder/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/impl/OrderBevestiging/Verstuurder/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/impl/OrderBevestiging/Verstuurder/Test.cls.xml	(revision 31715)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.impl.OrderBevestiging.Verstuurder.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="MailAPI">
+<Type>vhUnitTest.TECH.Mail.impl.MailAPIMock</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FileWriter">
+<Type>vhTest.Fake.TECH.File.FileWriter</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="Ontvanger">
+<Type>%String</Type>
+<Default>UnitTest@vanhoecke.be</Default>
+</Parameter>
+
+<Parameter name="OntvangerCC">
+<Type>%String</Type>
+<Default>UnitTestCC@vanhoecke.be</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+    do ##super(aTestName)
+    
+    Set ..MailAPI = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
+    Set ..FileWriter = ##class(vhTest.Fake.TECH.File.FileWriter).%New()
+    
+    #dim FileAPI As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).MockInstance()
+    
+    do FileAPI.IndienMethodCall("GeefFileWriter").DanReturn(..FileWriter)
+    do FileAPI.IndienMethodCall("GeefDataExporter").DanReturn(##class(TECH.DataExporter.impl.DataExporterCSV).%New())
+    
+    do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.OV.OrderBevestiging.DKG_MailNaar", ..#Ontvanger, ..#Applicatie)
+    do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.OV.OrderBevestiging.DKG_MailNaarCC", ..#OntvangerCC, ..#Applicatie)
+]]></Implementation>
+</Method>
+
+<Method name="TestVerzendBevestigingen">
+<Implementation><![CDATA[
+	#dim Bevestigingen As %ListOfObjects = ..GeefBevestigingen()
+    #dim Verstuurder As APPS.OV.OrderBevestiging.Verstuurder = ##class(APPS.OV.OrderBevestiging.impl.Verstuurder.DKG).%New()
+    
+    Do Verstuurder.VerstuurBevestigingen(Bevestigingen)
+        
+    Do ..AssertMail()    
+    Do ..AssertAttachment()
+]]></Implementation>
+</Method>
+
+<Method name="AssertMail">
+<Private>1</Private>
+<Implementation><![CDATA[
+    If ($$$AssertEquals(..MailAPI.GeefAantalVerzondenMails(), 1)) {
+        #dim Mail As TECH.Mail.Mail = ..MailAPI.GeefVerzondenMails().GetAt(1)
+        
+        Do $$$AssertEquals(Mail.GeefOnderwerp(), "Orderbevestiging VanHoecke")
+        Do $$$AssertEquals(Mail.GeefOntvangers().GetAt(1), ..#Ontvanger)
+        Do $$$AssertEquals(Mail.GeefOntvangersCC().GetAt(1), ..#OntvangerCC)
+        Do $$$AssertEquals(Mail.GeefVerzender(), "nbr@vanhoecke.be")
+        Do $$$AssertEquals(Mail.GeefBijlagen().Count(), 1, "Er is een bijlage toegevoegd van bestand : " _ Mail.GeefBijlagen().GetAt(1))
+    }
+]]></Implementation>
+</Method>
+
+<Method name="AssertAttachment">
+<Private>1</Private>
+<Implementation><![CDATA[
+    Do $$$AssertFalse(..FileWriter.GeefBestandsNaam() = "")
+    
+    #dim Inhoud As %GlobalCharacterStream = ..FileWriter.GeefInhoudBestandNaam(..FileWriter.GeefBestandsNaam())
+    
+    If ($$$AssertFalse(Inhoud.AtEnd)) {
+        Do $$$AssertEquals(Inhoud.ReadLine(), "1ekolomB1;2ekolomB1;3ekolomB1;4ekolomB1;5,55;6ekolomB1;7ekolomB1")   
+    }
+    
+    If ($$$AssertFalse(Inhoud.AtEnd)) {
+        Do $$$AssertEquals(Inhoud.ReadLine(), "1ekolomB2;2ekolomB2;3ekolomB2;4ekolomB2;5,55;6ekolomB2;7ekolomB2")   
+    }
+]]></Implementation>
+</Method>
+
+<Method name="GeefBevestigingen">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<ReturnTypeParams>ELEMENTTYPE="APPS.OV.OrderBevestiging.dto.OrderBevestiging"</ReturnTypeParams>
+<Implementation><![CDATA[
+    #dim Bevestigingen As %ListOfObjects = ##class(%ListOfObjects).%New()
+    
+    Do Bevestigingen.Insert(..GeefBevestiging("B1"))
+    Do Bevestigingen.Insert(..GeefBevestiging("B2"))
+    
+    Quit Bevestigingen
+]]></Implementation>
+</Method>
+
+<Method name="GeefBevestiging">
+<FormalSpec>BevestigingID:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.OV.OrderBevestiging.data.Order</ReturnType>
+<Implementation><![CDATA[
+    #dim Bevestiging As APPS.OV.OrderBevestiging.dto.OrderBevestiging = ##class(APPS.OV.OrderBevestiging.dto.OrderBevestiging).%New()
+    
+    Set Bevestiging.LeverancierNr = "1ekolom" _ BevestigingID
+    Set Bevestiging.OrderID = "2ekolom" _ BevestigingID
+    Set Bevestiging.PositieNrOrder = "3ekolom" _ BevestigingID
+    Set Bevestiging.BevestigingNrLeverancier = "4ekolom" _ BevestigingID
+    Set Bevestiging.PrijsPerStuk = 5.55
+    Set Bevestiging.Leverweek = "6ekolom" _ BevestigingID
+    Set Bevestiging.AantalStuks = "7ekolom" _ BevestigingID
+    
+    Quit ##class(APPS.OV.OrderBevestiging.data.Order).%New("KlantID", "OrderID", Bevestiging)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/TestBase.cls.xml	(revision 31715)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.WachtrijAfhandelaar.TestBase">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KlantID">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderID">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WachtrijAfhandelaar">
+<Type>vhTest.Spy.APPS.OV.OrderBevestiging.WachtrijAfhandelaar</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderAPIMock">
+<Type>vhTest.Mock.DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..KlantID = "KlantID"
+	Set ..OrderID = "OrderID"
+	Set ..OrderAPIMock = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	Set ..WachtrijAfhandelaar = ##class(vhTest.Spy.APPS.OV.OrderBevestiging.WachtrijAfhandelaar).%New()
+
+	Do ..VerwijderTestData()
+	Do ..MaakTestData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Do ..VerwijderTestData()
+]]></Implementation>
+</Method>
+
+<Method name="GeefBewaardeBevestigingenResultSet">
+<Private>1</Private>
+<ReturnType>TECH.ResultSet</ReturnType>
+<Implementation><![CDATA[
+	#dim Query As TECH.String = "SELECT ID FROM APPS_OV_OrderBevestiging_data.Order WHERE KlantID = ?"
+	#dim Params As %List = $ListBuild(..KlantID)	
+	
+	Quit ##class(TECH.Context).Instance().GeefQueryAPI().GetDynamicResultSet(Query, Params)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderTestData">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BewaardeBevestigingenResultSet As TECH.ResultSet = ..GeefBewaardeBevestigingenResultSet()
+	
+	While (BewaardeBevestigingenResultSet.Next()) {
+		Do ##class(APPS.OV.OrderBevestiging.data.Order).DeleteId(BewaardeBevestigingenResultSet.GetDataByName("ID"))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MaakTestData">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	#dim LeverDatum As %Date = ##class(%Date).DisplayToLogical("01/11/2015")
+	
+	Do OrderMock.IndienMethodCall("IsDirectOrder").DanReturn($$$False)
+	Do OrderMock.IndienMethodCall("GeefStatus").DanReturn(##class(DOM.VKP.enu.OrderStatus).Gesloten())
+	Do OrderMock.IndienMethodCall("GeefProductOrderLijnIterator").DanReturn(..GeefProductOrderLijnIterator())
+	Do OrderMock.IndienMethodCall("GeefDocumentReferenties").DanReturn(..GeefDocumentReferenties())
+	Do OrderMock.IndienMethodCall("GeefID").DanReturn(..OrderID)
+	Do OrderMock.IndienMethodCall("GeefVroegsteLeverdatum").DanReturn(LeverDatum)
+	Do OrderMock.IndienMethodCall("GeefKlantID").DanReturn(..KlantID)
+	
+	Do ..OrderAPIMock.IndienMethodCall("GeefOrder", ..OrderID).DanReturn(OrderMock)
+	
+	Do ..WachtrijAfhandelaar.BewaarBevestigingen(..OrderID)
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductOrderLijnIterator">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductOrderLijnen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	
+	Do ProductOrderLijnen.Insert(..GeefProductOrderLijnMock("ProjectReferentie 1", 11.11, 1))
+	Do ProductOrderLijnen.Insert(..GeefProductOrderLijnMock("ProjectReferentie 2", 22.22, 2))
+	
+	Quit ##class(TECH.ListIterator).%New(ProductOrderLijnen)
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductOrderLijnMock">
+<FormalSpec>ProjectReferentie:TECH.String,EenheidPrijsExclBTW:%Decimal,Aantal:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.VKP.ProductOrderlijn</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductOrderLijnMock As vhTest.Mock.DOM.VKP.ProductOrderlijn = ##class(vhTest.Mock.DOM.VKP.ProductOrderlijn).%New()
+	
+	Do ProductOrderLijnMock.IndienMethodCall("GeefProjectReferentie").DanReturn(ProjectReferentie)
+	Do ProductOrderLijnMock.IndienMethodCall("GeefEenheidPrijsExclBTW").DanReturn(EenheidPrijsExclBTW)
+	Do ProductOrderLijnMock.IndienMethodCall("GeefAantal").DanReturn(Aantal)
+	
+	Quit ProductOrderLijnMock
+]]></Implementation>
+</Method>
+
+<Method name="GeefDocumentReferenties">
+<Private>1</Private>
+<ReturnType>DOM.VKP.DocumentReferenties</ReturnType>
+<Implementation><![CDATA[
+	#dim DocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
+	
+	Set DocumentReferenties.OrderReferentie = "OrderReferentieZonderDatum"
+	
+	Quit DocumentReferenties
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijService/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingWachtrijService/Test.cls.xml	(revision 31715)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.OrderBevestigingWachtrijService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="WachtrijAfhandelaarMock">
+<Type>vhTest.Mock.APPS.OV.OrderBevestiging.WachtrijAfhandelaar</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Service">
+<Type>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..WachtrijAfhandelaarMock = ##class(vhTest.Mock.APPS.OV.OrderBevestiging.WachtrijAfhandelaar).%New()
+	Set ..Service = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijService).%New(..WachtrijAfhandelaarMock)
+]]></Implementation>
+</Method>
+
+<Method name="Test: BewaarBevestigingen in WachtrijAfhandelaar wordt opgeroepen bij plaatsen in wachtrij">
+<Implementation><![CDATA[
+	#dim OrderID As TECH.String = "OrderID"
+	
+	Do ..WachtrijAfhandelaarMock.VerwachtMethodCall("BewaarBevestigingen", OrderID)
+	Do ..Service.PlaatsInWachtRij(OrderID)
+	Do ..WachtrijAfhandelaarMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: VerstuurBevestigingen in WachtrijAfhandelaar wordt opgeroepen bij versturen van bevestigingen">
+<Implementation><![CDATA[
+	Do ..WachtrijAfhandelaarMock.VerwachtMethodCall("VerstuurBevestigingen")
+	Do ..Service.VerstuurBevestigingen()
+	Do ..WachtrijAfhandelaarMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/BewaarBevestigingen/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/BewaarBevestigingen/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/BewaarBevestigingen/Test.cls.xml	(revision 31715)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.WachtrijAfhandelaar.BewaarBevestigingen.Test">
+<Super>vhUnitTest.APPS.OV.OrderBevestiging.WachtrijAfhandelaar.TestBase</Super>
+
+<Method name="Test: Exceptie wordt opgevangen, gemaild en gelogd bij ongeldig OrderID">
+<Implementation><![CDATA[
+	Do ..OrderAPIMock.IndienMethodCall("GeefOrder", ..OrderID).DanException(##class(TECH.Exceptions.InvalidInputException).%New(""))
+		
+	Do ..AssertLogEnMailExceptieOpgeroepen($$$True)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt opgevangen, gemaild en gelogd bij ongeldig order met status open">
+<Implementation><![CDATA[
+	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	
+	Do OrderMock.IndienMethodCall("IsDirectOrder").DanReturn($$$False)
+	Do OrderMock.IndienMethodCall("GeefID").DanReturn(..OrderID)
+	Do OrderMock.IndienMethodCall("GeefStatus").DanReturn(##class(DOM.VKP.enu.OrderStatus).Open())
+
+	Do ..OrderAPIMock.IndienMethodCall("GeefOrder", ..OrderID).DanReturn(OrderMock)
+	Do ..AssertLogEnMailExceptieOpgeroepen($$$True)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt opgevangen, gemaild en gelogd bij ongeldig DirectOrder">
+<Implementation><![CDATA[
+	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+
+	Do ToeleveringMock.IndienMethodCall("GeefBestelBevestigingNr").DanReturn("")
+	
+	Do OrderMock.IndienMethodCall("IsDirectOrder").DanReturn($$$True)
+	Do OrderMock.IndienMethodCall("GeefEersteToelevering").DanReturn(ToeleveringMock)
+	Do OrderMock.IndienMethodCall("GeefID").DanReturn(..OrderID)
+	
+	Do ..OrderAPIMock.IndienMethodCall("GeefOrder", ..OrderID).DanReturn(OrderMock)
+	Do ..AssertLogEnMailExceptieOpgeroepen($$$True)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bewaar bevestiging voor geldig order">
+<Implementation><![CDATA[
+	#dim BewaardeBevestigingenResultSet As TECH.ResultSet = ..GeefBewaardeBevestigingenResultSet()
+	#dim BewaardeBevestigingen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#dim VerwachtAantalBewaardeBevestigingen As %Integer = 2
+	#dim VerwachteBevestigingStatus As APPS.OV.OrderBevestiging.enu.BevestigingStatus = ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).NogTeBevestigen()
+	
+	While (BewaardeBevestigingenResultSet.Next()) {
+		#dim ID As TECH.String = BewaardeBevestigingenResultSet.GetDataByName("ID")
+		#dim OrderBevestigingData As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(ID)
+		
+		Do $$$AssertEquals(OrderBevestigingData.OrderID, ..OrderID)
+		Do $$$AssertEquals(OrderBevestigingData.KlantID, ..KlantID)
+		Do $$$AssertEquals(OrderBevestigingData.BevestigingStatus, VerwachteBevestigingStatus)
+		
+		Do BewaardeBevestigingen.Insert(OrderBevestigingData)
+	}
+	
+	Do $$$AssertEquals(BewaardeBevestigingen.Count(), VerwachtAantalBewaardeBevestigingen)
+	Do ..AssertLogEnMailExceptieOpgeroepen($$$False)
+	Do ..AssertOrderBevestigingen()
+]]></Implementation>
+</Method>
+
+<Method name="AssertLogEnMailExceptieOpgeroepen">
+<FormalSpec>VerwachteWaarde:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..WachtrijAfhandelaar.BewaarBevestigingen(..OrderID)
+	
+	Do $$$AssertEquals(VerwachteWaarde, ..WachtrijAfhandelaar.IsLogEnMailExceptieOpgeroepen)
+]]></Implementation>
+</Method>
+
+<Method name="AssertOrderBevestigingen">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim OrderBevestiging1 As APPS.OV.OrderBevestiging.dto.OrderBevestiging = ..WachtrijAfhandelaar.OrderBevestigingen.GetAt(1)
+	#dim OrderBevestiging2 As APPS.OV.OrderBevestiging.dto.OrderBevestiging = ..WachtrijAfhandelaar.OrderBevestigingen.GetAt(2)
+	
+	Do ..AssertOrderBevestiging(OrderBevestiging1, "ProjectReferentie 1", 11.11, 1)
+	Do ..AssertOrderBevestiging(OrderBevestiging2, "ProjectReferentie 2", 22.22, 2)
+]]></Implementation>
+</Method>
+
+<Method name="AssertOrderBevestiging">
+<FormalSpec>OrderBevestiging:APPS.OV.OrderBevestiging.dto.OrderBevestiging,PositieNrOrder:TECH.String,PrijsPerStuk:%Decimal,AantalStuks:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do $$$AssertEquals(OrderBevestiging.LeverancierNr, "1040803")
+	Do $$$AssertEquals(OrderBevestiging.OrderID, "OrderReferentieZonderDatum")
+	Do $$$AssertEquals(OrderBevestiging.PositieNrOrder, PositieNrOrder)
+	Do $$$AssertEquals(OrderBevestiging.BevestigingNrLeverancier, "OrderID")
+	Do $$$AssertEquals(OrderBevestiging.PrijsPerStuk, PrijsPerStuk)
+	Do $$$AssertEquals(OrderBevestiging.AantalStuks, AantalStuks)
+	Do $$$AssertEquals(OrderBevestiging.Leverweek, "02.2015")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/Verstuurder/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/Verstuurder/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/Verstuurder/Test.cls.xml	(revision 31715)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.Verstuurder.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="MailAPI">
+<Type>vhUnitTest.TECH.Mail.impl.MailAPIMock</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FileWriter">
+<Type>vhTest.Fake.TECH.File.FileWriter</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="Ontvanger">
+<Type>%String</Type>
+<Default>UnitTest@vanhoecke.be</Default>
+</Parameter>
+
+<Parameter name="OntvangerCC">
+<Type>%String</Type>
+<Default>UnitTestCC@vanhoecke.be</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+    do ##super(aTestName)
+    
+    Set ..MailAPI = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
+    Set ..FileWriter = ##class(vhTest.Fake.TECH.File.FileWriter).%New()
+    
+    #dim FileAPI As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).MockInstance()
+    
+    do FileAPI.IndienMethodCall("GeefFileWriter").DanReturn(..FileWriter)
+    do FileAPI.IndienMethodCall("GeefDataExporter").DanReturn(##class(TECH.DataExporter.impl.DataExporterCSV).%New())
+    
+    do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.OV.OrderBevestiging.DKG_MailNaar", ..#Ontvanger, ..#Applicatie)
+    do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.OV.OrderBevestiging.DKG_MailNaarCC", ..#OntvangerCC, ..#Applicatie)
+]]></Implementation>
+</Method>
+
+<Method name="TestVerzendBevestigingen">
+<Implementation><![CDATA[
+	#dim Bevestigingen As %ListOfObjects = ..GeefBevestigingen()
+    #dim Verstuurder As APPS.OV.OrderBevestiging.Verstuurder = ##class(APPS.OV.OrderBevestiging.impl.Verstuurder.DKG).%New()
+    
+    Do Verstuurder.VerstuurBevestigingen(Bevestigingen)
+        
+    Do ..AssertMail()    
+    Do ..AssertAttachment()
+]]></Implementation>
+</Method>
+
+<Method name="AssertMail">
+<Private>1</Private>
+<Implementation><![CDATA[
+    If ($$$AssertEquals(..MailAPI.GeefAantalVerzondenMails(), 1)) {
+        #dim Mail As TECH.Mail.Mail = ..MailAPI.GeefVerzondenMails().GetAt(1)
+        
+        Do $$$AssertEquals(Mail.GeefOnderwerp(), "Orderbevestiging VanHoecke")
+        Do $$$AssertEquals(Mail.GeefOntvangers().GetAt(1), ..#Ontvanger)
+        Do $$$AssertEquals(Mail.GeefOntvangersCC().GetAt(1), ..#OntvangerCC)
+        Do $$$AssertEquals(Mail.GeefVerzender(), "nbr@vanhoecke.be")
+        Do $$$AssertEquals(Mail.GeefBijlagen().Count(), 1, "Er is een bijlage toegevoegd van bestand : " _ Mail.GeefBijlagen().GetAt(1))
+    }
+]]></Implementation>
+</Method>
+
+<Method name="AssertAttachment">
+<Private>1</Private>
+<Implementation><![CDATA[
+    Do $$$AssertFalse(..FileWriter.GeefBestandsNaam() = "")
+    
+    #dim Inhoud As %GlobalCharacterStream = ..FileWriter.GeefInhoudBestandNaam(..FileWriter.GeefBestandsNaam())
+    
+    If ($$$AssertFalse(Inhoud.AtEnd)) {
+        Do $$$AssertEquals(Inhoud.ReadLine(), "1ekolomB1;2ekolomB1;3ekolomB1;4ekolomB1;5,55;6ekolomB1;7ekolomB1")   
+    }
+    
+    If ($$$AssertFalse(Inhoud.AtEnd)) {
+        Do $$$AssertEquals(Inhoud.ReadLine(), "1ekolomB2;2ekolomB2;3ekolomB2;4ekolomB2;5,55;6ekolomB2;7ekolomB2")   
+    }
+]]></Implementation>
+</Method>
+
+<Method name="GeefBevestigingen">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<ReturnTypeParams>ELEMENTTYPE="APPS.OV.OrderBevestiging.dto.OrderBevestiging"</ReturnTypeParams>
+<Implementation><![CDATA[
+    #dim Bevestigingen As %ListOfObjects = ##class(%ListOfObjects).%New()
+    
+    Do Bevestigingen.Insert(..GeefBevestiging("B1"))
+    Do Bevestigingen.Insert(..GeefBevestiging("B2"))
+    
+    Quit Bevestigingen
+]]></Implementation>
+</Method>
+
+<Method name="GeefBevestiging">
+<FormalSpec>BevestigingID:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.OV.OrderBevestiging.data.Order</ReturnType>
+<Implementation><![CDATA[
+    #dim Bevestiging As APPS.OV.OrderBevestiging.dto.OrderBevestiging = ##class(APPS.OV.OrderBevestiging.dto.OrderBevestiging).%New()
+    
+    Set Bevestiging.LeverancierNr = "1ekolom" _ BevestigingID
+    Set Bevestiging.OrderID = "2ekolom" _ BevestigingID
+    Set Bevestiging.PositieNrOrder = "3ekolom" _ BevestigingID
+    Set Bevestiging.BevestigingNrLeverancier = "4ekolom" _ BevestigingID
+    Set Bevestiging.PrijsPerStuk = 5.55
+    Set Bevestiging.Leverweek = "6ekolom" _ BevestigingID
+    Set Bevestiging.AantalStuks = "7ekolom" _ BevestigingID
+    
+    Quit ##class(APPS.OV.OrderBevestiging.data.Order).%New("KlantID", "OrderID", Bevestiging)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/VerstuurBevestigingen/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/VerstuurBevestigingen/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/WachtrijAfhandelaar/VerstuurBevestigingen/Test.cls.xml	(revision 31715)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.WachtrijAfhandelaar.VerstuurBevestigingen.Test">
+<Super>vhUnitTest.APPS.OV.OrderBevestiging.WachtrijAfhandelaar.TestBase</Super>
+
+<Property name="VerstuurderMock">
+<Type>vhTest.Mock.APPS.OV.OrderBevestiging.Verstuurder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..VerstuurderMock = ##class(vhTest.Mock.APPS.OV.OrderBevestiging.Verstuurder).%New()
+	Set ..WachtrijAfhandelaar = ##class(vhTest.Spy.APPS.OV.OrderBevestiging.WachtrijAfhandelaar).%New(..VerstuurderMock)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Verstuurder.VerstuurBevestigingen wordt opgeroepen">
+<Implementation><![CDATA[
+	Do ..VerstuurderMock.VerwachtMethodCall("VerstuurBevestigingen", $$$ElkeWaarde)
+	Do ..WachtrijAfhandelaar.VerstuurBevestigingen()
+	Do ..VerstuurderMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Verstuurder.VerstuurBevestigingen wordt niet opgeroepen indien geen orderbevestigingen">
+<Implementation><![CDATA[
+	Do ..VerwijderTestData()
+	
+	#dim AantalKeerOpgeroepen As %Integer = ..VerstuurderMock.IndienMethodCall("VerstuurBevestigingen", $$$ElkeWaarde).GeefAantalKeerOpgeroepen()
+	
+	Do $$$AssertEquals(AantalKeerOpgeroepen, 0)
+]]></Implementation>
+</Method>
+
+<Method name="Test: BevestigingStatus wordt op &apos;Bevestigd&apos; gezet na versturen van bevestigingen">
+<Implementation><![CDATA[
+	Do ..VerstuurderMock.IndienMethodCall("VerstuurBevestigingen", $$$ElkeWaarde).DanDoeNiks()
+	Do ..WachtrijAfhandelaar.VerstuurBevestigingen()
+	
+	#dim BewaardeBevestigingenResultSet As TECH.ResultSet = ..GeefBewaardeBevestigingenResultSet()
+	
+	While (BewaardeBevestigingenResultSet.Next()) {
+		#dim ID As TECH.String = BewaardeBevestigingenResultSet.GetDataByName("ID")
+		#dim OrderBevestigingData As APPS.OV.OrderBevestiging.data.Order = ##class(APPS.OV.OrderBevestiging.data.Order).OpenId(ID)
+
+		Do $$$AssertEquals(OrderBevestigingData.BevestigingStatus, ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).Bevestigd())
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/impl/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/impl/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/impl/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml	(revision 31715)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.impl.OrderBevestiging.OrderBevestigingMaker.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Klant">
+<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="GebruiktVariabeleControle">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="OrderID">
+<Type>%String</Type>
+<Default>123456</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Klant.GeefID())
+	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongUniShopMetLegrabox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$True
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Legrabox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).UniShop()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigLegraboxProductID())
+		
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongUniShopMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$True
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).UniShop()
+	#dim OrderID As %String = ..MaakOrder(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop(), ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongTandemboxWebMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$False
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).TandemboxWebsite()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongEDIMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$False
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).EDIBestand()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="AssertOrder">
+<FormalSpec>Oorsprong:BL.Flow.Offerte.enu.Oorsprong,ProductType:APPS.EC.enu.ProductType,OrderID:%String,ProductTypeIsZichtbaar:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim OrderBevestigingMaker As APPS.OV.OrderBevestiging.impl.OrderBevestigingMaker = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingMaker).%New()	
+	#dim EDIOrderBevestiging as APPS.OV.dto.EDIOrderBevestiging = OrderBevestigingMaker.MaakEDIOrderBevestigingDTO(OrderID)
+	
+	If $$$AssertTrue($IsObject(EDIOrderBevestiging)) {
+		Do $$$AssertEquals(EDIOrderBevestiging.EDIBron, Oorsprong)
+		Do $$$AssertEquals(EDIOrderBevestiging.Munt, "EUR")
+		Do $$$AssertEquals(EDIOrderBevestiging.OrderNummer, "123456")
+		
+		If $$$AssertTrue($IsObject(EDIOrderBevestiging.Orderlijnen.GetAt(1))) {
+			If (ProductTypeIsZichtbaar) {
+				#dim OrderBevestigingLijn As APPS.OV.dto.EDIOrderBevestigingLijn = EDIOrderBevestiging.Orderlijnen.GetAt(1)
+				
+				Do $$$AssertEquals(OrderBevestigingLijn.ProductType, ProductType)
+			}
+		}
+	}
+	
+	#dim ProductTypeTag As %String = "<Product_Type>" _ ProductType _ "</Product_Type>"
+	#dim XMLEDIOrderBevestigingMaker As %String = ""
+	
+	Do EDIOrderBevestiging.XMLExportToString(.XMLEDIOrderBevestigingMaker,, "literal,indent")
+	
+	If (ProductTypeIsZichtbaar) {
+		Do $$$AssertContains(XMLEDIOrderBevestigingMaker, ProductTypeTag, "ProductType '" _ ProductType _ "' moet vermeld zijn in dto voor Oorsprong '" _ Oorsprong _ "'.")	
+	} Else {
+		Do $$$AssertFalse(XMLEDIOrderBevestigingMaker[ProductTypeTag, "ProductType '" _ ProductType _ "' mag niet zichtbaar zijn in dto voor Oorsprong '" _ Oorsprong _ "'.")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MaakOrder">
+<FormalSpec>Oorsprong:BL.Flow.Offerte.enu.Oorsprong,ProductID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim OrderLevenCyclusService As APPS.VKP.OrderLevenCyclusService = ##class(APPS.VKP.OrderLevenCyclusService).%New()
+	#dim Order As DOM.VKP.Order = OrderLevenCyclusService.MaakOrderMetKlantGegevens(..Klant.GeefID(), ..#OrderID)
+	
+	Do Order.ZetOorsprong(Oorsprong)	
+	Do OrderLevenCyclusService.VoegToeProductVoorKlant(Order, ..Klant.GeefID(), ProductID, 1)
+	Do Order.Save()
+	
+	Quit Order.GeefID()
+]]></Implementation>
+</Method>
+
+<Method name="GeefWillekeurigLegraboxProductID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Utils.Producten).GeefWillekeurigProductIDDatStartMet("LB4")
+]]></Implementation>
+</Method>
+
+<Method name="GeefWillekeurigTandemboxProductID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Utils.Producten).GeefWillekeurigProductIDDatStartMet("TB6")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/OV/OrderBevestiging/OrderBevestigingMaker/Test.cls.xml	(revision 31715)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.OV.OrderBevestiging.OrderBevestigingMaker.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Klant">
+<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="GebruiktVariabeleControle">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="OrderID">
+<Type>%String</Type>
+<Default>123456</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..Klant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeOnderneming()
+	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Klant.GeefID())
+	Do ##class(vhUnitTest.DataHelper).VerwijderOrder(..#OrderID)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongUniShopMetLegrabox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$True
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Legrabox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).UniShop()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigLegraboxProductID())
+		
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongUniShopMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$True
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).UniShop()
+	#dim OrderID As %String = ..MaakOrder(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop(), ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongTandemboxWebMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$False
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).TandemboxWebsite()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="TestOorsprongEDIMetTandembox">
+<Implementation><![CDATA[
+	#dim ProductTypeIsZichtbaar As %Boolean = $$$False
+	#dim ProductType As APPS.EC.enu.ProductType = ##class(APPS.EC.enu.ProductType).Tandembox()	
+	#dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).EDIBestand()
+	#dim OrderID As %String = ..MaakOrder(Oorsprong, ..GeefWillekeurigTandemboxProductID())
+	
+	Do ..AssertOrder(Oorsprong, ProductType, OrderID, ProductTypeIsZichtbaar)
+]]></Implementation>
+</Method>
+
+<Method name="AssertOrder">
+<FormalSpec>Oorsprong:BL.Flow.Offerte.enu.Oorsprong,ProductType:APPS.EC.enu.ProductType,OrderID:%String,ProductTypeIsZichtbaar:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim OrderBevestigingMaker As APPS.OV.OrderBevestiging.impl.OrderBevestigingMaker = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingMaker).%New()	
+	#dim EDIOrderBevestiging as APPS.OV.dto.EDIOrderBevestiging = OrderBevestigingMaker.MaakEDIOrderBevestigingDTO(OrderID)
+	
+	If $$$AssertTrue($IsObject(EDIOrderBevestiging)) {
+		Do $$$AssertEquals(EDIOrderBevestiging.EDIBron, Oorsprong)
+		Do $$$AssertEquals(EDIOrderBevestiging.Munt, "EUR")
+		Do $$$AssertEquals(EDIOrderBevestiging.OrderNummer, "123456")
+		
+		If $$$AssertTrue($IsObject(EDIOrderBevestiging.Orderlijnen.GetAt(1))) {
+			If (ProductTypeIsZichtbaar) {
+				#dim OrderBevestigingLijn As APPS.OV.dto.EDIOrderBevestigingLijn = EDIOrderBevestiging.Orderlijnen.GetAt(1)
+				
+				Do $$$AssertEquals(OrderBevestigingLijn.ProductType, ProductType)
+			}
+		}
+	}
+	
+	#dim ProductTypeTag As %String = "<Product_Type>" _ ProductType _ "</Product_Type>"
+	#dim XMLEDIOrderBevestigingMaker As %String = ""
+	
+	Do EDIOrderBevestiging.XMLExportToString(.XMLEDIOrderBevestigingMaker,, "literal,indent")
+	
+	If (ProductTypeIsZichtbaar) {
+		Do $$$AssertContains(XMLEDIOrderBevestigingMaker, ProductTypeTag, "ProductType '" _ ProductType _ "' moet vermeld zijn in dto voor Oorsprong '" _ Oorsprong _ "'.")	
+	} Else {
+		Do $$$AssertFalse(XMLEDIOrderBevestigingMaker[ProductTypeTag, "ProductType '" _ ProductType _ "' mag niet zichtbaar zijn in dto voor Oorsprong '" _ Oorsprong _ "'.")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="MaakOrder">
+<FormalSpec>Oorsprong:BL.Flow.Offerte.enu.Oorsprong,ProductID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim OrderLevenCyclusService As APPS.VKP.OrderLevenCyclusService = ##class(APPS.VKP.OrderLevenCyclusService).%New()
+	#dim Order As DOM.VKP.Order = OrderLevenCyclusService.MaakOrderMetKlantGegevens(..Klant.GeefID(), ..#OrderID)
+	
+	Do Order.ZetOorsprong(Oorsprong)	
+	Do OrderLevenCyclusService.VoegToeProductVoorKlant(Order, ..Klant.GeefID(), ProductID, 1)
+	Do Order.Save()
+	
+	Quit Order.GeefID()
+]]></Implementation>
+</Method>
+
+<Method name="GeefWillekeurigLegraboxProductID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Utils.Producten).GeefWillekeurigProductIDDatStartMet("LB4")
+]]></Implementation>
+</Method>
+
+<Method name="GeefWillekeurigTandemboxProductID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Utils.Producten).GeefWillekeurigProductIDDatStartMet("TB6")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/Mock/OrderBevestigerBruynzeel.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/Verstuurder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/BevestigerBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestDirectOrder/Bevestiger.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/BevestigerBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/Bevestiger.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestOrder/BevestigerEersteWeekMinderDanVierWerkdagen.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestDirectOrder/VoegToeZonderBestelBevestigingNr.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 31715 refers to a dead (removed) revision in file `vhUnitTest/APPS/OV/impl/OrderBevestigerBruynzeel/TestDirectOrder/BevestigerBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?