Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml
===================================================================
diff -u -r50828 -r52186
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 50828)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 52186)
@@ -36,8 +36,6 @@
 	Set ..Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..GeefPersonalityID())
 	Set ..HandelPrefix = ..Personality.GeefPrefix()
 	
-	#Dim UrlBepaler As vhTest.Fake.APPS.EC.Webshop.UrlBepaler = ##class(vhTest.Fake.APPS.EC.Webshop.UrlBepaler).%New()
-	
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(..GeefPersonalityID())
 ]]></Implementation>
 </Method>
@@ -51,26 +49,26 @@
 
 <Method name="Test">
 <Implementation><![CDATA[
-	#Define ZomaarEenDatumAlsHorolog "63320"
+	#define ZomaarEenDatumAlsHorolog "63320"
 	
-	set DataServiceStub = ##class(vhTest.Mock.APPS.EC.DataService).%New()
-	do DataServiceStub.IndienMethodCall("GeefKlantData",..GeefPersonalityID(),..HandelPrefix_"123456").DanReturn(..GeefKlantData())
-	do DataServiceStub.IndienMethodCall("GeefGebruikerData",..GeefPersonalityID(),..HandelPrefix_"DummyGebruiker").DanReturn(..GeefGebruikerData())
-	do ##class(APPS.EC.Rapporteur.impl.IoCContainer).Instance().Register("DataService",DataServiceStub)
+	#dim DataServiceStub As vhTest.Mock.APPS.EC.DataService = ##class(vhTest.Mock.APPS.EC.DataService).%New()
+	Do DataServiceStub.IndienMethodCall("GeefKlantData", ..GeefPersonalityID(), ..HandelPrefix _ "123456").DanReturn(..GeefKlantData())
+	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", ..GeefPersonalityID(), ..HandelPrefix _ "DummyGebruiker").DanReturn(..GeefGebruikerData())
+	Do ##class(APPS.EC.Rapporteur.impl.IoCContainer).Instance().Register("DataService", DataServiceStub)
 	
-	#Dim DocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
-	#Dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	#Dim OfferteVanHandelDummy As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	#dim OfferteVanHandelDummy As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do OfferteVanHandelDummy.IndienMethodCall("GeefExterneId").DanReturn(789654)
 	Do OfferteVanHandelDummy.IndienMethodCall("GeefPersonalityID").DanReturn(..GeefPersonalityIdVanOfferteVanHandel())
 	Do OfferteVanHandelDummy.IndienMethodCall("GeefPersonality").DanReturn(..Personality)
 	
+	#dim DocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
 	Set DocumentReferenties.OrderReferentie = "DummyOrderRef"
 	
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do OfferteStub.IndienMethodCall("GeefID").DanReturn($$$DummyString)
 	Do OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(..Personality)
-	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(..HandelPrefix_"123456")
-	Do OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn(..HandelPrefix_"DummyGebruiker")
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(..HandelPrefix _ "123456")
+	Do OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn(..HandelPrefix _ "DummyGebruiker")
 	Do OfferteStub.IndienMethodCall("GeefBestelOpmerking").DanReturn($$$DummyString)
 	Do OfferteStub.IndienMethodCall("GeefWensLeverDatum").DanReturn(..#ZomaarEenWensLeverdatum)
 	Do OfferteStub.IndienMethodCall("GeefDocumentReferenties").DanReturn(DocumentReferenties)
@@ -79,17 +77,16 @@
 	Do OfferteStub.IndienMethodCall("GeefExterneId").DanReturn(..GeefExterneId())
 	Do OfferteStub.IndienMethodCall("GeefOfferteVanHandel").DanReturn(OfferteVanHandelDummy)
 	
-	Set MailApi = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
+	#dim MailApi As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
 	
-	Set VertaalApi = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
-	do VertaalApi.IndienMethodCall("GeefVertaler",..Personality.GeefTaal(),"Unishop").DanReturn(##class(vhTest.Utils.Vertaler).%New(""))
+	#dim VertaalApiStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
+	do VertaalApiStub.IndienMethodCall("GeefVertaler", ..Personality.GeefTaal(), "Unishop").DanReturn(##class(vhTest.Utils.Vertaler).%New(""))
 	
-	#Dim Rapporteur As APPS.EC.Rapporteur.Rapporteur = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.Handel).%New(,MailApi,VertaalApi)
-	
+	#dim Rapporteur As APPS.EC.Rapporteur.Rapporteur = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.Handel).%New(, MailApi, VertaalApiStub)
 	Do Rapporteur.Rapporteer(OfferteStub)
 	
-	If $$$AssertEquals(MailApi.GeefAantalVerzondenMails(),1) {
-		#Dim Mail As TECH.Mail.Mail = MailApi.GeefVerzondenMails().GetAt(1)
+	If $$$AssertEquals(MailApi.GeefAantalVerzondenMails(), 1) {
+		#dim Mail As TECH.Mail.Mail = MailApi.GeefVerzondenMails().GetAt(1)
 		Do ..AssertMail(Mail)
 	}
 	
@@ -113,13 +110,13 @@
 <FormalSpec>Mail:TECH.Mail.Mail</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEqualsList(Mail.GeefOntvangers(),..GeefVerwachteOntvangers())
+	Do $$$AssertEqualsList(Mail.GeefOntvangers(), ..GeefVerwachteOntvangers())
+	Do $$$AssertEquals(Mail.GeefVerzender(), "webshop@vanhoecke.be")
 	
-	Do $$$AssertEquals(Mail.GeefVerzender(),"webshop@vanhoecke.be")
-	If ..GeefExterneId(){
-		Do $$$AssertEquals(Mail.GeefOnderwerp(),"[BesteldeOfferteHandelOnderwerp]: "_..GeefExterneId())
+	If (..GeefExterneId()) {
+		Do $$$AssertEquals(Mail.GeefOnderwerp(), "[BesteldeOfferteHandelOnderwerp]: " _ ..GeefExterneId())
 	} Else {
-		Do $$$AssertEquals(Mail.GeefOnderwerp(),"[BesteldeOfferteHandelOnderwerp]: "_$$$DummyString)
+		Do $$$AssertEquals(Mail.GeefOnderwerp(), "[BesteldeOfferteHandelOnderwerp]: " _ $$$DummyString)
 	}
 	
 	Do ..AssertInhoud(Mail.GeefInhoud())
@@ -158,10 +155,12 @@
 <Private>1</Private>
 <ReturnType>DOM.common.dto.GebruikerData</ReturnType>
 <Implementation><![CDATA[
-	set GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
-	set GebruikerData.ID = ..HandelPrefix_"1234"
-	set GebruikerData.Naam = ..HandelPrefix_"Gebruiker"
-	quit GebruikerData
+	#dim GebruikerData As DOM.common.dto.GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
+	
+	Set GebruikerData.ID = ..HandelPrefix _ "1234"
+	Set GebruikerData.Naam = ..HandelPrefix _ "Gebruiker"
+	
+	Quit GebruikerData
 ]]></Implementation>
 </Method>
 
@@ -192,11 +191,13 @@
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelAanspreking], <BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelIntro]<BR>")
-	If ..GeefExterneId(){
+	
+	If (..GeefExterneId()) {
 		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ ..GeefExterneId() _ "<BR>")
 	} Else {
 		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ $$$DummyString _ "<BR>")
 	}
+	
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelKlantLabel]: " _ "<BR>")
 	
 	Do ..AssertKlantReferentie(Inhoud.ReadLine())
@@ -226,7 +227,7 @@
 <Method name="AssertKlantReferentie">
 <FormalSpec>KlantDataReferentie:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do $$$AssertEquals(KlantDataReferentie,..HandelPrefix_"Gebruiker"_" - "_..HandelPrefix_"KLANT_1234 - "_..HandelPrefix_"Gemeente_1234 - TestStraat1 - test@"_..HandelPrefix_".be - Tel: 09/444.55.66 - Fax: 09/111.22.33"_"<BR>")
+<Implementation><![CDATA[	Do $$$AssertEquals(KlantDataReferentie, ..HandelPrefix _ "Gebruiker" _ " - " _ ..HandelPrefix _ "KLANT_1234 - " _ ..HandelPrefix _ "Gemeente_1234 - TestStraat1 - test@" _ ..HandelPrefix _ ".be - Tel: 09/444.55.66 - Fax: 09/111.22.33" _ "<BR>")
 ]]></Implementation>
 </Method>
 </Class>