Index: vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml
===================================================================
diff -u -r41761 -r41866
--- vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 41761)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 41866)
@@ -3,18 +3,50 @@
 <Class name="vhUnitTest.AXimpl.AifMessage.EventHandler.ResponseLogger.Log.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="MessageRepositoryStub">
+<Type>vhTest.Mock.AX.AifMessage.MessageRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="StoredMessage">
+<Type>AXdata.AifMessage.Message</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FailedMessage">
+<Type>AXdata.AifMessage.FailedMessage</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FailedMessageRepositoryMock">
+<Type>vhTest.Mock.AX.AifMessage.FailedMessageRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+ 	Do ##super(aTestName)
+	Set ..StoredMessage = ..GetStoredMessage()
+	
+	Set ..MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do ..MessageRepositoryStub.IndienMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(..StoredMessage)
+	Do ..MessageRepositoryStub.IndienMethodCall("Bewaar",..StoredMessage)
+	
+	Set ..FailedMessage = ##class(AXdata.AifMessage.FailedMessage).%New()
+	
+	Set ..FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 	
-	#dim StoredMessage As AXdata.AifMessage.Message = ..GetStoredMessage()
+	Do ..MessageRepositoryStub.VerwachtMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(..StoredMessage)
+	Do ..MessageRepositoryStub.VerwachtMethodCall("Bewaar",..StoredMessage)
 	
-	set MessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
-	do MessageRepositoryMock.VerwachtMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(StoredMessage)
-	do MessageRepositoryMock.VerwachtMethodCall("Bewaar",StoredMessage)
-	
-	set FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Maak").ExactAantalKeer(0)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Maak").ExactAantalKeer(0)
 		
 	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
 	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
@@ -28,18 +60,18 @@
 	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
 	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(MessageRepositoryMock,FailedMessageRepositoryMock,MailApiMock)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
 	do ReponseLogger.Log(ResponseMessage,MessageStream)
 	
