Index: vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml
===================================================================
diff -u -r41866 -r41868
--- vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 41866)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 41868)
@@ -18,15 +18,43 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FaultMessageList">
+<Type>AXaif.Fault.AxdFaultMessageList</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="FailedMessageRepositoryMock">
 <Type>vhTest.Mock.AX.AifMessage.FailedMessageRepository</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="ResponseMessage">
+<Type>AXaif.Message.Envelope</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MessageStream">
+<Type>%GlobalCharacterStream</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MailFake">
+<Type>vhTest.Fake.TECH.Mail.Mail</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MailApiMock">
+<Type>vhTest.Mock.TECH.Mail.MailAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
  	Do ##super(aTestName)
+ 	
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	
 	Set ..StoredMessage = ..GetStoredMessage()
 	
 	Set ..MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
@@ -35,33 +63,35 @@
 	
 	Set ..FailedMessage = ##class(AXdata.AifMessage.FailedMessage).%New()
 	
+	Set ..FaultMessageList = ##class(AXaif.Fault.AxdFaultMessageList).%New()
+	
 	Set ..FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
+	
+	Set ..ResponseMessage = ##class(AXaif.Message.Envelope).%New()
+	Set ..ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
+	Set ..ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
+	
+	Set ..MessageStream = ##class(%GlobalCharacterStream).%New()
+	
+	Set ..MailFake = ##class(vhTest.Fake.TECH.Mail.Mail).%New()
+	Set ..MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
+	Do ..MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(..MailFake)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Standaard gedrag">
+<Method name="Test: Standaardgedrag">
 <Implementation><![CDATA[
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
-	
 	Do ..MessageRepositoryStub.VerwachtMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(..StoredMessage)
 	Do ..MessageRepositoryStub.VerwachtMethodCall("Bewaar",..StoredMessage)
 	
 	Do ..FailedMessageRepositoryMock.VerwachtMethodCall("Maak").ExactAantalKeer(0)
-		
-	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
-	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
-	set ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
 
-	set MessageStream = ##class(%GlobalCharacterStream).%New()
-	do MessageStream.Write("<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
+	Do ..MessageStream.Write("<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
 	
-	Set MailFake = ##class(vhTest.Fake.TECH.Mail.Mail).%New()
-	Set MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
-	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
+	Do ..MailApiMock.VerwachtMethodCall("VerstuurMail",..MailFake).ExactAantalKeer(0)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
-	do ReponseLogger.Log(ResponseMessage,MessageStream)
+	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")
@@ -72,113 +102,79 @@
 	
 	do ..MessageRepositoryStub.Verifieer()
 	do ..FailedMessageRepositoryMock.Verifieer()
-	do MailApiMock.Verifieer()
+	do ..MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Foutief gedrag - Fault met code">
 <Implementation><![CDATA[
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
-	
 	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}"
-	set ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
-	set ResponseMessage.Body.MessageParts.Fault.Code = "Error"
 	
-	set FaultMessageList = ##class(AXaif.Fault.AxdFaultMessageList).%New()
-	do FaultMessageList.FaultMessage.SetAt("ErrorDetail","Error")
-	do ResponseMessage.Body.MessageParts.Fault.Detail.FaultMessageList.Insert(FaultMessageList)
-
-	set MessageStream = ##class(%GlobalCharacterStream).%New()
+	Set ..ResponseMessage.Body.MessageParts.Fault.Code = "Error"
 	
-	Set MailFake = ##class(vhTest.Fake.TECH.Mail.Mail).%New()
-	Set MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
-	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(1)
+	Do ..FaultMessageList.FaultMessage.SetAt("ErrorDetail","Error")
+	Do ..ResponseMessage.Body.MessageParts.Fault.Detail.FaultMessageList.Insert(..FaultMessageList)
 	
-	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,MailApiMock)
-	do ReponseLogger.Log(ResponseMessage,MessageStream)
+	Do ..MailApiMock.VerwachtMethodCall("VerstuurMail",..MailFake).ExactAantalKeer(1)
 	
+	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 ..FailedMessageRepositoryMock.Verifieer()
-	do MailApiMock.Verifieer()
+	do ..MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: NoFaultCode -&gt; geen mail versturen">
 <Implementation><![CDATA[
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 	
 	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}"
-	set ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
 	
-	set FaultMessageList = ##class(AXaif.Fault.AxdFaultMessageList).%New()
-	set ResponseMessage.Body.MessageParts.Fault.Code = "NoFaultCode"
-	do ResponseMessage.Body.MessageParts.Fault.Reason.Text.SetAt("ErrorReason","EN-US")
+	Set ..ResponseMessage.Body.MessageParts.Fault.Code = "NoFaultCode"
+	Do ..ResponseMessage.Body.MessageParts.Fault.Reason.Text.SetAt("ErrorReason","EN-US")
 
-	set MessageStream = ##class(%GlobalCharacterStream).%New()
+	Do ..MailApiMock.VerwachtMethodCall("VerstuurMail",..MailFake).ExactAantalKeer(0)
 	
-	Set MailFake = ##class(vhTest.Fake.TECH.Mail.Mail).%New()
-	Set MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
-	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,..MailApiMock)
+	Do ReponseLogger.Log(..ResponseMessage,..MessageStream)
 	
-	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 ..FailedMessageRepositoryMock.Verifieer()
-	do MailApiMock.Verifieer()
+	do ..MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: NoValidDocumentIdentified -&gt; geen mail versturen">
 <Implementation><![CDATA[
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
-	
 	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}"
-	set ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
 	
-	set FaultMessageList = ##class(AXaif.Fault.AxdFaultMessageList).%New()
-	set ResponseMessage.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified"
-	do ResponseMessage.Body.MessageParts.Fault.Reason.Text.SetAt("ErrorReason","EN-US")
+	Set ..ResponseMessage.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified"
+	Do ..ResponseMessage.Body.MessageParts.Fault.Reason.Text.SetAt("ErrorReason","EN-US")
 
-	set MessageStream = ##class(%GlobalCharacterStream).%New()
+	Do ..MailApiMock.VerwachtMethodCall("VerstuurMail",..MailFake).ExactAantalKeer(0)
 	
-	Set MailFake = ##class(vhTest.Fake.TECH.Mail.Mail).%New()
-	Set MailApiMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
-	Do MailApiMock.IndienMethodCall("MaakNieuwMail").DanReturn(MailFake)
-	Do MailApiMock.VerwachtMethodCall("VerstuurMail",MailFake).ExactAantalKeer(0)
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(..MessageRepositoryStub,..FailedMessageRepositoryMock,..MailApiMock)
+	Do ReponseLogger.Log(..ResponseMessage,..MessageStream)
 	
-	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 ..FailedMessageRepositoryMock.Verifieer()
-	do MailApiMock.Verifieer()
+	do ..MailApiMock.Verifieer()
 ]]></Implementation>
 </Method>