Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r47190 -r48261
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47190)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48261)
@@ -3,19 +3,199 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="PartijApi">
+<Property name="PartijApiMock">
 <Type>DOM.PARTIJ.PartijAPI</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="VerkoopApi">
+<Property name="VerkoopApiMock">
 <Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
 </Property>
 
-<Method name="Test: Per klant wordt nagegaan of het een bestaande klant betreft">
+<Property name="KlantLevenCyclusServiceMock">
+<Type>APPS.KlantBeheer.KlantLevenCyclusService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
+	Do ##super(aTestName)
+	
+	Set ..VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	Set ..PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
+	Set ..KlantLevenCyclusServiceMock = ##class(vhTest.Mock.APPS.KlantBeheer.KlantLevenCyclusService).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Standaard gedrag Bij update van bestaande klant">
+</Method>
+
+<Method name="Test Standaard gedrag bij creatie nieuwe klant">
+<Implementation><![CDATA[
+	
+	Do ..VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").DanReturn($$$False)
+		
+	#dim VerwachteKlantDto as DOM.common.dto.Partij = ..GeefKlantDto()
+	Set Matcher1 = ##class(vhUnitTest.AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter.PartijMatcher).%New(VerwachteKlantDto)
+	Do ..KlantLevenCyclusServiceMock.VerwachtMethodCall("MaakKlant",Matcher1,"ONDERNEMING").DanDoeNiks()
+	
+
+	Do ..GeefConverter().Convert(..GeefCust("01111","Klant1"))
+	
+	Do ..VerkoopApiMock.Verifieer()
+	Do ..KlantLevenCyclusServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantDto">
+<Private>1</Private>
+<ReturnType>DOM.common.dto.Partij</ReturnType>
+<Implementation><![CDATA[
+	Set KlantDto = ##class(DOM.common.dto.Partij).%New()
+	Set KlantDto.KlantNummer = 1111
+	Set KlantDto.Aanspreking = "BVBA"
+	Set KlantDto.BTWNummer = "BE0430459769"
+	Set KlantDto.Email = "unittest@vanhoecke.be"
+    Set KlantDto.Fax = "03-464 12 34"
+	Set KlantDto.FrequentieAanbrengerCommissie = ""
+    Set KlantDto.KlantNaam = "Klant1 "
+    Set KlantDto.KlantNummer = 1111
+    Set KlantDto.Muntcode = "EUR"
+    Set KlantDto.Opmerking1 = ""
+    Set KlantDto.Prijsklase = ""
+    Set KlantDto.Taal = "N"
+    Set KlantDto.Telefoon1 = "03-464 00 91"
+    Set KlantDto.Toenaam = ""	
+    
+    Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+    Do Adres.ZetAanspreking("DU PONT BVBA")
+	Do Adres.ZetGemeente("PULDERBOS")
+	Do Adres.ZetLandNr(1019)
+	Do Adres.ZetPostcode("2242")
+	Do Adres.ZetStraat("KLEINHEIDE 24A")
+	Do Adres.ZetTaal("N")
+	Do Adres.ZetType("")
+	Set KlantDto.Adres = Adres
+ 
+	Quit KlantDto
+]]></Implementation>
+</Method>
+
+<Method name="GeefConverter">
+<Private>1</Private>
+<ReturnType>AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter</ReturnType>
+<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock,)
+]]></Implementation>
+</Method>
+
+<Method name="GeefCust">
+<FormalSpec>CustAccount:%String,Name:%String</FormalSpec>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
+<Implementation><![CDATA[
+	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
+	Set Cust.CustAccount = CustAccount
+	Set Cust.LanguageId = "nl-be"	
+	Set Cust.Name = Name _ " BVBA"
+	Set Cust.PartyNumber = "000000922"
+    Set Cust.PriceException = "No"
+	Set Cust.VATNum = "0430.459.769"
+	Do Cust.ElectronicAddress.Insert(..GeefTelefoon1())	
+	Do Cust.ElectronicAddress.Insert(..GeefFax())	
+	Do Cust.ElectronicAddress.Insert(..GeefEmail())	
+	Do Cust.PostalAddress.Insert(..GeefPrimaryAddress())
+	Quit Cust
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrimaryAddress">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress</ReturnType>
+<Implementation><![CDATA[
+	Set Address =##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress).%New()
+	
+    Set Address.City="PULDERBOS"
+    Set Address.CountryRegionId="BEL"
+    Set Address.Description="DU PONT BVBA"
+    Set Address.DlvModeId="GLS"
+    Set Address.IsPrimary="Yes"
+    Set Address.IsPrimaryForCountry="No"
+    Set Address.Street="KLEINHEIDE 24A"
+    Set Address.ZipCode="2242"
+    Do Address.Role.Insert(..GeefRole("Business"))
+    Do Address.Role.Insert(..GeefRole("Delivery"))
+	
+	Quit Address
+]]></Implementation>
+</Method>
+
+<Method name="GeefRole">
+<FormalSpec>Name:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole</ReturnType>
+<Implementation><![CDATA[
+	Set Role = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole).%New()
+	Set Role.Name = Name
+	Quit Role
+]]></Implementation>
+</Method>
+
+<Method name="GeefEmail">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress</ReturnType>
+<Implementation><![CDATA[
+	Set ElectronicAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress).%New()
+	Set ElectronicAddress.Description= "E-mail"
+	Set ElectronicAddress.Locator = "unittest@vanhoecke.be"
+    Set ElectronicAddress.Type = "Email"
+	Do ElectronicAddress.ElecRole.Insert(..GeefElecRole("Business"))	
+	Quit ElectronicAddress
+]]></Implementation>
+</Method>
+
+<Method name="GeefFax">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress</ReturnType>
+<Implementation><![CDATA[
+	Set ElectronicAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress).%New()
+	Set ElectronicAddress.Description= "Fax"
+	Set ElectronicAddress.Locator = "03-464 12 34"
+    Set ElectronicAddress.Type = "Fax"
+	Do ElectronicAddress.ElecRole.Insert(..GeefElecRole("Business"))	
+	Quit ElectronicAddress
+]]></Implementation>
+</Method>
+
+<Method name="GeefTelefoon1">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress</ReturnType>
+<Implementation><![CDATA[
+	Set ElectronicAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress).%New()
+	Set ElectronicAddress.Description= "Telefoon 1"
+	Set ElectronicAddress.Locator = "03-464 00 91"
+    Set ElectronicAddress.Type = "Phone"
+	Do ElectronicAddress.ElecRole.Insert(..GeefElecRole("Business"))	
+	Quit ElectronicAddress
+]]></Implementation>
+</Method>
+
+<Method name="GeefElecRole">
+<FormalSpec>Name:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElecRole</ReturnType>
+<Implementation><![CDATA[
+    Set ElecRole = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElecRole).%New()
+	Set ElecRole.Name = Name
+	quit ElecRole
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method "Test: Per klant wordt nagegaan of het een bestaande klant betreft"()
+{
 	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").ExactAantalKeer(1)
 	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||2222").ExactAantalKeer(1)
 	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||3333").ExactAantalKeer(1)
@@ -25,11 +205,10 @@
 	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
 	
 	Do VerkoopApiMock.Verifieer()
-]]></Implementation>
-</Method>
+}
 
