Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket.cls.xml
===================================================================
diff -u -r33473 -r33474
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket.cls.xml	(.../MaakTussenEtiket.cls.xml)	(revision 33473)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket.cls.xml	(.../MaakTussenEtiket.cls.xml)	(revision 33474)
@@ -3,30 +3,95 @@
 <Class name="vhUnitTest.APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket">
 <Super>vhUnitTest.TestCase,APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler</Super>
 
-<Method name="Test: Kennisankertekst indien 1 kennisanker">
+<Property name="ToeleveringID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductIDIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BatchServiceDummy">
+<Type>vhTest.Dummy.APPS.Halux.common.BatchService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringServiceStub">
+<Type>vhTest.Mock.DOM.AKP.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KennisAnkerRepositoryMock">
+<Type>vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim ToeleveringID As %String = 222222
-	#dim KlantID As %String = "K||1111"
-	#dim ProductIDIterator As TECH.Iterator = ##class(TECH.ListbuildIterator).%New($listbuild(123456,654321))
+	Do ##super(aTestName)
+	Set ..ToeleveringID = 222222
+	Set ..KlantID = "K||1111"
+	Set ..ProductIDIterator = ##class(TECH.ListbuildIterator).%New($listbuild(123456,654321))
+	Set ..BatchServiceDummy = ##class(vhTest.Dummy.APPS.Halux.common.BatchService).%New()
+	Set ..ToeleveringServiceStub = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	Do ..ToeleveringServiceStub.IndienMethodCall("GeefProductIDIterator",..ToeleveringID).DanReturn(..ProductIDIterator)
+	Do ..ToeleveringServiceStub.IndienMethodCall("GeefKlant",..ToeleveringID).DanReturn(##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New(..KlantID))
+	Set ..KennisAnkerRepositoryMock = ##class(vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst indien 0 kennisankers">
+<Implementation><![CDATA[
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New()
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
 	
-	Set BatchServiceDummy = ##class(vhTest.Dummy.APPS.Halux.common.BatchService).%New()
-	Set ToeleveringServiceStub = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
-	Do ToeleveringServiceStub.IndienMethodCall("GeefProductIDIterator",ToeleveringID).DanReturn(ProductIDIterator)
-	Do ToeleveringServiceStub.IndienMethodCall("GeefKlant",ToeleveringID).DanReturn(##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New(KlantID))
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
 	
-	Set KennisAnkerRepositoryMock = ##class(vhTest.Mock.DOM.common.Kennis.KennisAnkerRepository).%New()
+	Do $$$AssertTrue($length(TussenEtiket.KennisAnkersTekst)=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kennisankertekst indien 1 kennisanker">
+<Implementation><![CDATA[
 	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
 	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker)
-	Do KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",KlantID,ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
 	
-	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(BatchServiceDummy, ToeleveringServiceStub, KennisAnkerRepositoryMock)
-	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(ToeleveringID)
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
 	
 	Do $$$AssertTrue($length(TussenEtiket.KennisAnkersTekst)>0)
 	
-	Do KennisAnkerRepositoryMock.Verifieer()
+	Do ..KennisAnkerRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Kennisankertekst indien 2 kennisankers">
+<Implementation><![CDATA[
+	#dim KennisAnker As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(654321)
+	#dim KennisAnker2 As vhTest.Fake.Derde.Kennis.ProductKennisAnker = ##class(vhTest.Fake.Derde.Kennis.ProductKennisAnker).%New(123456)
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ItemIterator).New(KennisAnker, KennisAnker2)
+	Do ..KennisAnkerRepositoryMock.VerwachtMethodCall("GeefKennisAnkerIterator",..KlantID,..ProductIDIterator,$$$ElkeWaarde).DanReturn(KennisAnkerIterator)
+	
+	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceStub, ..KennisAnkerRepositoryMock)
+	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
+	
+	Do $$$AssertTrue($find(TussenEtiket.KennisAnkersTekst,";")'=0)
+	
+	Do ..KennisAnkerRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>