Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml
===================================================================
diff -u -r38800 -r38908
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 38800)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 38908)
@@ -12,62 +12,50 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: MaakOfferte controleert op bestaande ExterneId">
+<Method name="Test: ExterneId wordt gecontroleerd en bewaard op Offerte">
 <Implementation><![CDATA[
+	#dim ExterneIdUnderTest As %String = "ExterneIdUnderTest"
+
 	#dim KlantIDDummy As DOM.VKP.VanHoeckeKlantID = $$$DummyInteger
 	#dim PersonalityIDDummy As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
-	#dim ExterneIdDummy As %String = $$$DummyInteger
 	
 	#dim WinkelkarServiceMock As vhTest.Mock.APPS.EC.Winkelkar.impl.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.impl.WinkelkarService).%New()
-	Do WinkelkarServiceMock.IndienMethodCall("MaakWinkelkar", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(##class(APPS.EC.Winkelkar.dto.Winkelkar).%New())
+	
+	set ApplicationMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(..GeefApplicatie())
+	
+	Do WinkelkarServiceMock.VerwachtMethodCall("MaakWinkelkar", ApplicationMatcher, KlantIDDummy, PersonalityIDDummy, ExterneIdUnderTest).DanReturn(##class(APPS.EC.Winkelkar.dto.Winkelkar).%New())
+	Do WinkelkarServiceMock.VerwachtMethodCall("ControleerWinkelkarViaExterneId", ExterneIdUnderTest).DanDoeNiks()
 
-	Do WinkelkarServiceMock.VerwachtMethodCall("ControleerWinkelkarViaExterneId", ExterneIdDummy).DanDoeNiks()
-
 	#dim OfferteFake As vhTest.Fake.APPS.VKP.Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
+	
 	#dim OfferteBewaarderMock As vhTest.Mock.APPS.VKP.OfferteBewaarder = ##class(vhTest.Mock.APPS.VKP.OfferteBewaarder).%New()
 	Do OfferteBewaarderMock.IndienMethodCall("Bewaar", OfferteFake).DanDoeNiks()
 	
 	#dim OfferteServiceMock As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("MaakNieuwOfferte", KlantIDDummy, PersonalityIDDummy).DanReturn(OfferteFake)
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferteBewaarder").DanReturn(OfferteBewaarderMock)
-	Do OfferteServiceMock.IndienMethodCall("RaiseEventOfferte",$$$ElkeWaarde).DanDoeNiks()
+	Do OfferteServiceMock.VerwachtMethodCall("MaakNieuwOfferte", KlantIDDummy, PersonalityIDDummy).DanReturn(OfferteFake)
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferteBewaarder").DanReturn(OfferteBewaarderMock)
+	Do OfferteServiceMock.VerwachtMethodCall("RaiseEventOfferte",$$$ElkeWaarde).DanDoeNiks()
+	Do OfferteServiceMock.VerwachtMethodCall("ControleerOfferteViaExterneId", ExterneIdUnderTest).DanDoeNiks()
 
-	Do OfferteServiceMock.VerwachtMethodCall("ControleerOfferteViaExterneId", ExterneIdDummy).DanDoeNiks()
-	
 	#dim VerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceMock, WinkelkarServiceMock)
-	Do VerkoopService.MaakOfferte( KlantIDDummy,PersonalityIDDummy, ExterneIdDummy)
+	Do VerkoopService.MaakOfferte(KlantIDDummy, PersonalityIDDummy, ExterneIdUnderTest)
 	
 	Do OfferteServiceMock.Verifieer()
 	Do WinkelkarServiceMock.Verifieer()
+	Do $$$AssertEquals(OfferteFake.ExterneId, "ExterneIdUnderTest")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ExterneId wordt bewaard op Offerte">
+<Method name="GeefApplicatie">
+<Private>1</Private>
+<ReturnType>APPS.common.dto.Applicatie</ReturnType>
 <Implementation><![CDATA[
-	#dim ExterneIdUnderTest As %String = "ExterneIdUnderTest"
-
-	#dim KlantIDDummy As DOM.VKP.VanHoeckeKlantID = $$$DummyInteger
-	#dim PersonalityIDDummy As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	#dim Applicatie As APPS.common.dto.Applicatie = ##class(APPS.common.dto.Applicatie).%New()
 	
-	#dim WinkelkarServiceMock As vhTest.Mock.APPS.EC.Winkelkar.impl.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.impl.WinkelkarService).%New()
-	Do WinkelkarServiceMock.IndienMethodCall("MaakWinkelkar", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(##class(APPS.EC.Winkelkar.dto.Winkelkar).%New())
-	Do WinkelkarServiceMock.IndienMethodCall("ControleerWinkelkarViaExterneId", $$$ElkeWaarde).DanDoeNiks()
-
-	#dim OfferteFake As vhTest.Fake.APPS.VKP.Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
+	Set Applicatie.Naam = "Uni_Webshop"
+	Set Applicatie.Type = ##class(APPS.common.enu.ApplicatieType).Extern()
 	
-	#dim OfferteBewaarderMock As vhTest.Mock.APPS.VKP.OfferteBewaarder = ##class(vhTest.Mock.APPS.VKP.OfferteBewaarder).%New()
-	Do OfferteBewaarderMock.IndienMethodCall("Bewaar", OfferteFake).DanDoeNiks()
-	
-	#dim OfferteServiceMock As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("ControleerOfferteViaExterneId", ExterneIdUnderTest).DanDoeNiks()
-	Do OfferteServiceMock.IndienMethodCall("MaakNieuwOfferte", KlantIDDummy, PersonalityIDDummy).DanReturn(OfferteFake)
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferteBewaarder").DanReturn(OfferteBewaarderMock)
-	Do OfferteServiceMock.IndienMethodCall("RaiseEventOfferte",$$$ElkeWaarde).DanDoeNiks()
-	
-	#dim VerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceMock, WinkelkarServiceMock)
-	Do VerkoopService.MaakOfferte(KlantIDDummy, PersonalityIDDummy, ExterneIdUnderTest)
-	
-	Do $$$AssertEquals(OfferteFake.ExterneId, "ExterneIdUnderTest")
+	Quit Applicatie
 ]]></Implementation>
 </Method>
 </Class>