Index: vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml
===================================================================
diff -u -r32882 -r33040
--- vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32882)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/Rate/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 33040)
@@ -5,112 +5,59 @@
 
 <Method name="Test: Controle van de foutmelding bij lege response ">
 <Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ""
-	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
-	
-	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon geen gegevens ophalen van UPS Rate")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
 
-	Do ResponseValideerder.Valideer(Response, Request)
+	#dim ResponseValidator As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	Do ResponseValidator.Valideer("", ..GeefRequest())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: UPS Response Valideerder - Response met verkeerde referentie">
 <Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponseMetVerkeerdeReferentie()
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response heeft verkeerde referentie : 2")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
+	
 	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	Set Request.Request.TransactionReference.CustomerContext = "1"
+	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response heeft verkeerde referentie : 2")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponse()
+	Set Response.Response.TransactionReference.CustomerContext = "2"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "2"
 
-	Do ResponseValideerder.Valideer(Response, Request)
+	#dim ResponseValidator As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	Do ResponseValidator.Valideer(Response, Request)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: UPS Response Valideerder - Response met verkeerde status">
 <Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponseMetVerkeerdeStatus()
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response verwacht 1 als status voor ref : 1")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
+	
 	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	Set Request.Request.TransactionReference.CustomerContext = "1"
+	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response verwacht 1 als status voor ref : 1")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
-
-	Do ResponseValideerder.Valideer(Response, Request)
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponse()
+	Set Response.Response.ResponseStatus.Code = "2"
+	Set Response.Response.ResponseStatus.Description = "Failed"
+	
+	#dim ResponseValidator As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	Do ResponseValidator.Valideer(Response, ..GeefRequest())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: UPS Response Valideerder">
 <Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponse()
-	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
+	#dim ResponseValidator As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
+	Do ResponseValidator.Valideer(..GeefResponse(), ..GeefRequest())
 	
-	Do ResponseValideerder.Valideer(Response, Request)
-	
 	Do $$$AssertTrue(1)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefResponseMetVerkeerdeReferentie">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Succes"
-	
-	Set Response.Response.TransactionReference.CustomerContext = "2"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "2"
-
-	For Item=1:1:5 {
-		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
-		
-		Set RatedShipment.Service.Code = Item
-		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
-		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
-		Set RatedShipment.BillingWeight.Weight = Item * 5 
-		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
-		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
-		
-		Do Response.RatedShipment.Insert(RatedShipment)	
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetVerkeerdeStatus">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "2"
-	Set Response.Response.ResponseStatus.Description = "Failed"
-	
-	Set Response.Response.TransactionReference.CustomerContext = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	For Item=1:1:5 {
-		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
-		
-		Set RatedShipment.Service.Code = Item
-		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
-		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
-		Set RatedShipment.BillingWeight.Weight = Item * 5 
-		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
-		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
-		
-		Do Response.RatedShipment.Insert(RatedShipment)	
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
 <Method name="GeefResponse">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
@@ -123,18 +70,6 @@
 	Set Response.Response.TransactionReference.CustomerContext = "1"
 	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
 
-	For Item=1:1:5 {
-		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
-		
-		Set RatedShipment.Service.Code = Item
-		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
-		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
-		Set RatedShipment.BillingWeight.Weight = Item * 5 
-		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
-		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
-		
-		Do Response.RatedShipment.Insert(RatedShipment)	
-	}
 	Quit Response
 ]]></Implementation>
 </Method>
@@ -160,56 +95,6 @@
 	Set Request.Shipment.ShipTo.Address.CountryCode = "BE" 
 	Set Request.Shipment.ShipTo.Address.PostalCode = "9100" 
 	
-	Set PackageItem1 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
-	Set PackageItem1.Dimensions.Height = 500
-	Set PackageItem1.Dimensions.Width = 10
-	Set PackageItem1.Dimensions.Length = 100
-	Set PackageItem1.PackageWeight.UnitOfMeasurement.Code = "KGS"
-	Set PackageItem1.PackageWeight.Weight = 120
-	Set PackageItem1.PackagingType.Code = "02"
-	Set PackageItem1.PackagingType.Description = "Package/customer supplied"
-	Do Request.Shipment.Package.Insert(PackageItem1)
-
-	Set PackageItem2 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
-	Set PackageItem2.Dimensions.Height = 1000
-	Set PackageItem2.Dimensions.Width = 20
-	Set PackageItem2.Dimensions.Length = 200
-	Set PackageItem2.PackageWeight.UnitOfMeasurement.Code = "KGS"
-	Set PackageItem2.PackageWeight.Weight = 800
-	Set PackageItem2.PackagingType.Code = "02"
-	Set PackageItem2.PackagingType.Description = "Package/customer supplied"
-	Do Request.Shipment.Package.Insert(PackageItem2)
-	
-	Set PackageItem3 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
-	Set PackageItem3.Dimensions.Height = 1500
-	Set PackageItem3.Dimensions.Width = 30
-	Set PackageItem3.Dimensions.Length = 300
-	Set PackageItem3.PackageWeight.UnitOfMeasurement.Code = "KGS"
-	Set PackageItem3.PackageWeight.Weight = 2700
-	Set PackageItem3.PackagingType.Code = "02"
-	Set PackageItem3.PackagingType.Description = "Package/customer supplied"
-	Do Request.Shipment.Package.Insert(PackageItem3)
-
-	Set PackageItem4 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
-	Set PackageItem4.Dimensions.Height = 2000
-	Set PackageItem4.Dimensions.Width = 40
-	Set PackageItem4.Dimensions.Length = 400
-	Set PackageItem4.PackageWeight.UnitOfMeasurement.Code = "KGS"
-	Set PackageItem4.PackageWeight.Weight = 6400
-	Set PackageItem4.PackagingType.Code = "02"
-	Set PackageItem4.PackagingType.Description = "Package/customer supplied"
-	Do Request.Shipment.Package.Insert(PackageItem4)
-
-	Set PackageItem5 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
-	Set PackageItem5.Dimensions.Height = 2500
-	Set PackageItem5.Dimensions.Width = 50
-	Set PackageItem5.Dimensions.Length = 500
-	Set PackageItem5.PackageWeight.UnitOfMeasurement.Code = "KGS"
-	Set PackageItem5.PackageWeight.Weight = 12500
-	Set PackageItem5.PackagingType.Code = "02"
-	Set PackageItem5.PackagingType.Description = "Package/customer supplied"
-	Do Request.Shipment.Package.Insert(PackageItem5)
-
 	Set Request.Shipment.ShipmentServiceOptions.UPScarbonneutralIndicator = ""
 	
 	Quit Request