Index: vhUnitTest/APPS/Halux/Docs/impl/LadeKlantEtiketBuilder/Test.cls.xml
===================================================================
diff -u -r59252 -r65384
--- vhUnitTest/APPS/Halux/Docs/impl/LadeKlantEtiketBuilder/Test.cls.xml	(.../Test.cls.xml)	(revision 59252)
+++ vhUnitTest/APPS/Halux/Docs/impl/LadeKlantEtiketBuilder/Test.cls.xml	(.../Test.cls.xml)	(revision 65384)
@@ -8,20 +8,70 @@
 <Type>vhUnitTest.APPS.Halux.Docs.TestDataEtiketten</Type>
 </Property>
 
-<Parameter name="Type">
+<UDLText name="T">
+<Content><![CDATA[
+// Parameter Type As %String = "IntegratieTest";
+
+]]></Content>
+</UDLText>
+
+<Parameter name="ProductId">
 <Type>%String</Type>
-<Default>IntegratieTest</Default>
+<Default>700</Default>
 </Parameter>
 
 <Property name="EtiketBuilder">
 <Type>APPS.Halux.Docs.impl.LadeKlantEtiketBuilder</Type>
 </Property>
 
+<Property name="ProductTypeApiMock">
+<Type>vhTest.Mock.DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductMock">
+<Type>vhTest.Mock.DOM.PM.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductApiMock">
+<Type>vhTest.Mock.DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BarcodeServiceMock">
+<Type>vhTest.Mock.APPS.algemeen.BarcodeService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LadeEigenschappenEtiketAanvullerMock">
+<Type>vhTest.Mock.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.LadeKlantEtiketFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LadeKlantEtiketFactoryMock">
+<Type>vhTest.Mock.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.LadeKlantEtiketFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ImageLinkMock">
+<Type>vhUnitTest.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.ImageLinkMock</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(TestName)
 	
+	Set ..ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Set ..ProductMock = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Set ..ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Set ..BarcodeServiceMock = ##class(vhTest.Mock.APPS.algemeen.BarcodeService).%New()
+	Set ..LadeEigenschappenEtiketAanvullerMock = ##class(vhTest.Mock.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.LadeEigenschappenEtiketAanvuller).%New()
+	Set ..LadeKlantEtiketFactoryMock = ##class(vhTest.Mock.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.LadeKlantEtiketFactory).%New()
+	Set ..ImageLinkMock = ##class(vhUnitTest.APPS.Halux.Docs.impl.LadeKlantEtiketBuilder.ImageLinkMock).%New()
+	
 	Do ##class(vhUnitTest.DOM.PM.Maatwerk.TestData).MaakData()
 	
 	Set ..Data = ##class(vhUnitTest.APPS.Halux.Docs.TestDataEtiketten).%New()
