Index: vhUnitTest/DOM/EC/Winkelkar/impl/LijnRepository/Test.cls.xml
===================================================================
diff -u -r38947 -r38948
--- vhUnitTest/DOM/EC/Winkelkar/impl/LijnRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 38947)
+++ vhUnitTest/DOM/EC/Winkelkar/impl/LijnRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 38948)
@@ -1,61 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.DOM.EC.Winkelkar.impl.LijnRepository.Test">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.DOM.EC.Winkelkar.impl.TestBase</Super>
 
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>DOM.EC.Winkelkar.Lijn</Default>
+</Parameter>
+
+<Parameter name="DataList">
+<Type>%String</Type>
+<Default>ExterneId;</Default>
+</Parameter>
+
+<Parameter name="Columns">
+<Type>%String</Type>
+<Default>ExterneId;</Default>
+</Parameter>
+
 <Method name="Test: BestaatViaExterneId gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
 	#dim ExterneId As %String = $$$DummyInteger
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy($$$DummyInteger)
+	Set LijnRepository = ##class(DOM.EC.Winkelkar.impl.LijnRepository).%New(..MaakGateWayDummy(), ..QueryAPISpy)
 	
-	Set LijnRepository = ##class(DOM.EC.Winkelkar.impl.LijnRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
-	
 	Do LijnRepository.BestaatViaExterneId(ExterneId)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Lijn WHERE ExterneId = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params ,$LB($$$DummyInteger))
+	Do $$$AssertEquals(..QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Lijn WHERE ExterneId = ?")
+	Do $$$AssertEquals(..QueryAPISpy.Params ,$LB($$$DummyInteger))
 ]]></Implementation>
 </Method>
 
 <Method name="Test: GeefViaExterneId gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
 	#dim ExterneId As %String = $$$DummyInteger
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy($$$DummyInteger)
+	Set LijnRepository = ##class(DOM.EC.Winkelkar.impl.LijnRepository).%New(..MaakGateWayDummy(), ..QueryAPISpy)
 	
-	Set LijnRepository = ##class(DOM.EC.Winkelkar.impl.LijnRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
-	
 	Do LijnRepository.GeefViaExterneId(ExterneId)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Lijn WHERE ExterneId = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params ,$LB($$$DummyInteger))
+	Do $$$AssertEquals(..QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Lijn WHERE ExterneId = ?")
+	Do $$$AssertEquals(..QueryAPISpy.Params ,$LB($$$DummyInteger))
 ]]></Implementation>
 </Method>
-
-<Method name="MaakGateWayDummy">
-<Private>1</Private>
-<ReturnType>vhTest.Mock.TECH.Persistent.impl.Gateway</ReturnType>
-<Implementation><![CDATA[
-	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("DOM.EC.Winkelkar.Lijn")
-	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(DOM.EC.Winkelkar.Lijn).%New($$$DummyString))
-	Quit GateWayDummy
-]]></Implementation>
-</Method>
-
-<Method name="MaakQueryAPISpy">
-<FormalSpec>ExterneId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
-<Implementation><![CDATA[
-	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(ExterneId))
-	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("ExterneId"))
-	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
-	
-	Quit QueryAPISpy
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/EC/Winkelkar/impl/WinkelkarRepository/Test.cls.xml
===================================================================
diff -u -r38856 -r38948
--- vhUnitTest/DOM/EC/Winkelkar/impl/WinkelkarRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 38856)
+++ vhUnitTest/DOM/EC/Winkelkar/impl/WinkelkarRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 38948)
@@ -1,61 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.DOM.EC.Winkelkar.impl.WinkelkarRepository.Test">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.DOM.EC.Winkelkar.impl.TestBase</Super>
 
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>DOM.EC.Winkelkar.Winkelkar</Default>
+</Parameter>
+
+<Parameter name="DataList">
+<Type>%String</Type>
+<Default>ExterneId;</Default>
+</Parameter>
+
+<Parameter name="Columns">
+<Type>%String</Type>
+<Default>ExterneId;</Default>
+</Parameter>
+
 <Method name="Test: BestaatViaExterneId gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
 	#dim ExterneId As %String = $$$DummyInteger
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy($$$DummyInteger)
+	Set WinkelkarRepository = ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New(..MaakGateWayDummy(), ..QueryAPISpy)
 	
