Index: vhUnitTest/AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository/Test.cls.xml
===================================================================
diff -u -r34743 -r34788
--- vhUnitTest/AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34743)
+++ vhUnitTest/AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34788)
@@ -41,22 +41,46 @@
 	
 	set Repo = ##class(AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.impl.TransactionRepository).%New()
 	
-	#dim List1 As %ListOfObjects = Repo.ZoekViaTransactionID(1)
+	#dim Transaction As AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.Transactions
+	#dim Iterator1 As TECH.Iterator = Repo.ZoekViaTransactionID(1)
 	
-	if $$$AssertEquals(List1.Count(),3) {
-		do $$$AssertEquals(List1.GetAt(1).RECID,"100000001")	
-		do $$$AssertEquals(List1.GetAt(2).RECID,"100000002")	
-		do $$$AssertEquals(List1.GetAt(3).RECID,"100000003")	
-	}
+	Do $$$AssertTrue(Iterator1.HasNext(),"")
+	Set Transaction = Iterator1.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"100000001","")
 	
-	#dim List2 As %ListOfObjects = Repo.ZoekViaTransactionID(2)
-	if $$$AssertEquals(List2.Count(),5) {
-		do $$$AssertEquals(List2.GetAt(1).RECID,"200000001")	
-		do $$$AssertEquals(List2.GetAt(2).RECID,"200000002")	
-		do $$$AssertEquals(List2.GetAt(3).RECID,"200000003")
-		do $$$AssertEquals(List2.GetAt(4).RECID,"200000004")	
-		do $$$AssertEquals(List2.GetAt(5).RECID,"200000005")		
-	}
+	Do $$$AssertTrue(Iterator1.HasNext(),"")
+	Set Transaction = Iterator1.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"100000002","") 
+	
+	Do $$$AssertTrue(Iterator1.HasNext(),"")
+	Set Transaction = Iterator1.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"100000003","")
+	
+	Do $$$AssertFalse(Iterator1.HasNext(),"")
+	
+	#dim Iterator2 As TECH.Iterator = Repo.ZoekViaTransactionID(2)
+	
+	Do $$$AssertTrue(Iterator2.HasNext(),"")
+	Set Transaction = Iterator2.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"200000001","")
+	
+	Do $$$AssertTrue(Iterator2.HasNext(),"")
+	Set Transaction = Iterator2.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"200000002","") 
+	
+	Do $$$AssertTrue(Iterator2.HasNext(),"")
+	Set Transaction = Iterator2.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"200000003","")
+	
+	Do $$$AssertTrue(Iterator2.HasNext(),"")
+	Set Transaction = Iterator2.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"200000004","")
+	
+	Do $$$AssertTrue(Iterator2.HasNext(),"")
+	Set Transaction = Iterator2.Next() 
+	Do $$$AssertEquals(Transaction.RECID,"200000005","")
+	
+	Do $$$AssertFalse(Iterator2.HasNext(),"")
 
 	do ##class(AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.TransactionsLocal).%DeleteExtent()
 ]]></Implementation>
Index: AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml
===================================================================
diff -u -r34780 -r34788
--- AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 34780)
+++ AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 34788)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.impl.TransactionRepository">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
 <Property name="ClassMethodExecuter">
 <Type>TECH.Executer.ClassMethod</Type>
@@ -51,7 +51,7 @@
 
 <Method name="ZoekViaTransactionID">
 <FormalSpec>Id:%String</FormalSpec>
-<ReturnType>%ListOfObjects</ReturnType>
+<ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	set List = ##class(%ListOfObjects).%New()
 	
@@ -64,7 +64,7 @@
 		do List.Insert(..GeefViaID(ResultSet.GetData(1)))	
 	}
 
-	quit List
+	quit ##class(TECH.ListIterator).%New(List)
 ]]></Implementation>
 </Method>
 </Class>