Index: vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml
===================================================================
diff -u -r61083 -r61125
--- vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61083)
+++ vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61125)
@@ -21,6 +21,10 @@
 <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()
@@ -70,7 +74,6 @@
 	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()
-	//Set ..ParcelDistributeurDataID = ##class(APPS.TRANSP.GLS.GLSv1.data.VerzendData).%New()
 	#dim IsNieuweVerzendData As %Boolean = ( ..TranssmartDhlVerzendData.%Id() = "" )
 	if IsNieuweVerzendData {
 		set ..TranssmartDhlVerzendData.Reference = "referenceDHL"
@@ -90,8 +93,7 @@
 	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 LeveringVrd = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(VervoerRef,BonID)
-	;Set ..FreightDistributeurDataID = ##class(APPS.TRANSP.GLS.GLSv1.data.VerzendData).%New()
+	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 {
@@ -105,7 +107,30 @@
 	Set ..TranssmartVrdVerzendData.UnitID = "UTWillekeurig"
 	Set ..TranssmartVrdVerzendData.VerzendWijze = "Freight"
 	Do ..TranssmartVrdVerzendData.Save()
-	Do LeveringVrd.VoegToeEnBewaarDistributeurDataID(..TranssmartVrdVerzendData.%Id())
+	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartVrdVerzendData.%Id())
+
+	Set VervoerRef = 7 // Hamann
+	Set BonID = 7
+	Set ^TRANSP("D",VervoerRef) = "7159\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 ..TranssmartHamannVerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()
+	Set IsNieuweVerzendData = ( ..TranssmartHamannVerzendData.%Id() = "" )
+	if IsNieuweVerzendData {
+		set ..TranssmartHamannVerzendData.Reference = "referenceHamann"
+		set ..TranssmartHamannVerzendData.Carrier = "carrierHamann"
+	}	
+	Set ..TranssmartHamannVerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
+	Set ..TranssmartHamannVerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
+	Set ..TranssmartHamannVerzendData.TrackAndTraceUrl = "https://Haman.com/User/Verzending/ToBeConfirmed"
+	Set ..TranssmartHamannVerzendData.TrackAndTraceID = "HAMTrackAndTraceID"
+	Set ..TranssmartHamannVerzendData.UnitID = "UTWillekeurig"
+	Set ..TranssmartHamannVerzendData.VerzendWijze = "Freight"
+	Do ..TranssmartHamannVerzendData.Save()
+	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartHamannVerzendData.%Id())
+
+
 		
 	Quit $$$OK
 ]]></Implementation>
@@ -244,80 +269,65 @@
 	#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[
-	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "5"
 	#Dim TeVerwachtenURL As %String = ..TranssmartDhlVerzendData.TrackAndTraceUrl
 	
-	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID)
-	
-	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){	
-		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart")
-	}
-	Do ProjectsettingAPI.Verifieer()
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart")
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Privaat Freight - VRD">
 <Implementation><![CDATA[
-	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "6"		
 	#Dim TeVerwachtenURL As %String = ..TranssmartVrdVerzendData.TrackAndTraceUrl
 	
-	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID)
-	
-	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
-		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart.")
-	}
-	Do ProjectsettingAPI.Verifieer()
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart.")
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Publieke Parcel - DHL">
 <Implementation><![CDATA[
-	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
 	#dim BonID As %String = "5"
 	#Dim TeVerwachtenURL As %String = ..TranssmartDhlVerzendData.TrackAndTraceUrl
 	
-	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID)
-	
-	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
-		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart")
-	}
-	Do ProjectsettingAPI.Verifieer()
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart")
 ]]></Implementation>
 </Method>
 
 <Method name="Test Transsmart Publieke Freight - VRD">
 <Implementation><![CDATA[
-	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectsettingAPI.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)	
 	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>
+
+<Method name="Test Transsmart Freight - Hamann">
+<Implementation><![CDATA[
+	#dim ProjectsettingAPI As DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Set TrackAndTraceService = ##class(APPS.OV.impl.TrackAndTraceService).%New()
 	
-	#dim PrivateTrackAndTraceURL As %String = TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID)
+	#dim BonID As %String = "7"		
+	#Dim TeVerwachtenURL As %String = ..TranssmartHamannVerzendData.TrackAndTraceUrl
 	
-	If (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsTranssmartActive()){
-		Do $$$AssertEquals(TeVerwachtenURL,PrivateTrackAndTraceURL,"URL is teruggeven voor Transsmart.")
-	}
-	Do ProjectsettingAPI.Verifieer()
+	
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPubliekeTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart.")
+	Do $$$AssertEquals(TeVerwachtenURL,TrackAndTraceService.GeefPrivateTrackAndTraceURL(BonID),"URL is teruggeven voor Transsmart.")
 ]]></Implementation>
 </Method>
 </Class>