-	Set WinkelkarRepository = ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
-	
 	Do WinkelkarRepository.BestaatViaExterneId(ExterneId)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Winkelkar WHERE ExterneId = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params ,$LB($$$DummyInteger))
+	Do $$$AssertEquals(..QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Winkelkar WHERE ExterneId = ?")
+	Do $$$AssertEquals(..QueryAPISpy.Params ,$LB($$$DummyInteger))
 ]]></Implementation>
 </Method>
 
 <Method name="Test: GeefViaExterneId gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
 	#dim ExterneId As %String = $$$DummyInteger
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy($$$DummyInteger)
+	Set WinkelkarRepository = ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New(..MaakGateWayDummy(), ..QueryAPISpy)
 	
-	Set WinkelkarRepository = ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
-	
 	Do WinkelkarRepository.GeefViaExterneId(ExterneId)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Winkelkar WHERE ExterneId = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params ,$LB($$$DummyInteger))
+	Do $$$AssertEquals(..QueryAPISpy.Statement,"SELECT ID FROM DOM_EC_Winkelkar.Winkelkar WHERE ExterneId = ?")
+	Do $$$AssertEquals(..QueryAPISpy.Params ,$LB($$$DummyInteger))
 ]]></Implementation>
 </Method>
-
-<Method name="MaakGateWayDummy">
-<Private>1</Private>
-<ReturnType>vhTest.Mock.TECH.Persistent.impl.Gateway</ReturnType>
-<Implementation><![CDATA[
-	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("DOM.EC.Winkelkar.Winkelkar")
-	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(DOM.EC.Winkelkar.Winkelkar).%New($$$DummyString))
-	Quit GateWayDummy
-]]></Implementation>
-</Method>
-
-<Method name="MaakQueryAPISpy">
-<FormalSpec>ExterneId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
-<Implementation><![CDATA[
-	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(ExterneId))
-	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("ExterneId"))
-	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
-	
-	Quit QueryAPISpy
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/EC/Winkelkar/impl/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/EC/Winkelkar/impl/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/DOM/EC/Winkelkar/impl/TestBase.cls.xml	(revision 38948)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.EC.Winkelkar.impl.TestBase">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>DOM.EC.Winkelkar.Lijn</Default>
+</Parameter>
+
+<Parameter name="DataList">
+<Type>%String</Type>
+<Default>ExterneId</Default>
+</Parameter>
+
+<Parameter name="Columns">
+<Type>%String</Type>
+<Default>ExterneId</Default>
+</Parameter>
+
+<Property name="QueryAPISpy">
+<Type>vhTest.Spy.TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..QueryAPISpy = ..MaakQueryAPISpy($$$DummyInteger)
+]]></Implementation>
+</Method>
+
+<Method name="MaakGateWayDummy">
+<Private>1</Private>
+<ReturnType>vhTest.Mock.TECH.Persistent.impl.Gateway</ReturnType>
+<Implementation><![CDATA[
+	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New(..#DataClassName)
+	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(DOM.EC.Winkelkar.Lijn).%New($$$DummyString))
+	Quit GateWayDummy
+]]></Implementation>
+</Method>
+
+<Method name="MaakQueryAPISpy">
+<FormalSpec>ExterneId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
+<Implementation><![CDATA[
+	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LISTFROMSTRING(..#DataList,";"))
+	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LISTFROMSTRING(..#Columns,";"))
+	
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
+	
+	Quit QueryAPISpy
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>