Index: vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml
===================================================================
diff -u -r33621 -r33623
--- vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml	(.../TimeInTransitResponse.cls.xml)	(revision 33621)
+++ vhTest/Utils/APPS/TRANSP/UPS/impl/TimeInTransit/Service/tnt/TimeInTransitResponse.cls.xml	(.../TimeInTransitResponse.cls.xml)	(revision 33623)
@@ -58,6 +58,51 @@
 	Quit Response
 ]]></Implementation>
 </Method>
+
+<Method name="GeefResponseMetVerkeerdeStatus">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ..GeefResponse()
+
+	Set Response.Response.ResponseStatus.Code = "2"
+	Set Response.Response.ResponseStatus.Description = "Failed"
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponseMetVerkeerdeReferentie">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ..GeefResponse()
+
+	Set Response.Response.TransactionReference.CustomerContext = "2"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "2"
+
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponseMetAlternatiefAdres">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	Set Response = ..GeefResponse()
+	
+	Set Candidate = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.CandidateType).%New()
+	
+	Set Candidate.Address.City = "Sint-Gillis-Waas"
+	Set Candidate.Address.StateProvinceCode = ""
+	Set Candidate.Address.CountryCode = "BE"
+	Set Candidate.Address.PostcodePrimaryHigh = "9170"
+	Set Candidate.Address.PostcodePrimaryLow = "9170"
+	
+	Do Response.CandidateResponse.ShipToList.Insert(Candidate)
+
+	Quit Response
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValidator/Test.cls.xml
===================================================================
diff -u -r32883 -r33623
--- vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32883)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 33623)
@@ -7,7 +7,7 @@
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator).%New()
 	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ""
-	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ..GeefRequest()
+	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).GeefRequest()
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon geen gegevens ophalen van UPS TransitTime ")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
@@ -19,8 +19,8 @@
 <Method name="Test: UPS Response Valideerder - Response verkeerde status">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ..GeefResponseMetVerkeerdeStatus()
-	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ..GeefRequest()
+	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).GeefResponseMetVerkeerdeStatus()
+	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).GeefRequest()
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS response verwacht status 1 voor ref : 1")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
@@ -32,8 +32,8 @@
 <Method name="Test: UPS Response Valideerder - Response verkeerde referentie">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ..GeefResponseMetVerkeerdeReferentie()
-	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ..GeefRequest()
+	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).GeefResponseMetVerkeerdeReferentie()
+	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).GeefRequest()
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Verkeerde referentie ontvangen van UPS : 2")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
@@ -45,8 +45,8 @@
 <Method name="Test: UPS Response Valideerder - Response met alternatief adres">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ..GeefResponseMetAlternatiefAdres()
-	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ..GeefRequest()
+	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).GeefResponseMetAlternatiefAdres()
+	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).GeefRequest()
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS stelt alternative adressen voor ref : 1")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidResponseException",Substrings))
@@ -58,219 +58,14 @@
 <Method name="Test: UPS Response Valideerder">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ..GeefResponse()
-	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ..GeefRequest()
+	#dim Response As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).GeefResponse()
+	#dim Request As APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest = ##class(vhTest.Utils.APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).GeefRequest()
 	
 	Do ResponseValideerder.Valideer(Response, Request)
 	
 	Do $$$AssertTrue(1)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefResponse">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Success"
-	
-	Set Response.Response.TransactionReference.CustomerContext = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	
-	for Item=1:1:5 {
-		Set SummaryType = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.ServiceSummaryType).%New()
-		
-		Set SummaryType.Service.Code = Item
-		Set SummaryType.Service.Description = "Omschrijving"_Item
-		Set SummaryType.GuaranteedIndicator = "1"
-		Set SummaryType.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
-			
-		Do Response.TransitResponse.ServiceSummary.Insert(SummaryType)
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetVerkeerdeStatus">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).%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"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	
-	for Item=1:1:5 {
-		Set SummaryType = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.ServiceSummaryType).%New()
-		
-		Set SummaryType.Service.Code = Item
-		Set SummaryType.Service.Description = "Omschrijving"_Item
-		Set SummaryType.GuaranteedIndicator = "1"
-		Set SummaryType.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
-			
-		Do Response.TransitResponse.ServiceSummary.Insert(SummaryType)
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetVerkeerdeReferentie">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Success"
-	
-	Set Response.Response.TransactionReference.CustomerContext = "2"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "2"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	
-	for Item=1:1:5 {
-		Set SummaryType = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.ServiceSummaryType).%New()
-		
-		Set SummaryType.Service.Code = Item
-		Set SummaryType.Service.Description = "Omschrijving"_Item
-		Set SummaryType.GuaranteedIndicator = "1"
-		Set SummaryType.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
-			
-		Do Response.TransitResponse.ServiceSummary.Insert(SummaryType)
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetAlternatiefAdres">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Success"
-
-	Set Response.Response.TransactionReference.CustomerContext = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-
-	Do Response.TransitResponse.ServiceSummary.Clear()
-	
-	Set Candidate = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.CandidateType).%New()
-	
-	Set Candidate.Address.City = "Sint-Gillis-Waas"
-	Set Candidate.Address.StateProvinceCode = ""
-	Set Candidate.Address.CountryCode = "BE"
-	Set Candidate.Address.PostcodePrimaryHigh = "9170"
-	Set Candidate.Address.PostcodePrimaryLow = "9170"
-	
-	Do Response.CandidateResponse.ShipToList.Insert(Candidate)
-
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequest">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest</ReturnType>
-<Implementation><![CDATA[
-	Set Request = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.Service.tnt.TimeInTransitRequest).%New()
-	
-	Set Request.Request.TransactionReference.CustomerContext = "1"
-	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
-
-	Set Request.ShipFrom.Address.City = "Sint-Niklaas" 
-	Set Request.ShipFrom.Address.StateProvinceCode = "" 
-	Set Request.ShipFrom.Address.CountryCode = "BE" 
-	Set Request.ShipFrom.Address.PostalCode = "9100" 
-	
-	Set Request.ShipTo.Address.City = "Sint-Niklaas" 
-	Set Request.ShipTo.Address.StateProvinceCode = "" 
-	Set Request.ShipTo.Address.CountryCode = "BE" 
-	Set Request.ShipTo.Address.PostalCode = "9100" 
-	
-	Set Request.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	Set Request.Pickup.Time = ""
-	
-	Set Request.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
-	Set Request.ShipmentWeight.Weight = "275"
-
-	Set Request.TotalPackagesInShipment = "10"
-
-	Set Request.InvoiceLineTotal.CurrencyCode = "EUR"
-	Set Request.InvoiceLineTotal.MonetaryValue = "550"
-	
-	Set Request.MaximumListSize = "50"
-
-	Quit Request
-]]></Implementation>
-</Method>
 </Class>