Index: vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Mail/impl/MailAdresAanpasser/GeefVolledigVanhoeckeBeAdres/Test.cls.xml	(revision 2722)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Mail.impl.MailAdresAanpasser.GeefVolledigVanhoeckeBeAdres.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="AdresAanpasser">
+<Type>TECH.Mail.impl.MailAdresAanpasser</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..AdresAanpasser = ##class(TECH.Mail.impl.MailAdresAanpasser).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Volledig adres (bevat @) blijft ongewijzigd">
+<Implementation><![CDATA[
+	#dim EmailAdres As %String = "naam@domein.com"
+	Do ..AssertAdres(EmailAdres, EmailAdres)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Volledig adres met UserFriendlyName blijft ongewijzigd">
+<Implementation><![CDATA[
+	#dim EmailAdres As %String = """MailFriendlyName"" <naam@domein.com>"
+	Do ..AssertAdres(EmailAdres, EmailAdres)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Enkelvoudig adres zonder @ wordt aangevuld met vanhoecke.be">
+<Implementation><![CDATA[	Do ..AssertAdres("inits", "inits@vanhoecke.be")
+]]></Implementation>
+</Method>
+
+<Method name="AssertAdres">
+<FormalSpec>EmailAdres:%String,VerwachtEmailAdres:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim VolledigEmailAdres As %String = ..AdresAanpasser.GeefVolledigVanhoeckeBeAdres(EmailAdres) 
+	Do $$$AssertEquals(VolledigEmailAdres,VerwachtEmailAdres)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Mail/impl/MailMessageAanpasser/MaakEmailAdressenAtVanhoeckeBe/Test.cls.xml	(revision 2722)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Mail.impl.MailMessageAanpasser.MaakEmailAdressenAtVanhoeckeBe.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: enkelvoudige adres-velden : From Sender ReplyTo">
+<Implementation><![CDATA[
+	Set MailMessage = ##class(%Net.MailMessage).%New()
+	Set MailMessage.From = "UT_Test1"
+	Set MailMessage.Sender = "UT_Test2"
+	Set MailMessage.ReplyTo = "UT_Test3"
+	
+	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
+	
+	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	
+	Do $$$AssertEquals(MailMessage.From,"UT_Test1_New")
+	Do $$$AssertEquals(MailMessage.Sender,"UT_Test2_New")
+	Do $$$AssertEquals(MailMessage.ReplyTo,"UT_Test3_New")
+]]></Implementation>
+</Method>
+
+<Method name="Test: multiple adres-veld : To">
+<Implementation><![CDATA[
+	Set MailMessage = ##class(%Net.MailMessage).%New()
+	Set MailMessage.To = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	
+	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
+	
+	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	
+	Do $$$AssertEquals(MailMessage.To.GetAt(1),"UT_Test1_New")
+	Do $$$AssertEquals(MailMessage.To.GetAt(2),"UT_Test2_New")
+]]></Implementation>
+</Method>
+
+<Method name="Test: multiple adres-veld : Cc">
+<Implementation><![CDATA[
+	Set MailMessage = ##class(%Net.MailMessage).%New()
+	Set MailMessage.Cc = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	
+	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
+	
+	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	
+	Do $$$AssertEquals(MailMessage.Cc.GetAt(1),"UT_Test1_New")
+	Do $$$AssertEquals(MailMessage.Cc.GetAt(2),"UT_Test2_New")
+]]></Implementation>
+</Method>
+
+<Method name="Test: multiple adres-veld : Bcc">
+<Implementation><![CDATA[
+	Set MailMessage = ##class(%Net.MailMessage).%New()
+	Set MailMessage.Bcc = ##class(TECH.ListUtils).CreateListOfDataTypes("UT_Test1","UT_Test2")
+	
+	#dim AdresAanpasserMock As vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser = ..GeefAdresAanpasserMock()
+	Set Aanpasser = ##class(TECH.Mail.impl.MailMessageAanpasser).%New(AdresAanpasserMock)
+	
+	Do Aanpasser.MaakEmailAdressenAtVanhoeckeBe(MailMessage)
+	
+	Do $$$AssertEquals(MailMessage.Bcc.GetAt(1),"UT_Test1_New")
+	Do $$$AssertEquals(MailMessage.Bcc.GetAt(2),"UT_Test2_New")
+]]></Implementation>
+</Method>
+
+<Method name="GeefAdresAanpasserMock">
+<ReturnType>vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser</ReturnType>
+<Implementation><![CDATA[
+	Set AdresAanpasserMock = ##class(vhTest.Mock.TECH.Mail.impl.MailAdresAanpasser).%New()
+		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","",1).DanReturn("")
+		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test1",1).DanReturn("UT_Test1_New")
+		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test2",1).DanReturn("UT_Test2_New")
+		Do AdresAanpasserMock.IndienMethodCall("GeefVolledigVanhoeckeBeAdres","UT_Test3",1).DanReturn("UT_Test3_New")
+	
+	Quit AdresAanpasserMock
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>