@@ -30,23 +80,27 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestMaakBasisMaatwerkProductEtiket">
+<Method name="Test: Maak basis maatwerkproduct etiket">
 <Implementation><![CDATA[
-	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(..Data.Order.GeefKlantID())
-	#dim Etiket As BL.Etiket.LadeKlantEtiket = ..EtiketBuilder.MaakBasisMaatwerkProductEtiket(..Data.ProductID,Partij,1)
-	Do $$$AssertEquals(Etiket.Aantal,1)
-	Do $$$AssertEquals(Etiket.Barcode,"TWBNV2")
-	Do $$$AssertEquals(Etiket.BarcodeTekst,"T.WB.NV.2")
-	Do $$$AssertEquals(Etiket.Kleur,"WA/LG")
-	Do $$$AssertEquals(Etiket.ProductID,700)
-	Do $$$AssertEquals(Etiket.ProductImg,"GENERIEK\TBX\tbx_DY2_BD_x2.JPG")
-	Do $$$AssertEquals(Etiket.Taal,"N")
-	Do $$$AssertEquals(Etiket.Dossier,"")
+	#dim Partij As DOM.PARTIJ.Partij = ##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij()
+	#dim EtiketBuilder As APPS.Halux.Docs.impl.LadeKlantEtiketBuilder = ..GeefLadeKlantEtiketBuilder(Partij, ..#ProductId, $$$True, $$$False)
+	#dim Etiket As BL.Etiket.LadeKlantEtiket = EtiketBuilder.MaakBasisMaatwerkProductEtiket(..#ProductId, Partij, 1)
 	
-	Do $$$AssertEquals(Etiket.Breedte,"B: 900")
-	Do $$$AssertEquals(Etiket.Diepte,"D: 500")
-	Do $$$AssertEquals(Etiket.WandDikte,"WD: 16")
-	Do $$$AssertEquals(Etiket.LadeCode,"DY2")
+	Do $$$AssertEquals(Etiket.Aantal, 1)
+	Do $$$AssertEquals(Etiket.Barcode, "UT DossierBarode")
+	Do $$$AssertEquals(Etiket.BarcodeTekst, "UT Leesbare DossierBarcode")
+	Do $$$AssertEquals(Etiket.Kleur, "UT KleurKorttekst")
+	Do $$$AssertEquals(Etiket.ProductID, ..#ProductId)
+	Do $$$AssertEquals(Etiket.ProductImg, "UT ProductImageURL")
+	Do $$$AssertEquals(Etiket.Taal, "N")
+	Do $$$AssertEquals(Etiket.Dossier, "")
+	
+	Do $$$AssertEquals(Etiket.Breedte, "B: ")
+	Do $$$AssertEquals(Etiket.Diepte, "D: ")
+	Do $$$AssertEquals(Etiket.WandDikte, "WD: ")
+	Do $$$AssertEquals(Etiket.LadeCode, "")
+	
+	Do ..VerifieerMocks()
 ]]></Implementation>
 </Method>
 
@@ -405,6 +459,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLadeKlantEtiketBuilder">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,ProductId:%String,IsTandemboxProduct:%Boolean,IsSpaceTowerProduct:%Boolean,ProductOrderlijnId:%String=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.Docs.impl.LadeKlantEtiketBuilder</ReturnType>
+<Implementation><![CDATA[
+	Do ..ProductTypeApiMock.VerwachtMethodCall("IsTandemboxProduct", ProductId).DanReturn(IsTandemboxProduct)
+	Do ..ProductTypeApiMock.IndienMethodCall("IsSpaceTowerProduct",ProductOrderlijnId).DanReturn(IsSpaceTowerProduct)
+	
+	Do ..ProductMock.VerwachtMethodCall("GeefKleurVanKorttekst").DanReturn("UT KleurKorttekst")
+	Do ..ProductApiMock.VerwachtMethodCall("GeefProduct", ProductId).DanReturn(..ProductMock)
+	
+	Do ..BarcodeServiceMock.VerwachtMethodCall("GeefDossierBarcodeVanProduct", ProductId).DanReturn("UT DossierBarode")
+	Do ..BarcodeServiceMock.VerwachtMethodCall("GeefLeesbaarDossierBarcodeVanProduct", ProductId).DanReturn("UT Leesbare DossierBarcode")
+	
+	#dim EtiketTest As BL.Etiket.LadeKlantEtiket = ##class(BL.Etiket.LadeKlantEtiket).%New(Partij.GeefID())
+	Do ..LadeEigenschappenEtiketAanvullerMock.VerwachtMethodCall("VulAan", EtiketTest, ..#ProductId, 0).DanDoeNiks()
+	Do ..LadeKlantEtiketFactoryMock.IndienMethodCall("MaakLadeKlantEtiket", Partij.GeefID()).DanReturn(EtiketTest)
+	Do ..ImageLinkMock.VerwachtMethodCall("GetProductImageURL", ProductId, ##class(APPS.common.enu.Toepassing).Label(), "PB","").DanReturn("UT ProductImageURL")
+	
+	Quit ##class(APPS.Halux.Docs.impl.LadeKlantEtiketBuilder).%New(..ProductTypeApiMock, ..ProductApiMock, ..BarcodeServiceMock, ..LadeEigenschappenEtiketAanvullerMock, ..LadeKlantEtiketFactoryMock, ..ImageLinkMock)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductOrderLijn">
 <Private>1</Private>
 <ReturnType>DOM.VKP.ProductOrderlijn</ReturnType>
@@ -414,6 +491,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerifieerMocks">
+<Implementation><![CDATA[
+	Do ..ProductTypeApiMock.Verifieer()
+	Do ..ProductMock.Verifieer()
+	Do ..ProductApiMock.Verifieer()
+	Do ..BarcodeServiceMock.Verifieer()
+	Do ..LadeEigenschappenEtiketAanvullerMock.Verifieer()
+	Do ..ImageLinkMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="OnAfterOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[