Index: vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32558 -r32614
--- vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32558)
+++ vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32614)
@@ -5,9 +5,10 @@
 
 <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()
+	#dim RateBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.Rate.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.Rate.OfferteBerekenaar).%New()
+	#dim TimeInTransitBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar).%New()
 	
-	#dim OfferteBerekenaar As APPS.TRANSP.UPS.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.OfferteBerekenaar).%New(FakeWebClient)
+	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.OfferteBerekenaar).%New(RateBerekenaar, TimeInTransitBerekenaar)
 	
 	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
 	
@@ -23,188 +24,25 @@
 ]]></Implementation>
 </Method>
 
-<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())
-	
-	For Item=1:1:LeverDatums.OfferteItemList.Count() {
-		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
-		}
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS Response Valideerder - Response met alternatief adres">
-<Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponseMetAlternatiefAdres()
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.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.GeneralErrorException",Substrings))
-
-	Do ResponseValideerder.Valideer(Response, Request)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS Response Valideerder">
-<Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
-	
-	Do ResponseValideerder.Valideer(Response, Request)
-	
-	Do $$$AssertTrue(1)
-]]></Implementation>
-</Method>
-
-<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)
-	#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>
-
-<Method name="Test: UPS TeverzendItemList Valideerder - TeverzendItemList zonder lijnen ">
-<Implementation><![CDATA[
-	#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 TeverzendenItemList : 1")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
-
-	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS TeverzendItemList Valideerder">
-<Implementation><![CDATA[
-	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
-	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
-	
-	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
-	
-	Do $$$AssertTrue(1)
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponse">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<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 = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	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.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 {
-		#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 = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
-			
-		Do Response.TransitResponse.ServiceSummary.SetAt(SummaryType,Item)
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetAlternatiefAdres">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<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 = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	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.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()
-	
-	#dim Candidate As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType).%New()
-	
-	Set Candidate.Address.City = "Sint-Gillis-Waas"
-	Set Candidate.Address.CountryCode = "BE"
-	Set Candidate.Address.PostcodePrimaryHigh = "9170"
-	Set Candidate.Address.PostcodePrimaryLow = "9170"
-	
-	Do Response.CandidateResponse.ShipToList.SetAt(Candidate,1)
-
-	Quit Response
-]]></Implementation>
-</Method>
-
 <Method name="GeefTeverzendItemList">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
 <Implementation><![CDATA[
 	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
 	Set TeverzendItemList.Referentie = "1"
 	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("11/03/2016")
-	Set TeverzendItemList.LeverAdres = ##class(APPS.common.dto.Adres).%New()
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
 	Set TeverzendItemList.LeverAdres.LandCode = "BE"
 	Set TeverzendItemList.LeverAdres.Postcode = "9100"
 	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
 	
-	For Item=1:1:10 {
+	For Item=1:1:15 {
 		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
 		Set TeverzendItem.ProductID = Item
 		Set TeverzendItem.WaardeGoederen = Item * 10
 		Set TeverzendItem.Gewicht = Item * 5
-		Set TeverzendItem.Afmeting = Item * 15
+		Set TeverzendItem.Afmeting = Item * 500
 		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/03/2016")
 		Do TeverzendItemList.TeverzendItems.SetAt(TeverzendItem,Item)
 	}
@@ -213,76 +51,42 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTeverzendItemListZonderLijnen">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
-<Implementation><![CDATA[
-	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
-	Set TeverzendItemList.Referentie = "1"
-	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("01/03/2016")
-	Set TeverzendItemList.LeverAdres = ##class(APPS.common.dto.Adres).%New()
-	Set TeverzendItemList.LeverAdres.LandCode = "BE"
-	Set TeverzendItemList.LeverAdres.Postcode = "9100"
-	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
-	
-	Do TeverzendItemList.TeverzendItems.Clear()
-	
-	Quit TeverzendItemList
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequest">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
-<Implementation><![CDATA[
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest  = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.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.CountryCode = "BE" 
-	Set Request.ShipFrom.Address.PostalCode = "9100" 
-	
-	Set Request.ShipTo.Address.City = "Sint-Niklaas" 
-	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>
-
 <Method name="GeefLeverDatums">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
 	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
 	
-	For Item=1:1:5 {
-		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-		Set OfferteItem.Code = Item
-		Set OfferteItem.Omschrijving = "Omschrijving"_Item
-		Set OfferteItem.Gegarandeerd = "1"
-		Set OfferteItem.Duurtijd = Item
-		Set OfferteItem.Kostprijs = 0
-		Set OfferteItem.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set OfferteItem.Optie = ""
-		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
-	}
+	#dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem1.Code = 2
+	Set OfferteItem1.Omschrijving = "UPS Express"
+	Set OfferteItem1.Gegarandeerd = "1"
+	Set OfferteItem1.Duurtijd = 1
+	Set OfferteItem1.Kostprijs = 70
+	Set OfferteItem1.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem1.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem1,1)
 
+	#dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem2.Code = 2
+	Set OfferteItem2.Omschrijving = "UPS Express"
+	Set OfferteItem2.Gegarandeerd = "1"
+	Set OfferteItem2.Duurtijd = 10
+	Set OfferteItem2.Kostprijs = 70
+	Set OfferteItem2.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem2.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem2,2)
+
+	#dim OfferteItem3 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem3.Code = 4
+	Set OfferteItem3.Omschrijving = "UPS Standard"
+	Set OfferteItem3.Gegarandeerd = "1"
+	Set OfferteItem3.Duurtijd = 8
+	Set OfferteItem3.Kostprijs = 110
+	Set OfferteItem3.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem3.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem3,3)
+
 	Quit OfferteData
 ]]></Implementation>
 </Method>