-<Method name="Test: Alle bestaande klanten worden opgehaald">
-<Implementation><![CDATA[
+Method "Test: Alle bestaande klanten worden opgehaald"()
+{
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||2222").DanReturn($$$False)
@@ -49,11 +228,10 @@
 	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
 	
 	Do PartijApiMock.Verifieer()
-]]></Implementation>
-</Method>
+}
 
-<Method name="Test: LanguageId is de Taal">
-<Implementation><![CDATA[
+Method "Test: LanguageId is de Taal"()
+{
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	
@@ -68,11 +246,10 @@
 	Do $$$AssertEquals(FakePartij.GeefTaal(),"N")
 	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
 	Do $$$AssertEquals(FakePartij.GeefTaal(),"F")
-]]></Implementation>
-</Method>
+}
 
-<Method name="Test: VATNum is het BTWNr">
-<Implementation><![CDATA[
+Method "Test: VATNum is het BTWNr"()
+{
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	
@@ -87,11 +264,10 @@
 	Do $$$AssertEquals(FakePartij.GeefBTWNr(),"BE0402775276")
 	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
 	Do $$$AssertEquals(FakePartij.GeefBTWNr(),"BE0123456789")
-]]></Implementation>
-</Method>
+}
 
-<Method name="Test: De geupdate klant wordt gesaved">
-<Implementation><![CDATA[
+Method "Test: De geupdate klant wordt gesaved"()
+{
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	
@@ -109,20 +285,11 @@
 	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
 	
 	Do PartijMock.Verifieer()
-]]></Implementation>
-</Method>
+}
 
-<Method name="GeefConverter">
-<Private>1</Private>
-<ReturnType>AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApi, ..VerkoopApi)
-]]></Implementation>
-</Method>
 
-<Method name="GeefBerichtMetEenKlant">
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
-<Implementation><![CDATA[
+Method GeefBerichtMetEenKlant() As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust [ Private ]
+{
 	Set Roles = ##class(%ListOfDataTypes).%New()
 	Set AxdEntityRole = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole).%New()
 	Set AxdEntityRole.Name = "Business"
@@ -148,13 +315,11 @@
 	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
 	
 	Quit Bericht
-]]></Implementation>
-</Method>
+}
 
-<Method name="GeefBerichtMetDrieKlanten">
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
-<Implementation><![CDATA[
+
+Method GeefBerichtMetDrieKlanten() As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust [ Private ]
+{
 	Set Cust1 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
 	Set Cust1.CustAccount = 01111
 	Set Cust1.Name = "Klant1"
@@ -174,8 +339,11 @@
 	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
 	
 	Quit Bericht
-]]></Implementation>
-</Method>
+}
+
+*/
+]]></Content>
+</UDLText>
 </Class>