Index: vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32557 -r32558
--- vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32557)
+++ vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32558)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.APPS.TRANSP.UPS.OfferteBerekenaar.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="aTest: Geef mogelijke leverdagen voor TeverzendItemList ">
+<Method name="Test: Geef mogelijke leverdagen voor TeverzendItemList ">
 <Implementation><![CDATA[
 	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort = ##class(vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort).%New()
 	
@@ -13,20 +13,28 @@
 	
 	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(TeverzendItemList)
 	
-	Do $$$AssertEquals(LeverDatums, ..GeefLeverDatums())
-	Do $$$AssertTrue(0,"")
+	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+	
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
+	
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: UPS Response converteerder">
+<Method name="Test: UPS Response converteerder">
 <Implementation><![CDATA[
 	#dim ResponseConverteerder As APPS.TRANSP.UPS.impl.ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.ResponseConverteerder).%New()
 	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
 	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ResponseConverteerder.Converteer(Response)
 	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
 	
-	Do $$$AssertObject(LeverDatums, TestLeverDatums)
-	Do $$$AssertEqualsList(LeverDatums.OfferteItemList, TestLeverDatums.OfferteItemList)
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
 ]]></Implementation>
 </Method>
 
@@ -55,12 +63,24 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: UPS TeverzendItemList converteerder">
+<Method name="Test: UPS TeverzendItemList converteerder">
 <Implementation><![CDATA[
 	#dim TeverzendItemListConverteerder As APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder  = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder).%New()
 	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
 	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
-	Do $$$AssertEquals(Request,..GeefRequest())
+	#dim TestRequest As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
+
+	Do $$$AssertObject(Request.Pickup, TestRequest.Pickup)
+	Do $$$AssertObject(Request.ShipFrom.Address , TestRequest.ShipFrom.Address)
+	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
+	Do $$$AssertObject(Request.ShipTo.Address , TestRequest.ShipTo.Address)
+	Do $$$AssertObject(Request.ShipmentWeight.UnitOfMeasurement , TestRequest.ShipmentWeight.UnitOfMeasurement)
+	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
+	Do $$$AssertObject(Request.InvoiceLineTotal , TestRequest.InvoiceLineTotal)
+	
+	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
+	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
+	Do $$$AssertEquals(Request.MaximumListSize,TestRequest.MaximumListSize)
 ]]></Implementation>
 </Method>
 
@@ -69,7 +89,7 @@
 	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
 	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemListZonderLijnen()
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Detaillijnen in offerte : 1")
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Detaillijnen in TeverzendenItemList : 1")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
 
 	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
@@ -185,7 +205,7 @@
 		Set TeverzendItem.WaardeGoederen = Item * 10
 		Set TeverzendItem.Gewicht = Item * 5
 		Set TeverzendItem.Afmeting = Item * 15
-		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/02/2016")
+		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/03/2016")
 		Do TeverzendItemList.TeverzendItems.SetAt(TeverzendItem,Item)
 	}
 	
@@ -232,12 +252,12 @@
 	Set Request.Pickup.Time = ""
 	
 	Set Request.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
-	Set Request.ShipmentWeight.Weight = "200"
+	Set Request.ShipmentWeight.Weight = "275"
 
-	Set Request.TotalPackagesInShipment = "2"
+	Set Request.TotalPackagesInShipment = "10"
 
 	Set Request.InvoiceLineTotal.CurrencyCode = "EUR"
-	Set Request.InvoiceLineTotal.MonetaryValue = "200.00"
+	Set Request.InvoiceLineTotal.MonetaryValue = "550"
 	
 	Set Request.MaximumListSize = "50"
 
Index: APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r32557 -r32558
--- APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32557)
+++ APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32558)
@@ -38,9 +38,9 @@
 	Set ..UPSConnection = $$$Implementation(UPSConnection,##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.TimeInTransitPort).%New())
 	
 	Set ..ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.ResponseConverteerder).%New()
-	Set ..TeverzendItemListConverteerder = ##class(APPS.TRANSP.UPS.impl.OfferteConverteerder).%New()
-	Set ..ResponseValideerder = ##class(APPS.TRANSP.UPS.ResponseValideerder).%New()
-	Set ..TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.OfferteValideerder).%New()
+	Set ..TeverzendItemListConverteerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder).%New()
+	Set ..ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
+	Set ..TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
 	
 	quit $$$OK
 ]]></Implementation>
Index: vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml
===================================================================
diff -u -r32557 -r32558
--- vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32557)
+++ vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32558)
@@ -7,7 +7,40 @@
 <Method name="ProcessTimeInTransit">
 <FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</FormalSpec>
 <ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[ Quit ""
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	Set Response.Response.TransactionReference.CustomerContext = Body.Request.TransactionReference.CustomerContext
+	Set Response.Response.TransactionReference.TransactionIdentifier = Body.Request.TransactionReference.TransactionIdentifier
+
+	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = Body.ShipmentWeight.UnitOfMeasurement
+	Set Response.TransitResponse.ShipmentWeight.Weight = Body.ShipmentWeight.Weight
+	
+	Set Response.TransitResponse.ShipFrom.Address.City = Body.ShipFrom.Address.City
+	Set Response.TransitResponse.ShipFrom.Address.CountryCode = Body.ShipFrom.Address.CountryCode
+	Set Response.TransitResponse.ShipFrom.Address.PostalCode = Body.ShipFrom.Address.PostalCode 
+
+	Set Response.TransitResponse.ShipTo.Address.City = Body.ShipTo.Address.City
+	Set Response.TransitResponse.ShipTo.Address.CountryCode = Body.ShipTo.Address.CountryCode
+	Set Response.TransitResponse.ShipTo.Address.PostalCode = Body.ShipTo.Address.PostalCode
+	
+	Set Response.TransitResponse.PickupDate = Body.Pickup.Date 
+	
+	for Item=1:1:5 {
+		#dim SummaryType As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType).%New()
+		
+		Set SummaryType.Service.Code = Item
+		Set SummaryType.Service.Description = "Omschrijving"_Item
+		Set SummaryType.GuaranteedIndicator = "1"
+		Set SummaryType.EstimatedArrival.Pickup.Date = Body.Pickup.Date
+		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
+			
+		Do Response.TransitResponse.ServiceSummary.SetAt(SummaryType,Item)
+	}
+	Quit Response
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml
===================================================================
diff -u -r32557 -r32558
--- APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32557)
+++ APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32558)
@@ -7,10 +7,10 @@
 <FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
 <Implementation><![CDATA[
 	If ($$$Not($IsObject(TeverzendenItemList.LeverAdres))) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ongeldig leveradres in offerte : " _TeverzendenItemList.Referentie)
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ongeldig leveradres in TeverzendenItemList : " _TeverzendenItemList.Referentie)
 	}
 	If ($$$Not($IsObject(TeverzendenItemList.TeverzendItems)) || (TeverzendenItemList.TeverzendItems.Count() = 0)) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Geen Detaillijnen in offerte : " _TeverzendenItemList.Referentie)
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Geen Detaillijnen in TeverzendenItemList : " _TeverzendenItemList.Referentie)
 	}
 	quit
 ]]></Implementation>