Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/BepaalParentDnaCode/Test.cls.xml	(revision 66807)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper.BepaalParentDnaCode.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Batch">
+<Type>APPS.Halux.common.Batch</Type>
+</Property>
+
+<Property name="LijnId">
+<Type>APPS.Halux.common.enu.ProductieLijn</Type>
+</Property>
+
+<Property name="DnaCode1">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
+<Property name="DnaCode2">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
+<Property name="DnaCode3">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
+<Property name="DnaCode4">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
+<Property name="DnaCode5">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode1.DnaCode = "OAAAAA3"
+	
+	Set ..DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode2.DnaCode = "GAAAAA3"
+	
+	Set ..DnaCode3 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode3.DnaCode = "MAAAAA3"
+	
+	Set ..DnaCode4 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode4.DnaCode = "LAAAAA3"
+	
+	Set ..DnaCode5 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode5.DnaCode = "HAAAAA3"
+	Set ..DnaCode5.ProductNummer = 123456
+	
+	Set ..LijnId = ##class(APPS.Halux.common.enu.ProductieLijn).Een()
+	Set ..Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(..LijnId)
+	Do ..Batch.IndienMethodCall("GeefProductieGroep").DanReturn(##class(APPS.Halux.common.enu.ProductieGroep).Probox())
+]]></Implementation>
+</Method>
+
+<Method name="Test: DnaCode begint met O of G of M -&gt; ParentDnaCode is DnaCode">
+<Implementation><![CDATA[
+	#dim ParentDnaCode1 As %String
+	#dim ParentDnaCode2 As %String
+	#dim ParentDnaCode3 As %String
+	
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
+	Set ParentDnaCode1 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode1, ..Batch)
+	Set ParentDnaCode2 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode2, ..Batch)
+	Set ParentDnaCode3 = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode3, ..Batch)
+	
+	Do $$$AssertEquals(ParentDnaCode1, ..DnaCode1.DnaCode)
+	Do $$$AssertEquals(ParentDnaCode2, ..DnaCode2.DnaCode)
+	Do $$$AssertEquals(ParentDnaCode3, ..DnaCode3.DnaCode)
+]]></Implementation>
+</Method>
+
+<Method name="Test: DnaCode begint niet met O G of M -&gt; ParentDnaCode is leeg">
+<Implementation><![CDATA[
+	#dim ParentDnaCode As %String
+
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
+	Set ParentDnaCode = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode4, ..Batch)
+	
+	Do $$$AssertEquals(ParentDnaCode, "")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Batch ProductieGroep is Kast -&gt; ParentDnaCode is DnaCode">
+<Implementation><![CDATA[
+	#dim ParentDnaCode As %String
+	
+	Do ..Batch.IndienMethodCall("GeefProductieGroep").DanReturn(##class(APPS.Halux.common.enu.ProductieGroep).Kast())
+	
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
+	Set ParentDnaCode = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode4, ..Batch)
+	
+	Do $$$AssertEquals(ParentDnaCode, ..DnaCode4.DnaCode)
+]]></Implementation>
+</Method>
+
+<Method name="Test: TaorLosseComponentenVerpakking is true -&gt; ParentDnaCode is DnaCode">
+<Implementation><![CDATA[
+	#dim ParentDnaCode As %String
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken).GeefLegeTAORKenmerken()
+	
+	Set IngegevenKenmerken.VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).LosseComponentenInBulk()
+	
+	Set ProductStub = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
+	Do ProductStub.IndienMethodCall("GeefID").DanReturn(1000)
+	
+	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductStub)
+	
+	Set ConfiguratorServiceStub = ##class(vhTest.Mock.APPS.VKP.Maatwerk.impl.ConfiguratorService).%New()
+	Do ConfiguratorServiceStub.IndienMethodCall("GeefOnverwerkteKenmerkenVanProduct", $$$ElkeWaarde).DanReturn(IngegevenKenmerken)
+
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,, ProductApiStub, ConfiguratorServiceStub)
+	Set ParentDnaCode = DnaCodeServiceHelper.BepaalParentDnaCode(..DnaCode5, ..Batch)
+	
+	Do $$$AssertEquals(ParentDnaCode, ..DnaCode5.DnaCode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MaakDnaCodeVoorToeleveringLijn/Test.cls.xml
===================================================================
diff -u -r66805 -r66807
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MaakDnaCodeVoorToeleveringLijn/Test.cls.xml	(.../Test.cls.xml)	(revision 66805)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MaakDnaCodeVoorToeleveringLijn/Test.cls.xml	(.../Test.cls.xml)	(revision 66807)
@@ -79,7 +79,7 @@
 <Implementation><![CDATA[
 	#dim DnaCode As DOM.Halux.AAP.DnaCode = ""
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(..DnaCodeGeneratorStub,, ..ProductTypeApiStub, ..ProductApiStub, ..IngegevenKenmerkenSpaceStepHelperStub)
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(..DnaCodeGeneratorStub,, ..ProductTypeApiStub, ..ProductApiStub,, ..IngegevenKenmerkenSpaceStepHelperStub)
 	Set DnaCode = DnaCodeServiceHelper.MaakDnaCodeVoorToeleveringLijn(..ToeleveringLijn, ..Batch)
 
 	Do $$$AssertEquals(DnaCode.DnaCode, "LAAAAA3")
@@ -103,7 +103,7 @@
 	
 	Do ..IngegevenKenmerkenSpaceStepHelperStub.IndienMethodCall("IsSpaceStep",..IngegevenKenmerkenStub).DanReturn($$$True)
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(, DnaCodeRepositoryMock, ..ProductTypeApiStub, ..ProductApiStub, ..IngegevenKenmerkenSpaceStepHelperStub)
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(, DnaCodeRepositoryMock, ..ProductTypeApiStub, ..ProductApiStub,, ..IngegevenKenmerkenSpaceStepHelperStub)
 	Set DnaCode = DnaCodeServiceHelper.MaakDnaCodeVoorToeleveringLijn(..ToeleveringLijn)
 	
 	Do $$$AssertEquals(DnaCode.ProductNummer, 123456)
@@ -119,17 +119,15 @@
 <Implementation><![CDATA[
 	#dim DnaCode As DOM.Halux.AAP.DnaCode = ""
 	#Dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("SpaceStep voor MVX genereert nog geen DnaCodes!")
-	
-	
-	
+
 	Do ..ProductTypeApiStub.IndienMethodCall("IsLegraboxProduct", 123456).DanReturn($$$False)
 	Do ..ProductTypeApiStub.IndienMethodCall("IsTandemboxProduct", 123456).DanReturn($$$False)
 	Do ..ProductTypeApiStub.IndienMethodCall("IsTAORboxProduct", 123456).DanReturn($$$False)
 	Do ..IngegevenKenmerkenSpaceStepHelperStub.IndienMethodCall("IsSpaceStep",..IngegevenKenmerkenStub).DanReturn($$$True)
 	
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.UnimplementedException, Substrings))
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,, ..ProductTypeApiStub, ..ProductApiStub, ..IngegevenKenmerkenSpaceStepHelperStub)
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,, ..ProductTypeApiStub, ..ProductApiStub,, ..IngegevenKenmerkenSpaceStepHelperStub)
 	Set DnaCode = DnaCodeServiceHelper.MaakDnaCodeVoorToeleveringLijn(..ToeleveringLijn)
 	
 	Do $$$AssertEquals(DnaCode.ProductNummer, 123456)