Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetFreightCashOnDelivery.cls.xml
===================================================================
diff -u -r29575 -r31998
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetFreightCashOnDelivery.cls.xml	(.../TestLeveringMetFreightCashOnDelivery.cls.xml)	(revision 29575)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/TestLeveringMetFreightCashOnDelivery.cls.xml	(.../TestLeveringMetFreightCashOnDelivery.cls.xml)	(revision 31998)
@@ -52,37 +52,24 @@
 	do LeveringData.VerpakkingEenheden.Insert(VerpakkingEenheid)
 			
 	#dim Requests As List Of APPS.TRANSP.GLS.Bericht.dto.Request =  RequestBouwer.MaakRequests(LeveringData,##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).FreightCashOnDelivery())
-	If $$$AssertEquals(Requests.Count(),3){
-		If $$$AssertTrue(Requests.GetAt(1).%IsA("APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest")){
-			
-			#dim Request As APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest = Requests.GetAt(1)	
-			Do ..AssertGLSBasis(Request)
-			Do ..AssertAdressen(Request)
-			Do ..AssertRequestBasis(Request)
 	
-			Do $$$AssertEquals(Request.T203,"C")
-			Do $$$AssertEquals(Request.T207,"COD,1999.99,EUR")
-			Do ..AssertStandaardCOD(Request)
-		}
-		
-		If $$$AssertTrue(Requests.GetAt(2).%IsA("APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest")){
-			#dim Request2 As APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest = Requests.GetAt(2)	
-			Do ..AssertGLSBasis(Request2)
-			Do ..AssertAdressen(Request2)
-			Do ..AssertRequestBasis(Request2)
+	#dim RequestCount As %Integer = 3
 	
-			Do $$$AssertEquals(Request2.T203,"C")
-			Do $$$AssertEquals(Request2.T207,"COD,1999.99,EUR")
-			Do ..AssertStandaardCOD(Request2)
-		}
+	If $$$AssertEquals(Requests.Count(),RequestCount) {
+		#dim RequestItemIndex As %Integer
+		for RequestItemIndex = 1 : 1 : RequestCount  {
+			If $$$AssertTrue(Requests.GetAt(RequestItemIndex).%IsA("APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest")) {
+				#dim Request As APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest = Requests.GetAt(RequestItemIndex)	
+				Do ..AssertGLSBasis(Request)
+				Do ..AssertAdressen(Request)
+				Do ..AssertRequestBasis(Request)
 		
-		If $$$AssertTrue(Requests.GetAt(3).%IsA("APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest"))
-		{
-			#dim Request3 As APPS.TRANSP.GLS.Bericht.dto.FreightCashOnDeliveryRequest = Requests.GetAt(2)		
-			Do $$$AssertEquals(Request3.T203,"C")
-			Do $$$AssertEquals(Request3.T207,"COD,1999.99,EUR")
-			Do ..AssertStandaardCOD(Request3)	
+				Do $$$AssertEquals(Request.T203,"C")
+				Do $$$AssertEquals(Request.T207,"COD,1999.99,EUR")
+				Do ..AssertStandaardCOD(Request)
+			}
 		}
+		
 	}
 ]]></Implementation>
 </Method>