Index: APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml
===================================================================
diff -u
--- APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(revision 0)
+++ APPS/common/Rapport/dto/BestandRapportDataObjectIteratorBased.cls.xml	(revision 34411)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased">
+<Super>APPS.common.Rapport.dto.BestandRapportData</Super>
+
+<Property name="DataVelden">
+<Type>TECH.KeyValue.List</Type>
+</Property>
+
+<Property name="Iterator">
+<Type>TECH.Iterator</Type>
+</Property>
+
+<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>
+
+
+</Export>
Index: vhUnitTest/APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased/MaakBestand/TestBestandInhoud.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased/MaakBestand/TestBestandInhoud.cls.xml	(revision 0)
+++ vhUnitTest/APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased/MaakBestand/TestBestandInhoud.cls.xml	(revision 34411)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.common.Rapport.impl.BestandGeneratorObjectIteratorBased.MaakBestand.TestBestandInhoud">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="BestandVolledigeNaam">
+<Type>%String</Type>
+<Default>c:\foldernaam\bestand1.txt</Default>
+</Parameter>
+
+<Method name="TestBestand">
+<Implementation><![CDATA[
+	Set FileWriterMock = ##class(vhTest.Fake.TECH.File.FileWriter).%New()
+	
+	Set Headers = ##class(TECH.KeyValue.List).%New() 
+	Do Headers.InsertKeyValue("vhTest.Dummy.TECH.DataTransferObject", "String")
+	Do Headers.InsertKeyValue("vhTest.Dummy.TECH.DataTransferObject", "Integer")
+	Do Headers.InsertKeyValue("vhTest.Dummy.TECH.DataTransferObject", "Decimal")
+	
+	set Objects = ##class(%ListOfObjects).%New()
+	do Objects.Insert(##class(vhTest.Dummy.TECH.DataTransferObject).%New("String1",1,11.11))
+	do Objects.Insert(##class(vhTest.Dummy.TECH.DataTransferObject).%New("String2",2,22.22))
+	
+	Set BestandRapportDataDataTransferObjectBased = ##class(APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased).%New()
+	Set BestandRapportDataDataTransferObjectBased.BestandVolledigeNaam = ..#BestandVolledigeNaam
+	Set BestandRapportDataDataTransferObjectBased.DataVelden = Headers
+	set BestandRapportDataDataTransferObjectBased.Iterator = ##class(TECH.ListIterator).%New(Objects)
+	
+	set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGeneratorObjectIteratorBased).%New(FileWriterMock)
+	#dim BestandVolledigeNaam As %String = BestandGenerator.MaakBestand(BestandRapportDataDataTransferObjectBased)
+	Do $$$AssertEquals(BestandVolledigeNaam, ..#BestandVolledigeNaam)
+	
+	#dim BestandInhoud As %Stream = FileWriterMock.GeefInhoudBestandNaam(BestandVolledigeNaam)
+	Do $$$AssertEquals(BestandInhoud.ReadLine(),"String"_$$$TAB_"Integer"_$$$TAB_"Decimal")
+	Do $$$AssertEquals(BestandInhoud.ReadLine(),"String1"_$$$TAB_"1"_$$$TAB_"11.11")
+	Do $$$AssertEquals(BestandInhoud.ReadLine(),"String2"_$$$TAB_"2"_$$$TAB_"22.22")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased.cls.xml
===================================================================
diff -u
--- APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased.cls.xml	(revision 0)
+++ APPS/common/Rapport/impl/BestandGeneratorObjectIteratorBased.cls.xml	(revision 34411)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Rapport.impl.BestandGeneratorObjectIteratorBased">
+<Super>APPS.common.Rapport.impl.BestandGeneratorTemplate</Super>
+
+<Property name="Data">
+<Type>APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DataTransferObject">
+<Type>TECH.DataTransferObject</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Init">
+<Private>1</Private>
+</Method>
+
+<Method name="Next">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim HasNext As %Boolean = ..Data.Iterator.HasNext()
+	If HasNext {
+		Set ..DataTransferObject = ..Data.Iterator.Next()
+	}
+	Quit HasNext
+]]></Implementation>
+</Method>
+
+<Method name="GetData">
+<FormalSpec>DataIndex:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim EigenschapNaam As %String = ..Data.DataVelden.GetAt(DataIndex).Value
+	Quit $Property(..DataTransferObject, EigenschapNaam)
+]]></Implementation>
+</Method>
+
+<Method name="Close">
+<Private>1</Private>
+</Method>
+</Class>
+
+
+</Export>