Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r42343 -r49223
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 49223)
@@ -9,7 +9,7 @@
 
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	do ##class(TECH.Config.ConfigMgr).Instance().WisSleutel("AX_AIF_RequestPath",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().WisSleutel("AX_IF_OUT_RequestPath",..#Applicatie)
 	do ##super()
 ]]></Implementation>
 </Method>
@@ -26,13 +26,16 @@
 	#dim PartijAPI As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
 	do PartijAPI.IndienMethodCall("GeefPartij",KlantId).DanReturn(##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij())
 
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_OUT_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
+	
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
@@ -47,12 +50,15 @@
 	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
 	
 	#dim KlantId As %String = "K||1234"
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_OUT_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -84,12 +90,15 @@
 	
 	do VerkoopAPI.IndienMethodCall("GeefKlant","K||1234").DanReturn(Klant)
 	
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_OUT_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 	
@@ -110,12 +119,15 @@
 	
 	#dim VerkoopFactuurId As %String = "300500"
 	
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_OUT_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -132,12 +144,15 @@
 	
 	#dim VerkoopFactuurId As %String = "586689"
 	
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_OUT_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -148,26 +163,76 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Indien er een nogeneration needed exception geraiset wordt dan gebeurt er niks">
+<Method name="Test: Indien er een nogeneration needed exception geraiset wordt dan gebeurt er niks en returnwaarde is true">
 <Implementation><![CDATA[
 	set RequestComposerStub = ##class(vhTest.Mock.AXimpl.RequestComposer).%New()
 	do RequestComposerStub.IndienMethodCall("Compose",$$$ElkeWaarde).DanException(##class(AXimpl.NoConversionNeededException).%New($$$DummyString,$$$DummyString))
 	
 	set FileWriterMock = ##class(vhTest.Mock.AXimpl.FileWriter).%New()
 	do FileWriterMock.VerwachtMethodCall("Open",$$$ElkeWaarde).ExactAantalKeer(0)
-	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde).ExactAantalKeer(0)
+	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(0)
 	do FileWriterMock.VerwachtMethodCall("Close",$$$ElkeWaarde).ExactAantalKeer(0)
 	
 	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
 	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent",$$$ElkeWaarde).ExactAantalKeer(0)
 	
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)
-	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create","K||1234"))
 	
+	Do $$$AssertEquals(Generator.Generate(##class(AXimpl.Request).%New("Customer/Create","K||1234")),$$$True)
+	
 	do FileWriterMock.Verifieer()
 	do EventRaiserMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Standaard gedrag indien alles ok returnwaarde true">
+<Implementation><![CDATA[
+	set RequestComposerStub = ##class(vhTest.Mock.AXimpl.RequestComposer).%New()
+	Set Request = ##class(AXimpl.Request).%New("Customer/Create","K||1234")
+	Set Envelope = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	
+	do RequestComposerStub.IndienMethodCall("Compose",$$$ElkeWaarde).DanReturn(Envelope)
+	
+	set FileWriterMock = ##class(vhTest.Mock.AXimpl.FileWriter).%New()
+	do FileWriterMock.VerwachtMethodCall("Open",$$$ElkeWaarde).ExactAantalKeer(1)
+	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(1)
+	do FileWriterMock.VerwachtMethodCall("Close").ExactAantalKeer(1)
+	Do FileWriterMock.VerwachtMethodCall("GetTimeStamp").DanReturn("Timestamp")
+	Do FileWriterMock.VerwachtMethodCall("GetStream").DanReturn(##class(%Library.FileCharacterStream).%New())
+	
+	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
+	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(1)
+	
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)
+	
+	Do $$$AssertEquals(Generator.Generate(##class(AXimpl.Request).%New("Customer/Create","K||1234")),$$$True)
+	
+	do FileWriterMock.Verifieer()
+	do EventRaiserMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien er een andere exceptie geraised wordt dan nogeneration needed returned generate een false">
+<Implementation><![CDATA[
+	set RequestComposerStub = ##class(vhTest.Mock.AXimpl.RequestComposer).%New()
+	do RequestComposerStub.IndienMethodCall("Compose",$$$ElkeWaarde).DanException(##class(TECH.Exceptions.InvalidInputException).%New($$$DummyString))
+	
+	set FileWriterMock = ##class(vhTest.Mock.AXimpl.FileWriter).%New()
+	do FileWriterMock.VerwachtMethodCall("Open",$$$ElkeWaarde).ExactAantalKeer(0)
+	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(0)
+	do FileWriterMock.VerwachtMethodCall("Close",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
+	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)
+	
+	Do $$$AssertEquals(Generator.Generate(##class(AXimpl.Request).%New("Customer/Create","K||1234")),$$$False)
+	
+	do FileWriterMock.Verifieer()
+	do EventRaiserMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>