Index: vhTest/Fake/Prod/ProductRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/Prod/ProductRepository.cls.xml	(revision 0)
+++ vhTest/Fake/Prod/ProductRepository.cls.xml	(revision 37419)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.Prod.ProductRepository">
+<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>Prod.ProductRepository</Super>
+
+<Method name="ZoekViaBarcode">
+<FormalSpec>Barcode:TECH.String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/Prod/ProductRepository.cls.xml
===================================================================
diff -u
--- vhTest/Mock/Prod/ProductRepository.cls.xml	(revision 0)
+++ vhTest/Mock/Prod/ProductRepository.cls.xml	(revision 37419)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.Prod.ProductRepository">
+<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>Prod.ProductRepository,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="ZoekViaBarcode">
+<FormalSpec>Barcode:TECH.String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaBarcode",Barcode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Prod/ProductRepository.cls.xml
===================================================================
diff -u -r37352 -r37419
--- Prod/ProductRepository.cls.xml	(.../ProductRepository.cls.xml)	(revision 37352)
+++ Prod/ProductRepository.cls.xml	(.../ProductRepository.cls.xml)	(revision 37419)
@@ -1,41 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="Prod.ProductRepository">
-<Super>TECH.Persistentie.impl.Repository,TECH.RegisteredObject</Super>
+<Super>TECH.Persistentie.impl.Repository,TECH.Mockable</Super>
 
 <Parameter name="DataClassName">
 <Type>%String</Type>
 <Default>Prod.Product</Default>
 </Parameter>
 
 <Method name="%OnNew">
-<FormalSpec>Gateway:Prod.ProductGateway,QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<FormalSpec>Gateway:Prod.ProductGateway="",QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(Gateway, QueryAPI)
+	Do ##super($$$Inject(Gateway, ##class(Prod.ProductGateway).%New(..#DataClassName)), QueryAPI)
 	
-	Set ..Gateway = $$$Inject(Gateway, ##class(Prod.ProductGateway).%New(..#DataClassName))
-	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaBarcode">
 <FormalSpec>Barcode:TECH.String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[
-	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
-	#dim SqlStatement As TECH.String = "SELECT ID FROM " _ SqlTableName _ " WHERE BarcodeWaarde = ?"
-
-	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $ListBuild(Barcode)))
-	#dim Opener As TECH.Persistentie.Repository.ResultSetItemOpener = ##class(TECH.Persistentie.Repository.ResultSetItemOpener).%New($this)
-	#dim ResultSetIterator As TECH.Iterator = ##class(TECH.ResultSetIterator).%New(ResultSet)
-	#dim Result As TECH.Iterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator, Opener)
-
-	Quit Result
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("BarcodeWaarde = ?", $ListBuild(Barcode))
 ]]></Implementation>
 </Method>
 </Class>