Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r42245 -r42343
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42245)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -28,12 +28,12 @@
 
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	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 FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create",KlantId))
@@ -49,12 +49,12 @@
 	#dim KlantId As %String = "K||1234"
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	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 FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/UpdatePart1",KlantId))
@@ -86,16 +86,16 @@
 	
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	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 FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 	
 	set XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"ReadResponse.xml")
-	#dim ReadResponse As AXaif.Message.Envelope = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
+	#dim ReadResponse As %CacheString = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXif.Dynamics.CustomerOut.Envelope).%ClassName(1),"Envelope")
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/UpdatePart2",KlantId,ReadResponse))
@@ -112,12 +112,12 @@
 	
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	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 FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
@@ -134,12 +134,12 @@
 	
 	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
 	
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
+	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 FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
+	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
@@ -148,44 +148,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: PurchaseInvoice - Create">
-<Implementation><![CDATA[
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
-	
-	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_AIF_RequestPath",..GeefBestandLocatie()_"AIF",..#Applicatie)
-	
-	do ##class(DOM.AKP.AankoopFactuur.data.AankoopFactuur).%KillExtent()
-	
-	set AankoopFactuur = ##class(DOM.AKP.AankoopFactuur.data.AankoopFactuur).%New()
-	set AankoopFactuur.LeverancierID = ##class(DOM.AKP.enu.Leverancier).Blum()
-	set AankoopFactuur.BoekingDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate() - 2
-	set AankoopFactuur.Datum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()
-	set AankoopFactuur.VervalDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate()+20
-	set AankoopFactuur.FactuurIdLeverancier = 848153
-	set AankoopFactuur.Totaal = 105.53
-	set AankoopFactuur.KortingKontant = 3.17
-	set AankoopFactuur.MaatstafVanHeffing = 105.53
-	set AankoopFactuur.BoekingPeriode = "2016.05"
-	do AankoopFactuur.Boekingen.Insert(##class(DOM.AKP.AankoopFactuur.data.BoekhoudBoeking).%New(105.53,604100))
-	do AankoopFactuur.Save()
-
-	set MessageManager = ##class(vhTest.Mock.AX.Uitgaand.common.impl.MessageManager).%New()
-	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
-	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
-
-	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.AifMessage.EventRaiser).%New()
-	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent","PurchaseInvoice/Create",AankoopFactuur.GeefID(),$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
-
-	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,EventRaiserMock)
-	do Generator.Generate(##class(AXimpl.Request).%New("PurchaseInvoice/Create",AankoopFactuur.GeefID()))
-	
-	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
-	
-	do EventRaiserMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Indien er een nogeneration needed exception geraiset wordt dan gebeurt er niks">
 <Implementation><![CDATA[
 	set RequestComposerStub = ##class(vhTest.Mock.AXimpl.RequestComposer).%New()
@@ -196,7 +158,7 @@
 	do FileWriterMock.VerwachtMethodCall("WriteXML",$$$ElkeWaarde).ExactAantalKeer(0)
 	do FileWriterMock.VerwachtMethodCall("Close",$$$ElkeWaarde).ExactAantalKeer(0)
 	
-	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.AifMessage.EventRaiser).%New()
+	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
 	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent",$$$ElkeWaarde).ExactAantalKeer(0)
 	
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)