Index: vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml
===================================================================
diff -u -r56494 -r56495
--- vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 56494)
+++ vhUnitTest/BL/MB/UGLYPicking/Receptie/BuildBufferViaDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 56495)
@@ -56,13 +56,7 @@
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering, , ..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),1)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+	Do ..AssertDnaCode(..DnaCode1, VolgNummer, 1)
 ]]></Implementation>
 </Method>
 
@@ -83,13 +77,7 @@
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering, , ..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),2)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+	Do ..AssertDnaCode(..DnaCode1, 1, 2)
 	Do $$$AssertFalse($Data(^UPRCP("B","~tmp",VolgNummer,2)))
 ]]></Implementation>
 </Method>
@@ -113,13 +101,7 @@
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering, , ..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),1)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+	Do ..AssertDnaCode(..DnaCode1)
 	Do $$$AssertFalse($Data(^UPRCP("B","~tmp",VolgNummer,2)))
 ]]></Implementation>
 </Method>
@@ -145,19 +127,8 @@
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(..DnaCode1.Toelevering, , ..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),1)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",1),..DnaCode2.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",2),..DnaCode2.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",3),..DnaCode2.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",4),..DnaCode2.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",5),1)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,2),"\",7),..DnaCode2.InitialenScanner)
+	Do ..AssertDnaCode(..DnaCode1, 1)
+	Do ..AssertDnaCode(..DnaCode2, 2)
 	Do $$$AssertFalse($Data(^UPRCP("B","~tmp",VolgNummer,3)))
 ]]></Implementation>
 </Method>
@@ -183,13 +154,7 @@
 	Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(, ..DnaCode1.PalletCode, ..DnaCode1.InitialenScanner,.VolgNummer)
 	
 	Do $$$AssertEquals(VolgNummer,"1")
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer),"\",3),..DnaCode1.InitialenScanner)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",1),..DnaCode1.ProductNummer)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",2),..DnaCode1.LadeCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",3),..DnaCode1.PalletCode)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",4),..DnaCode1.Locatie)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",5),1)
-	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",VolgNummer,1),"\",7),..DnaCode1.InitialenScanner)
+	Do ..AssertDnaCode(..DnaCode1)
 ]]></Implementation>
 </Method>
 
@@ -214,6 +179,20 @@
 	Quit DnaCode
 ]]></Implementation>
 </Method>
+
+<Method name="AssertDnaCode">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,SubLijn:%Integer=1,Aantal:%Integer=1</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1),"\",3),DnaCode.InitialenScanner)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",1),DnaCode.ProductNummer)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",2),DnaCode.LadeCode)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",3),DnaCode.PalletCode)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",4),DnaCode.Locatie)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",5),Aantal)
+	Do $$$AssertEquals($Piece(^UPRCP("B","~tmp",1,SubLijn),"\",7),DnaCode.InitialenScanner)
+]]></Implementation>
+</Method>
 </Class>