Index: APPS/common/Rapport/BestandGenerator.cls.xml
===================================================================
diff -u -r29059 -r34420
--- APPS/common/Rapport/BestandGenerator.cls.xml	(.../BestandGenerator.cls.xml)	(revision 29059)
+++ APPS/common/Rapport/BestandGenerator.cls.xml	(.../BestandGenerator.cls.xml)	(revision 34420)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.common.Rapport.BestandGenerator">
+<Abstract>1</Abstract>
 <Super>TECH.Interface</Super>
 
 <Method name="MaakBestand">
+<Abstract>1</Abstract>
 <FormalSpec>Data:APPS.common.Rapport.dto.BestandRapportData</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml
===================================================================
diff -u -r29059 -r34420
--- APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 29059)
+++ APPS/common/Rapport/impl/BestandGeneratorTemplate.cls.xml	(.../BestandGeneratorTemplate.cls.xml)	(revision 34420)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.common.Rapport.impl.BestandGeneratorTemplate">
-<Super>TECH.RegisteredObject,APPS.common.Rapport.BestandGenerator</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Property name="Data">
 <Type>APPS.common.Rapport.dto.BestandRapportData</Type>
Index: vhTest/Mock/APPS/common/Rapport/BestandGenerator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/common/Rapport/BestandGenerator.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/common/Rapport/BestandGenerator.cls.xml	(revision 34420)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.common.Rapport.BestandGenerator">
+<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>APPS.common.Rapport.BestandGenerator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="MaakBestand">
+<FormalSpec>Data:APPS.common.Rapport.dto.BestandRapportData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakBestand",Data)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml
===================================================================
diff -u -r34411 -r34420
--- APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(.../BestandRapportDataObjectIteratorBased.cls.xml)	(revision 34411)
+++ APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(.../BestandRapportDataObjectIteratorBased.cls.xml)	(revision 34420)
@@ -14,15 +14,6 @@
 <Property name="BestandVolledigeNaam">
 <Type>%String</Type>
 </Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/common/Rapport/impl/BestandGenerator/MaakBestand/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/common/Rapport/impl/BestandGenerator/MaakBestand/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/common/Rapport/impl/BestandGenerator/MaakBestand/Test.cls.xml	(revision 34420)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.common.Rapport.impl.BestandGenerator.MaakBestand.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test : Verzekeren dat een specifiek data-inputobject de correct implementatie-klasse gebruikt.">
+<Implementation><![CDATA[
+	do ..AssertGenerator(##class(APPS.common.Rapport.dto.BestandRapportDataResultSetBased).%New(),"APPS.common.Rapport.impl.BestandGeneratorResultSetBased")
+	do ..AssertGenerator(##class(APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased).%New(),"APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased")
+	do ..AssertGenerator(##class(APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased).%New(),"APPS.common.Rapport.impl.BestandGeneratorObjectIteratorBased")
+]]></Implementation>
+</Method>
+
+<Method name="AssertGenerator">
+<FormalSpec>Data:APPS.common.Rapport.dto.BestandRapportData,ClassName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set StubGenerator = ##class(vhTest.Mock.APPS.common.Rapport.BestandGenerator).%New()
+	do StubGenerator.IndienMethodCall("MaakBestand",Data).DanReturn("c:\filename.txt")
+	
+	set ObjectApiMock = ##class(vhTest.Mock.TECH.Object.ObjectAPI).%New()
+	do ObjectApiMock.VerwachtMethodCall("New",ClassName).DanReturn(StubGenerator)
+	
+	set Generator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New(ObjectApiMock)
+	
+	do $$$AssertEquals(Generator.MaakBestand(Data),"c:\filename.txt")
+	
+	do ObjectApiMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/Rapport/impl/BestandGenerator.cls.xml
===================================================================
diff -u
--- APPS/common/Rapport/impl/BestandGenerator.cls.xml	(revision 0)
+++ APPS/common/Rapport/impl/BestandGenerator.cls.xml	(revision 34420)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Rapport.impl.BestandGenerator">
+<Super>TECH.RegisteredObject,APPS.common.Rapport.BestandGenerator</Super>
+
+<Property name="ObjectAPI">
+<Type>TECH.Object.ObjectAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ObjectAPI:TECH.Object.ObjectAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ObjectAPI = $$$Inject(ObjectAPI,##class(TECH.Context).Instance().GeefObjectAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakBestand">
+<FormalSpec>Data:APPS.common.Rapport.dto.BestandRapportData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Generator As APPS.common.Rapport.impl.BestandGeneratorTemplate = ..ObjectAPI.New("APPS.common.Rapport.impl.BestandGenerator"_$piece($classname(Data),"APPS.common.Rapport.dto.BestandRapportData",2))
+	quit Generator.MaakBestand(Data)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>