Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r35457 -r35458
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35457)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35458)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.Uitgaand.common.impl.AifGenerator">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="FileWriter">
 <Type>AX.common.impl.FileWriter</Type>
Index: vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(revision 0)
+++ vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(revision 35458)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AX.Uitgaand.common.impl.AifGenerator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.common.impl.AifGenerator</Super>
+
+<Method name="Generate">
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="GenerateCustomers">
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="GenerateSalesInvoice">
+<FormalSpec>FactuurId:%String</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="GenerateSalesInvoices">
+<FormalSpec>Datum:%String</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(revision 0)
+++ vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(revision 35458)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.common.impl.AifGenerator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Generate">
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Generate",Request)
+]]></Implementation>
+</Method>
+
+<Method name="GenerateCustomers">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GenerateCustomers")
+]]></Implementation>
+</Method>
+
+<Method name="GenerateSalesInvoice">
+<FormalSpec>FactuurId:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GenerateSalesInvoice",FactuurId)
+]]></Implementation>
+</Method>
+
+<Method name="GenerateSalesInvoices">
+<FormalSpec>Datum:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GenerateSalesInvoices",Datum)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml	(revision 35458)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: read NOK -&gt; create klant uitvoeren">
+<Implementation><![CDATA[
+	#dim MessageID = "{123456-GUID-321}"
+	
+	
+	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
+	Set AifMessage.Command = "Customer/UpdatePart1"
+	Set AifMessage.SubjectId = "K||1234"
+	
+	Set MessageRepository = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do MessageRepository.VerwachtMethodCall("GeefViaID",MessageID).DanReturn(AifMessage).ExactAantalKeer(1)
+		
+	Set Envelope = ##class(AXaif.Message.Envelope).%New()
+	Set Envelope.Header.RequestMessageId = MessageID
+	Set Envelope.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified"
+	
+	Set Generator = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
+	Do Generator.VerwachtMethodCall("Generate",..Matches.DataTransferObject(##class(AXimpl.AifMessage.Request).%New("Customer/Create","K||1234"))).ExactAantalKeer(1)
+	Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepository, Generator)
+	Do UpdaterPart2.Verwerk(Envelope)
+		
+	Do MessageRepository.Verifieer()
+	Do Generator.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Command geen customer/UpdatePart1 -&gt; Geen verwerking">
+<Implementation><![CDATA[
+	#dim MessageID = "{123456-GUID-321}"
+		
+	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
+	Set AifMessage.Command = "SalesInvoice/Create"
+	Set AifMessage.SubjectId = "123456"
+	
+	Set MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do MessageRepositoryStub.IndienMethodCall("GeefViaID",MessageID).DanReturn(AifMessage).ExactAantalKeer(1)
+		
+	Set Envelope = ##class(AXaif.Message.Envelope).%New()
+	Set Envelope.Header.RequestMessageId = MessageID
+
+	Set GeneratorMock = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
+	Do GeneratorMock.VerwachtMethodCall("Generate",$$$ElkeWaarde).ExactAantalKeer(0)
+	Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepositoryStub, GeneratorMock)
+	Do UpdaterPart2.Verwerk(Envelope)
+	
+	Do GeneratorMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(revision 0)
+++ AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(revision 35458)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2">
+<Super>TECH.PubSub.EventHandler</Super>
+
+<Method name="StartVerwerking">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ResponseReceivedEvent:AX.AifMessage.event.AifResponseReceivedEvent</FormalSpec>
+<Implementation><![CDATA[	do ..%New().Verwerk(ResponseReceivedEvent.Data.Message)
+]]></Implementation>
+</Method>
+
+<Property name="MessageRepository">
+<Type>AX.AifMessage.MessageRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Generator">
+<Type>AX.Uitgaand.common.impl.AifGenerator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>MessageRepository:AX.AifMessage.MessageRepository,Generator:AX.Uitgaand.common.impl.AifGenerator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..MessageRepository = $$$Inject(MessageRepository, ##class(AXdata.AifMessage.MessageRepository).%New())
+	Set ..Generator = $$$Inject(Generator, ##class(AX.Uitgaand.common.impl.AifGenerator).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Verwerk">
+<FormalSpec>Envelope:AXaif.Message.Envelope</FormalSpec>
+<Implementation><![CDATA[
+	#dim AifMessage As AXdata.AifMessage.Message = ..MessageRepository.GeefViaID(Envelope.Header.RequestMessageId)
+	
+	if (AifMessage.Command = "Customer/UpdatePart1") {
+		Do:(Envelope.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified") ..Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/Create",AifMessage.SubjectId))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>