Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r48807 -r49223
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48807)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 49223)
@@ -163,7 +163,7 @@
 ]]></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))
@@ -177,12 +177,62 @@
 	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>