Index: vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml
===================================================================
diff -u -r32898 -r32923
--- vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 32898)
+++ vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 32923)
@@ -3,84 +3,60 @@
 <Class name="vhUnitTest.BL.PPS.TBX.DocsV1.EtikettenCommissieOne.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test : Logo op etiket wordt gedefault naar het vanhoecke logo">
+<Method name="Test: Logo op etiket wordt gedefault naar het vanhoecke logo">
 <Implementation><![CDATA[
-	#dim ToeleveringAPIStub As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-	#dim OrderAPIStub As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	Do ..InitMocks("K||1234")
 	
-	#dim VerkoopAPIStub As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
-	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
-	do KlantStub.IndienMethodCall("GeefNaam").DanReturn("EenNaam")
-	do VerkoopAPIStub.IndienMethodCall("GeefKlant","K||1234").DanReturn(KlantStub)
-		
-	#dim OrderStub As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	do OrderStub.IndienMethodCall("GeefKlantID").DanReturn("K||1234")
-	do OrderAPIStub.IndienMethodCall("GeefOrder",1).DanReturn(OrderStub)
+	Set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
+	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
 	
-	#dim ToeleveringStub As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	do $$$AssertEquals(Etiket.Logo,"logo\Logo VHZwart.svg")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Haefele-NL heeft geen logo">
+<Implementation><![CDATA[
+	Do ..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleNederland())
 	
-	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn(1)
-		
-	do ToeleveringAPIStub.IndienMethodCall("GeefToelevering",11).DanReturn(ToeleveringStub)
-	
 	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
 	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
 	
-	do $$$AssertEquals(Etiket.Logo,"logo\Logo VHZwart.svg")
+	do $$$AssertEquals(Etiket.Logo,"")
 ]]></Implementation>
 </Method>
 
-<Method name="Test : Haefele-NL heeft geen logo">
+<Method name="Test: Haefele-BE heeft geen logo">
 <Implementation><![CDATA[
-	#dim ToeleveringAPIStub As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-	#dim OrderAPIStub As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	Do ..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleBelgie())
 	
-	#dim VerkoopAPIStub As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
-	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
-	do KlantStub.IndienMethodCall("GeefNaam").DanReturn("EenNaam")
-	do VerkoopAPIStub.IndienMethodCall("GeefKlant","K||2671").DanReturn(KlantStub)
-		
-	#dim OrderStub As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	do OrderStub.IndienMethodCall("GeefKlantID").DanReturn("K||2671")
-	do OrderAPIStub.IndienMethodCall("GeefOrder",1).DanReturn(OrderStub)
-	
-	#dim ToeleveringStub As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
-	
-	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn(1)
-		
-	do ToeleveringAPIStub.IndienMethodCall("GeefToelevering",11).DanReturn(ToeleveringStub)
-	
 	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
 	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
 	
 	do $$$AssertEquals(Etiket.Logo,"")
 ]]></Implementation>
 </Method>
 
-<Method name="Test : Haefele-BE heeft geen logo">
+<Method name="InitMocks">
+<FormalSpec>KlantID:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim ToeleveringAPIStub As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
 	#dim OrderAPIStub As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
 	
 	#dim VerkoopAPIStub As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
 	do KlantStub.IndienMethodCall("GeefNaam").DanReturn("EenNaam")
-	do VerkoopAPIStub.IndienMethodCall("GeefKlant","K||4875").DanReturn(KlantStub)
+	do VerkoopAPIStub.IndienMethodCall("GeefKlant",KlantID).DanReturn(KlantStub)
 		
 	#dim OrderStub As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	do OrderStub.IndienMethodCall("GeefKlantID").DanReturn("K||4875")
+	do OrderStub.IndienMethodCall("GeefKlantID").DanReturn(KlantID)
 	do OrderAPIStub.IndienMethodCall("GeefOrder",1).DanReturn(OrderStub)
 	
 	#dim ToeleveringStub As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
 	
 	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn(1)
 		
 	do ToeleveringAPIStub.IndienMethodCall("GeefToelevering",11).DanReturn(ToeleveringStub)
-	
-	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
-	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
-	
-	do $$$AssertEquals(Etiket.Logo,"")
 ]]></Implementation>
 </Method>
 </Class>