Index: vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml
===================================================================
diff -u -r40892 -r61272
--- vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 40892)
+++ vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61272)
@@ -13,6 +13,18 @@
 <Type>APPS.TRANSP.GLS.GLSv1.data.VerzendData</Type>
 </Property>
 
+<Property name="TranssmartDhlVerzendData">
+<Type>APPS.TRANSP.Transsmart.data.VerzendData</Type>
+</Property>
+
+<Property name="TranssmartVrdVerzendData">
+<Type>APPS.TRANSP.Transsmart.data.VerzendData</Type>
+</Property>
+
+<Property name="TranssmartHamannVerzendData">
+<Type>APPS.TRANSP.Transsmart.data.VerzendData</Type>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##super()
@@ -54,6 +66,52 @@
 	Set ..FreightDistributeurDataID.TrackAndTraceID = "TrackAndTraceID"
 	Do ..FreightDistributeurDataID.Save()
 	Do Levering.VoegToeEnBewaarDistributeurDataID(..FreightDistributeurDataID.GeefID())
+	
+	Set VervoerRef = 5 // DHL
+	Set BonID = 5
+	Set ^TRANSP("D",VervoerRef) = "6960\T\2804.8\\\\\58725,31224\1005\58725,31224\58725,31224\58725,31224\\5\\\\"
+	Set ^KUL(1000,"F",BonID,1)	= "\21.09.11\\\\1008\DI1 #Distributeur 1 - GLS\"_VervoerRef_";"_BonID_";6960\#\\\\10.91#1#26.0332\\\\\EUR\\\60\1\\###\\\\F\\\\\\1114#62354,37391\\\\TP7691\\\\OD1;62354;465883;80585\60719\\62353,50231\\\1071\62353,50237"
+	Set ^KU1(BonID,"F")="1000\"_BonID
+	Set Levering= ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(VervoerRef,BonID)
+	Set ..TranssmartDhlVerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()
+	#dim IsNieuweVerzendData As %Boolean = ( ..TranssmartDhlVerzendData.%Id() = "" )
+	if IsNieuweVerzendData {
+		set ..TranssmartDhlVerzendData.Reference = "referenceDHL"
+		set ..TranssmartDhlVerzendData.Carrier = "carrierDHL"
+	}	
+	Set ..TranssmartDhlVerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
+	Set ..TranssmartDhlVerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
+	Set ..TranssmartDhlVerzendData.TrackAndTraceID = "DHLTrackAndTraceID"
+	Set ..TranssmartDhlVerzendData.TrackAndTraceUrl = "www.DHL.be/fakeUrl/"_..TranssmartDhlVerzendData.TrackAndTraceID
+	Set ..TranssmartDhlVerzendData.UnitID = "UTWillekeurig"
+	Set ..TranssmartDhlVerzendData.VerzendWijze = "Parcel"
+	Do ..TranssmartDhlVerzendData.Save()
+	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartDhlVerzendData.%Id())
+	
+	Set VervoerRef = 6 // VRD
+	Set BonID = 6
+	Set ^TRANSP("D",VervoerRef) = "5803\T\2804.8\\\\\58725,31224\1005\58725,31224\58725,31224\58725,31224\\5\\\\"
+	Set ^KUL(1000,"F",BonID,1)	= "\21.09.11\\\\1008\DI1 #Distributeur 1 - GLS\"_VervoerRef_";"_BonID_";5803\#\\\\10.91#1#26.0332\\\\\EUR\\\60\1\\###\\\\F\\\\\\1114#62354,37391\\\\TP7691\\\\OD1;62354;465883;80585\60719\\62353,50231\\\1071\62353,50237"
+	Set ^KU1(BonID,"F")="1000\"_BonID
+	Set Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(VervoerRef,BonID)
+	Set ..TranssmartVrdVerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()
+	Set IsNieuweVerzendData = ( ..TranssmartVrdVerzendData.%Id() = "" )
+	if IsNieuweVerzendData {
+		set ..TranssmartVrdVerzendData.Reference = "referenceVRD"
+		set ..TranssmartVrdVerzendData.Carrier = "carrierVRD"
+	}	
+	Set ..TranssmartVrdVerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
+	Set ..TranssmartVrdVerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
+	Set ..TranssmartVrdVerzendData.TrackAndTraceUrl = "https://vrd-live-webportal.go4tms.net/User/Verzending/ToBeConfirmed"
+	Set ..TranssmartVrdVerzendData.TrackAndTraceID = "VRDTrackAndTraceID"
+	Set ..TranssmartVrdVerzendData.UnitID = "UTWillekeurig"
+	Set ..TranssmartVrdVerzendData.VerzendWijze = "Freight"
+	Do ..TranssmartVrdVerzendData.Save()
+	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartVrdVerzendData.%Id())
+
+
+
+
 		
 	Quit $$$OK
 ]]></Implementation>