-	do $$$AssertEquals(StoredMessage.Status,"Processed")
-	do $$$AssertEquals(StoredMessage.Action,"http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create")
-	do $$$AssertEquals(StoredMessage.Request.TimeStamp,"2011-06-30 09:00:00")
-	do $$$AssertEquals(StoredMessage.Request.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Request")
-	do $$$AssertEquals(StoredMessage.Response.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
-	do $$$AssertEquals(StoredMessage.Response.TimeStamp,"2011-06-30 09:15:00")
+	do $$$AssertEquals(..StoredMessage.Status,"Processed")
+	do $$$AssertEquals(..StoredMessage.Action,"http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create")
+	do $$$AssertEquals(..StoredMessage.Request.TimeStamp,"2011-06-30 09:00:00")
+	do $$$AssertEquals(..StoredMessage.Request.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Request")
+	do $$$AssertEquals(..StoredMessage.Response.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
+	do $$$AssertEquals(..StoredMessage.Response.TimeStamp,"2011-06-30 09:15:00")
 	
-	do MessageRepositoryMock.Verifieer()
-	do FailedMessageRepositoryMock.Verifieer()
+	do ..MessageRepositoryStub.Verifieer()
+	do ..FailedMessageRepositoryMock.Verifieer()
 	do MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -48,16 +80,8 @@
 <Implementation><![CDATA[
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 	
-	#dim StoredMessage As AXdata.AifMessage.Message = ..GetStoredMessage()
-	set MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
-	do MessageRepositoryStub.IndienMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(StoredMessage)
-	do MessageRepositoryStub.IndienMethodCall("Bewaar",StoredMessage)
-	
-	set FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
-	
-	set FailedMessage = ##class(AXdata.AifMessage.FailedMessage).%New()
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(FailedMessage)
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(..FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",..FailedMessage)
 		
 	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
 	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
@@ -75,15 +99,15 @@
 	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
 	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(1)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(MessageRepositoryStub,FailedMessageRepositoryMock,MailApiMock)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
 	do ReponseLogger.Log(ResponseMessage,MessageStream)
 	
-	do $$$AssertEquals(FailedMessage.Message,StoredMessage)
-	do $$$AssertEquals(FailedMessage.Error.Code,"Error")
-	do $$$AssertEquals(FailedMessage.Error.Detail,"ErrorDetail")
-	do $$$AssertEquals(FailedMessage.TimeStamp,"2011-06-30 09:15:00")
+	do $$$AssertEquals(..FailedMessage.Message,..StoredMessage)
+	do $$$AssertEquals(..FailedMessage.Error.Code,"Error")
+	do $$$AssertEquals(..FailedMessage.Error.Detail,"ErrorDetail")
+	do $$$AssertEquals(..FailedMessage.TimeStamp,"2011-06-30 09:15:00")
 	
-	do FailedMessageRepositoryMock.Verifieer()
+	do ..FailedMessageRepositoryMock.Verifieer()
 	do MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -92,16 +116,8 @@
 <Implementation><![CDATA[
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 	
-	#dim StoredMessage As AXdata.AifMessage.Message = ..GetStoredMessage()
-	set MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
-	do MessageRepositoryStub.IndienMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(StoredMessage)
-	do MessageRepositoryStub.IndienMethodCall("Bewaar",StoredMessage)
-	
-	set FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
-	
-	set FailedMessage = ##class(AXdata.AifMessage.FailedMessage).%New()
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(FailedMessage)
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(..FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",..FailedMessage)
 		
 	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
 	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
@@ -118,15 +134,15 @@
 	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
 	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(MessageRepositoryStub,FailedMessageRepositoryMock,MailApiMock)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
 	do ReponseLogger.Log(ResponseMessage,MessageStream)
 	
-	do $$$AssertEquals(FailedMessage.Message,StoredMessage)
-	do $$$AssertEquals(FailedMessage.Error.Code,"NoFaultCode")
-	do $$$AssertEquals(FailedMessage.Error.Detail,"ErrorReason")
-	do $$$AssertEquals(FailedMessage.TimeStamp,"2011-06-30 09:15:00")
+	do $$$AssertEquals(..FailedMessage.Message,..StoredMessage)
+	do $$$AssertEquals(..FailedMessage.Error.Code,"NoFaultCode")
+	do $$$AssertEquals(..FailedMessage.Error.Detail,"ErrorReason")
+	do $$$AssertEquals(..FailedMessage.TimeStamp,"2011-06-30 09:15:00")
 	
-	do FailedMessageRepositoryMock.Verifieer()
+	do ..FailedMessageRepositoryMock.Verifieer()
 	do MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -135,16 +151,8 @@
 <Implementation><![CDATA[
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 	
-	#dim StoredMessage As AXdata.AifMessage.Message = ..GetStoredMessage()
-	set MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
-	do MessageRepositoryStub.IndienMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(StoredMessage)
-	do MessageRepositoryStub.IndienMethodCall("Bewaar",StoredMessage)
-	
-	set FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
-	
-	set FailedMessage = ##class(AXdata.AifMessage.FailedMessage).%New()
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(FailedMessage)
-	do FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(..FailedMessage)
+	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Bewaar",..FailedMessage)
 		
 	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
 	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
@@ -161,15 +169,15 @@
 	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
 	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(MessageRepositoryStub,FailedMessageRepositoryMock,MailApiMock)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
 	do ReponseLogger.Log(ResponseMessage,MessageStream)
 	
-	do $$$AssertEquals(FailedMessage.Message,StoredMessage)
-	do $$$AssertEquals(FailedMessage.Error.Code,"NoValidDocumentIdentified")
-	do $$$AssertEquals(FailedMessage.Error.Detail,"ErrorReason")
-	do $$$AssertEquals(FailedMessage.TimeStamp,"2011-06-30 09:15:00")
+	do $$$AssertEquals(..FailedMessage.Message,..StoredMessage)
+	do $$$AssertEquals(..FailedMessage.Error.Code,"NoValidDocumentIdentified")
+	do $$$AssertEquals(..FailedMessage.Error.Detail,"ErrorReason")
+	do $$$AssertEquals(..FailedMessage.TimeStamp,"2011-06-30 09:15:00")
 	
-	do FailedMessageRepositoryMock.Verifieer()
+	do ..FailedMessageRepositoryMock.Verifieer()
 	do MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>