Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml
===================================================================
diff -u -r57868 -r58050
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 57868)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 58050)
@@ -3,29 +3,54 @@
 <Class name="vhUnitTest.APPS.Halux.AAP.DnaCodeService.MaakDnaCodesVoorBatch.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Parameter name="BatchId">
+<Type>%Integer</Type>
+<Default>1234</Default>
+</Parameter>
+
+<Property name="ProductTypeApiStub">
+<Type>DOM.PM.impl.ProductTypeAPIimpl</Type>
+</Property>
+
+<Property name="DnaCodeGeneratorStub">
+<Type>APPS.Halux.AAP.DnaCodeGenerator</Type>
+</Property>
+
+<Property name="LijnId">
+<Type>APPS.Halux.common.enu.ProductieLijn</Type>
+</Property>
+
+<Property name="Batch">
+<Type>APPS.Halux.common.Batch</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ..ProductTypeApiStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
+	Set ..DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()
+	Do ..DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3")
+	Set ..LijnId = ##class(APPS.Halux.common.enu.ProductieLijn).Een()
+	Set ..Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(..LijnId)
+	Do ..Batch.IndienMethodCall("GeefLijn").DanReturn(..LijnId)
+	Do ..Batch.IndienMethodCall("GeefID").DanReturn(..#BatchId)
+	Do ..Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Batch met 1 Toelevering met 1 ToeleveringLijn met aantal 1">
 <Implementation><![CDATA[
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).ToeleveringMetLijn()
 	
-	#dim BatchId As %Integer = 1234
-	#dim LijnId As APPS.Halux.common.enu.ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Een()
-	#dim Batch As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(LijnId)
-	Do Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
-	Do Batch.IndienMethodCall("GeefID").DanReturn(BatchId)
-	Do Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
-	Do Batch.IndienMethodCall("GeefLijn").DanReturn(LijnId)
+	Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
 	
-	Set ProductTypeAPIStub = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
-	Do ProductTypeAPIStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub)
+	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch)
 	
-	Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()
-	Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3")
-	
-	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ProductTypeAPIStub, DnaCodeGeneratorStub)
-	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(Batch)
-	
 	Do $$$AssertEquals(DnaCodes.Count(),1)
-	Do $$$AssertEquals(DnaCodes.GetAt(1).Lijn,LijnId)
+	Do $$$AssertEquals(DnaCodes.GetAt(1).Lijn,..LijnId)
 	Do $$$AssertEquals(DnaCodes.GetAt(1).Status,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
 	Do $$$AssertEquals(DnaCodes.GetAt(1).IsWegwerpPallet,$$$True)
 ]]></Implementation>
@@ -36,23 +61,11 @@
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).StandaardToeleveringHoofding()
 	Do Toelevering.IndienMethodCall("GeefToeleveringLijnIterator").DanReturn(..EmptyIterator())
 	
-	#dim BatchId As %Integer = 1234
-	#dim LijnId As APPS.Halux.common.enu.ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Een()
-	#dim Batch As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(LijnId)
-	Do Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
-	Do Batch.IndienMethodCall("GeefID").DanReturn(BatchId)
-	Do Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
-	Do Batch.IndienMethodCall("GeefLijn").DanReturn(LijnId)
+	Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
 	
-	Set ProductTypeAPIStub = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
-	Do ProductTypeAPIStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub)
+	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch)
 	
-	Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()
-	Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3")
-	
-	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ProductTypeAPIStub, DnaCodeGeneratorStub)
-	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(Batch)
-	
 	Do $$$AssertEquals(DnaCodes.Count(),0)
 ]]></Implementation>
 </Method>
@@ -62,23 +75,11 @@
 	#dim Toelevering1 As DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).ToeleveringMetLijn()
 	#dim Toelevering2 As DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).ToeleveringMetLijn()
 	
-	#dim BatchId As %Integer = 1234
-	#dim LijnId As APPS.Halux.common.enu.ProductieLijn = ##class(APPS.Halux.common.enu.ProductieLijn).Een()
-	#dim Batch As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(LijnId)
-	Do Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering1, Toelevering2))
-	Do Batch.IndienMethodCall("GeefID").DanReturn(BatchId)
-	Do Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
-	Do Batch.IndienMethodCall("GeefLijn").DanReturn(LijnId)
+	Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering1, Toelevering2))
 	
-	Set ProductTypeAPIStub = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
-	Do ProductTypeAPIStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub)
+	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch)
 	
-	Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()
-	Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3")
-	
-	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ProductTypeAPIStub, DnaCodeGeneratorStub)
-	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(Batch)
-	
 	Do $$$AssertEquals(DnaCodes.Count(),2)
 	Do $$$AssertEquals(DnaCodes.GetAt(1).Status,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
 	Do $$$AssertEquals(DnaCodes.GetAt(2).Status,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())