Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r48305 -r48309
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48305)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48309)
@@ -55,24 +55,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPartij">
-<Private>1</Private>
-<ReturnType>DOM.PARTIJ.Partij</ReturnType>
-<Implementation><![CDATA[
-	Set PartijMock = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
-	Quit PartijMock
-]]></Implementation>
-</Method>
-
-<Method name="GeefKlant">
-<Private>1</Private>
-<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
-<Implementation><![CDATA[
-	Set VanHoeckKlantMock = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
-	Quit VanHoeckKlantMock
-]]></Implementation>
-</Method>
-
 <Method name="Test Standaard gedrag bij creatie nieuwe klant">
 <Implementation><![CDATA[
 	Do ..VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").DanReturn($$$False)
@@ -107,6 +89,31 @@
 ]]></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="GeefPartij">
+<Private>1</Private>
+<ReturnType>DOM.PARTIJ.Partij</ReturnType>
+<Implementation><![CDATA[
+	Set PartijMock = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
+	Quit PartijMock
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlant">
+<Private>1</Private>
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+<Implementation><![CDATA[
+	Set VanHoeckKlantMock = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
+	Quit VanHoeckKlantMock
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantDto">
 <Private>1</Private>
 <ReturnType>DOM.common.dto.Partij</ReturnType>
@@ -139,7 +146,7 @@
 <ReturnType>DOM.common.Adres</ReturnType>
 <Implementation><![CDATA[
 	Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
-    Do Adres.ZetAanspreking("DU PONT BVBA")
+    Do Adres.ZetAanspreking("KLANT1 BVBA")
 	Do Adres.ZetGemeente("PULDERBOS")
 	Do Adres.ZetLandNr(1019)
 	Do Adres.ZetPostcode("2242")
@@ -150,15 +157,9 @@
 ]]></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>
+<Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
 <Implementation><![CDATA[
 	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
@@ -185,15 +186,14 @@
 	
     Set Address.City="PULDERBOS"
     Set Address.CountryRegionId="BEL"
-    Set Address.Description="DU PONT BVBA"
+    Set Address.Description="KLANT1 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"))
-	
+    Do Address.Role.Insert(..GeefRole("Delivery"))	
 	Quit Address
 ]]></Implementation>
 </Method>
@@ -258,160 +258,6 @@
 	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)
-	
-	Set ..VerkoopApi = VerkoopApiMock
-	
-	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
-	
-	Do VerkoopApiMock.Verifieer()
-}
-
-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)
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||3333").DanReturn($$$True)
-	
-	#dim Klant1 As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New()
-	#dim Klant2 As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New()
-	
-	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||1111").ExactAantalKeer(1).DanReturn(Klant1)
-	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||2222").ExactAantalKeer(0)
-	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||3333").ExactAantalKeer(1).DanReturn(Klant2)
-	
-	Set ..VerkoopApi = VerkoopApiMock
-	Set ..PartijApi = PartijApiMock
-	
-	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
-	
-	Do PartijApiMock.Verifieer()
-}
-
-Method "Test: LanguageId is de Taal"()
-{
-	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
-	
-	#dim FakePartij As DOM.PARTIJ.Partij = ##class(vhTest.Fake.DOM.PARTIJ.Partij).%New()
-	
-	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(FakePartij)
-	
-	Set ..VerkoopApi = VerkoopApiMock
-	Set ..PartijApi = PartijApiMock
-	
-	Do $$$AssertEquals(FakePartij.GeefTaal(),"N")
-	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
-	Do $$$AssertEquals(FakePartij.GeefTaal(),"F")
-}
-
-Method "Test: VATNum is het BTWNr"()
-{
-	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
-	
-	#dim FakePartij As DOM.PARTIJ.Partij = ##class(vhTest.Fake.DOM.PARTIJ.Partij).%New()
-	
-	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(FakePartij)
-	
-	Set ..VerkoopApi = VerkoopApiMock
-	Set ..PartijApi = PartijApiMock
-	
-	Do $$$AssertEquals(FakePartij.GeefBTWNr(),"BE0402775276")
-	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
-	Do $$$AssertEquals(FakePartij.GeefBTWNr(),"BE0123456789")
-}
-
-Method "Test: De geupdate klant wordt gesaved"()
-{
-	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
-	
-	#dim PartijMock As DOM.PARTIJ.Partij = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
-	Do PartijMock.IndienMethodCall("ZetTaal","F").DanDoeNiks()
-	Do PartijMock.IndienMethodCall("ZetBTWNr","BE0123456789").DanDoeNiks()
-	Do PartijMock.VerwachtMethodCall("Save").ExactAantalKeer(1)
-	
-	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijApiMock.IndienMethodCall("GeefPartij","K||1111").DanReturn(PartijMock)
-	
-	Set ..VerkoopApi = VerkoopApiMock
-	Set ..PartijApi = PartijApiMock
-	
-	Do ..GeefConverter().Convert(..GeefBerichtMetEenKlant())
-	
-	Do PartijMock.Verifieer()
-}
-
-
-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"
-	Do Roles.Insert(AxdEntityRole)
-	
-	Set Addresses = ##class(%ListOfDataTypes).%New()
-	Set PostalAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress).%New()
-	Set PostalAddress.CountryRegionId = "BE"
-	Set PostalAddress.Role = Roles
-	Do Addresses.Insert(PostalAddress)
-	
-	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust.CustAccount = 01111
-	Set Cust.Name = "Klant1"
-	Set Cust.LanguageId = "fr"
-	Set Cust.VATNum = "0123.456.789"
-	Set Cust.PostalAddress = Addresses
-	
-	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
-	Do CustOutQuery.Cust.Insert(Cust)
-	
-	Set Bericht = ##class(AXif.Dynamics.CustomerIn.Envelope).%New()
-	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
-	
-	Quit Bericht
-}
-
-
-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"
-	Set Cust2 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust2.CustAccount = 02222
-	Set Cust2.Name = "Klant2"
-	Set Cust3 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust3.CustAccount = 03333
-	Set Cust3.Name = "Klant3"
-	
-	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
-	Do CustOutQuery.Cust.Insert(Cust1)
-	Do CustOutQuery.Cust.Insert(Cust2)
-	Do CustOutQuery.Cust.Insert(Cust3)
-	
-	Set Bericht = ##class(AXif.Dynamics.CustomerIn.Envelope).%New()
-	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
-	
-	Quit Bericht
-}
-
-*/
-]]></Content>
-</UDLText>
 </Class>