Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml
===================================================================
diff -u -r40800 -r40809
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40800)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40809)
@@ -3,6 +3,18 @@
 <Class name="WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender">
 <Super>APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate,TECH.Mockable</Super>
 
+<Method name="%OnNew">
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(CommunicatieServiceLocator)	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefRequestType">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.enu.RequestType</ReturnType>
Index: vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/Test.cls.xml
===================================================================
diff -u
--- vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/Test.cls.xml	(revision 0)
+++ vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/Test.cls.xml	(revision 40809)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Integratie.WSimpl.AX.Transport.GLS.v01.RegistrationService.Test">
+<Super>vhTest.Integratie.TestCase</Super>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>TestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##super(TestName)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("vhPRINTER_BestandNaam_DoorverwijzingActief",$$$True,..#Applicatie)
+	do ##class(vhTest.Fake.TECH.File.FileNameGenerator).Activeer()
+]]></Implementation>
+</Method>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Set CommunicationServiceLocatorFake = ##class(vhTest.Integratie.WSimpl.AX.Transport.GLS.v01.RegistrationService.CommunicationServiceLocatorFake).%New()
+	Set RegisterContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer).%New(,,,,CommunicationServiceLocatorFake)
+	
+	#Dim Response As WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
+	
+	Set Response =  RegisterContainer.RegisterContainer(..GeefRequest())
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequest">
+<ReturnType>WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer</ReturnType>
+<Implementation><![CDATA[
+	Set Request = ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).%New()
+	Set Request.GeleverdAanKlantNummer = 1
+	Set Request.LeveringNummer = "123456"
+	
+	Set Request.AantalVerpakkingEenhedenTotaal = 4
+	Set Request.Gewicht = 1200
+	Set Request.EmailVoorBevestiging = "IntegratieTest@vanhoecke.be"
+	Set Request.Referentie = "12345X123456"
+	Set Request.Telefoon = "09/333.33.33"
+	
+	Set Request.LabelPrinterId = "labelprinterid"
+	Set Request.TransportWerkpostComputerNaam = "computernaam"
+	
+	Set Request.LeverAdres = ..BelgischLeveringAdres() ;
+	
+	Set Request.AfzenderAdres = ..BelgischAfzenderAdres()
+	
+	Set Request.OphaalTijdstip = "2017-03-22 15:04:05"
+	
+	
+	Set VerpakkingEenheid = ##class(WS.AX.Transport.GLS.v01.dto.VerpakkingEenheid).%New()
+	Set VerpakkingEenheid.VerpakkingEenheidId = "EenheidID"
+	Set VerpakkingEenheid.Volgnummer = 1
+	Set VerpakkingEenheid.Gewicht = 300
+	Set VerpakkingEenheid.Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()
+
+	Set Request.Container = VerpakkingEenheid
+	
+	
+	quit Request
+]]></Implementation>
+</Method>
+
+<Method name="BelgischLeveringAdres">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WS.AX.Transport.GLS.v01.dto.LeveringAdres</ReturnType>
+<Implementation><![CDATA[
+	Set Adres = ##class(WS.AX.Transport.GLS.v01.dto.LeveringAdres).%New()
+	Set Adres.Aanspreking = "Dhr"
+	Set Adres.Toenaam = "Jos"
+	Set Adres.LandCode = "BE"
+	Set Adres.Naam = "Integratie Klant"
+	Set Adres.Postcode = "9100"
+	Set Adres.Straat = "EUROPARK - NOORD 9"
+	Set Adres.Taal = "N"
+	Set Adres.Woonplaats = "Sint-Niklaas"
+	;Do Adres.Opmerkingen.Insert("opmerking1")
+	;Do Adres.Opmerkingen.Insert("opmerking2")
+	;Set Adres.Volmacht = "Volmacht"
+	Quit Adres
+]]></Implementation>
+</Method>
+
+<Method name="BelgischAfzenderAdres">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WS.AX.Transport.GLS.v01.dto.Adres</ReturnType>
+<Implementation><![CDATA[
+	Set Adres = ##class(WS.AX.Transport.GLS.v01.dto.Adres).%New()
+	Set Adres.Aanspreking = "Dhr"
+	Set Adres.Toenaam = "Toenaam"
+	Set Adres.LandCode = "BE"
+	Set Adres.Naam = "Een Belg"
+	Set Adres.Postcode = "9100"
+	Set Adres.Straat = "Ankerstraat 91"
+	Set Adres.Taal = "N"
+	Set Adres.Woonplaats = "Sint-Niklaas"
+	Quit Adres
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	
+	Kill %UnitID
+	
+	Do ##class(vhTest.Integratie.TestCase.OnAfterOneTest).%New().Exec(..Debug)
+	do ..DataExporteerder.ResetBestandTeller()
+	do ..UndoResetPersistentData()
+	do ##class(vhTest.Fake.TECH.File.FileNameGenerator).Instance().Reset()
+	do ##super(aTestName)
+	quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/UnitIdBepalerFake.cls.xml
===================================================================
diff -u
--- vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/UnitIdBepalerFake.cls.xml	(revision 0)
+++ vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/UnitIdBepalerFake.cls.xml	(revision 40809)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Integratie.WSimpl.AX.Transport.GLS.v01.RegistrationService.UnitIdBepalerFake">
+<Super>APPS.TRANSP.GLS.GLSv1.impl.UnitIdBepaler</Super>
+
+<Method name="GeefUnitID">
+<FormalSpec>VerzendWijze:APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	If '$D(%UnitID) {
+		Set %UnitID = 1123456788
+	}Else{
+		Set %UnitID = %UnitID + 1	
+	}
+	Quit %UnitID
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml
===================================================================
diff -u -r40779 -r40809
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 40779)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 40809)
@@ -24,14 +24,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>RegisterContainerRequestConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor,RegistreerBerichtVerzender:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender,VerzendDataConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</FormalSpec>
+<FormalSpec>RegisterContainerRequestConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor,RegistreerBerichtVerzender:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender,VerzendDataConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter,CommunicationServiceLocator:APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..RegisterContainerRequestConvertor = $$$Inject(RegisterContainerRequestConvertor,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New())
-	Set ..RegistreerBerichtVerzender = $$$Inject(RegistreerBerichtVerzender,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New())
+	Set ..RegistreerBerichtVerzender = $$$Inject(RegistreerBerichtVerzender,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New(CommunicationServiceLocator))
 	Set ..VerzendDataConvertor = $$$Inject(VerzendDataConvertor,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor).%New())
 	Set ..EtiketPrinter = $$$Inject(EtiketPrinter,##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New())
 	Quit $$$OK
@@ -42,7 +42,6 @@
 <FormalSpec>Request:WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest</FormalSpec>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
 <Implementation><![CDATA[
-	
 	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..RegisterContainerRequestConvertor.ConverteerNaarLeveringInfo(Request)
 	#Dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
 	#Dim VerzendData as APPS.TRANSP.GLS.data.VerzendData
Index: vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/CommunicationServiceLocatorFake.cls.xml
===================================================================
diff -u
--- vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/CommunicationServiceLocatorFake.cls.xml	(revision 0)
+++ vhTest/Integratie/WSimpl/AX/Transport/GLS/v01/RegistrationService/CommunicationServiceLocatorFake.cls.xml	(revision 40809)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Integratie.WSimpl.AX.Transport.GLS.v01.RegistrationService.CommunicationServiceLocatorFake">
+<Super>APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</Super>
+
+<Method name="GeefUnitIDBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
+<Implementation><![CDATA[	quit ##class(vhTest.Integratie.WSimpl.AX.Transport.GLS.v01.RegistrationService.UnitIdBepalerFake).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequestBouwer">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New($this)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>