@@ -62,21 +120,23 @@
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
 	#dim VervoerRef As %Integer
-	For VervoerRef=1:1:4{
+	For VervoerRef=1:1:6{
 		Kill ^TRANSP("D",VervoerRef)
 	}
 	#dim BonID As %Integer
-	For BonID=1:1:4{
+	For BonID=1:1:6{
 		Kill ^KUL(1000,"F",BonID)
 		Kill ^KU1(BonID)
 	}		
 	Do ..ParcelDistributeurDataID.Delete()
 	Do ..FreightDistributeurDataID.Delete()
+	Do ..TranssmartVrdVerzendData.Delete()
+	Do ..TranssmartDhlVerzendData.Delete()
 	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="TestABXPrivate">
+<Method name="Test ABX Private">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
@@ -91,7 +151,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestGLSPrivaatParcel">
+<Method name="Test GLS Privaat Parcel">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
@@ -106,19 +166,19 @@
 		Set Taal = "FR"	
 	}
 	
-	#Dim TeVerwachtenURL As %String = "http://www.gls-group.eu/276-I-PORTAL-WEB/dLink.jsp?un=0560005353&"
-	Set TeVerwachtenURL = TeVerwachtenURL_"key=616378d7d964e2ab83457cff908c2e91&"
+	#Dim TeVerwachtenURL As %String = "https://www.gls-group.eu/276-I-PORTAL-WEB/dLink.jsp?un=0560005353&"
+	Set TeVerwachtenURL = TeVerwachtenURL_"key=8aebdbcfdeddc2be42b9d58a7d733253&"
 	Set TeVerwachtenURL = TeVerwachtenURL_"rf="_..ParcelDistributeurDataID.UnitID_"&"
 	Set TeVerwachtenURL = TeVerwachtenURL_"crf=&"
-	Set TeVerwachtenURL = TeVerwachtenURL_"no=0560005353&"
+	Set TeVerwachtenURL = TeVerwachtenURL_"no=0560010910&"
 	Set TeVerwachtenURL = TeVerwachtenURL_"lc=VL"
 	
 	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID)
 	Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor GLS.")
 ]]></Implementation>
 </Method>
 
-<Method name="TestGLSPrivaatFreight">
+<Method name="Test GLS Privaat Freight">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
@@ -139,7 +199,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestGeenPrivate">
+<Method name="Test Geen Private">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
@@ -151,7 +211,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestABXPubliek">
+<Method name="Test ABX Publiek">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()	
@@ -183,17 +243,60 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestGeenPubliek">
+<Method name="Test Geen Publiek">
 <Implementation><![CDATA[
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "2"			
 	#Dim TeVerwachtenURL As %String = ""
 	
-	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID)
-	Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"Er is geen url voor publiek.")
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID),"Er is geen url voor publiek.")
 ]]></Implementation>
 </Method>
+
+<Method name="Test Transsmart Privaat Parcel - DHL">
+<Implementation><![CDATA[
+	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
+	
+	#dim BonID As %String = "5"
+	#Dim TeVerwachtenURL As %String = ..TranssmartDhlVerzendData.TrackAndTraceUrl
+	
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart")
+]]></Implementation>
+</Method>
+
+<Method name="Test Transsmart Privaat Freight - VRD">
+<Implementation><![CDATA[
+	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
+	
+	#dim BonID As %String = "6"		
+	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl
+	
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart.")
+]]></Implementation>
+</Method>
+
+<Method name="Test Transsmart Publieke Parcel - DHL">
+<Implementation><![CDATA[
+	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
+	
+	#dim BonID As %String = "5"
+	#Dim TeVerwachtenURL As %String = ..TranssmartDhlVerzendData.TrackAndTraceUrl
+	
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart")
+]]></Implementation>
+</Method>
+
+<Method name="Test Transsmart Publieke Freight - VRD">
+<Implementation><![CDATA[
+	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
+	
+	#dim BonID As %String = "6"		
+	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl
+
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart.")
+]]></Implementation>
+</Method>
 </Class>