Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository.cls.xml
===================================================================
diff -u -r31970 -r31975
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository.cls.xml	(.../PrijsBerekeningRepository.cls.xml)	(revision 31970)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository.cls.xml	(.../PrijsBerekeningRepository.cls.xml)	(revision 31975)
@@ -98,7 +98,7 @@
 	#dim lbParams As %List = $LB(KlantID,Datum)
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement,lbParams))
 	If ResultSet.Next() {
-		Set DataID = ResultSet.Data("ID")
+		Set DataID = ResultSet.GetDataByName("ID")
 	}
 	
 	Quit DataID
Index: vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository/GeefViaKlantEnDatum/Test.cls.xml
===================================================================
diff -u -r31969 -r31975
--- vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository/GeefViaKlantEnDatum/Test.cls.xml	(.../Test.cls.xml)	(revision 31969)
+++ vhUnitTest/APPS/EDI/PrijsBerekening/impl/PrijsBerekeningRepository/GeefViaKlantEnDatum/Test.cls.xml	(.../Test.cls.xml)	(revision 31975)
@@ -8,72 +8,97 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Data">
-<Type>APPS.EDI.PrijsBerekening.data.PrijsBerekening</Type>
+<Property name="DummyDataID">
+<Type>%String</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="DataID">
+<Property name="KlantID">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="WinkelkarID">
-<Type>%String</Type>
+<Property name="Datum">
+<Type>%Date</Type>
 <Private>1</Private>
 </Property>
 
-<Method name="TestBestaatViaKlantEnDatum">
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	#dim KlantID As %String = "UT_KlantID"
-	#dim Datum As %Date = $$$DummyDate
-	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
-	Set ..PrijsBerekeningRepository = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository).%New("",QueryAPISpy)
+	Do ##super()
 
-	#dim DataBestaat As %Boolean = ..PrijsBerekeningRepository.BestaatViaKlantEnDatum(KlantID,Datum)
-	Do $$$AssertFalse(DataBestaat)
+	Set ..DummyDataID = "DummyID"
+	Set ..KlantID = "UT_KlantID"
+	Set ..Datum = $$$DummyDate
+]]></Implementation>
+</Method>
 
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM APPS_EDI_PrijsBerekening_data.PrijsBerekening  WHERE (KlantID = ?) AND (Datum = ?)")
-	Do $$$AssertEqualsListbuild(QueryAPISpy.Params,$LB(KlantID,Datum))
+<Method name="TestGeefViaKlantEnDatumThrowsException">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen PrijsBerekeningData gevonden voor KlantID 'UT_KlantID' op datum '62272'.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.InvalidInputException).%ClassName(1),Substrings))
+
+	Set ..PrijsBerekeningRepository = ..GeefPrijsBerekeningRepository(##class(vhTest.Fake.TECH.Query.QueryAPI).%New())
+
+	#dim DummyData As APPS.EDI.PrijsBerekening.data.PrijsBerekening = ..PrijsBerekeningRepository.GeefViaKlantEnDatum(..KlantID,..Datum)
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeefViaKlantEnDatum">
 <Implementation><![CDATA[
-	#dim KlantID As %String = "UT_KlantID"
-	#dim Datum As %Date = $$$DummyDate
-	Set DummyData = ##class(APPS.EDI.PrijsBerekening.data.PrijsBerekening).%New()
-	
 	#dim GatewayStub As vhTest.Mock.TECH.Persistent.Gateway = ##class(vhTest.Mock.TECH.Persistent.Gateway).%New()
-	Do GatewayStub.IndienMethodCall("OpenId","").DanReturn(DummyData)
+		Set DummyData = ##class(APPS.EDI.PrijsBerekening.data.PrijsBerekening).%New()
+		Do GatewayStub.IndienMethodCall("OpenId",..DummyDataID).DanReturn(DummyData)
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..GeefQueryAPISpy(..DummyDataID)
+	Set ..PrijsBerekeningRepository = ..GeefPrijsBerekeningRepository(QueryAPISpy, GatewayStub)
 	
-	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyID")
-	Set ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData)
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
-	Set ..PrijsBerekeningRepository = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository).%New(GatewayStub, QueryAPISpy)
-	
-	Quit
+	#dim DataResultaat As APPS.EDI.PrijsBerekening.data.PrijsBerekening = ..PrijsBerekeningRepository.GeefViaKlantEnDatum(..KlantID,..Datum)
 
-	#dim DummyData2 As APPS.EDI.PrijsBerekening.data.PrijsBerekening = ..PrijsBerekeningRepository.GeefViaKlantEnDatum(KlantID,Datum)
+	If $$$AssertTrue($IsObject(DataResultaat)) {
+		Do $$$AssertObject(DummyData,DataResultaat)
+	}
+	Do ..AssertUitgevoerdeQuery(QueryAPISpy)
+]]></Implementation>
+</Method>
 
+<Method name="TestBestaatViaKlantEnDatum">
+<Implementation><![CDATA[
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..GeefQueryAPISpy(..DummyDataID)
+	Set ..PrijsBerekeningRepository = ..GeefPrijsBerekeningRepository(QueryAPISpy)
+
+	#dim DataBestaat As %Boolean = ..PrijsBerekeningRepository.BestaatViaKlantEnDatum(..KlantID,..Datum)
+
+	Do $$$AssertTrue(DataBestaat)
+	Do ..AssertUitgevoerdeQuery(QueryAPISpy)
+]]></Implementation>
+</Method>
+
+<Method name="AssertUitgevoerdeQuery">
+<FormalSpec>QueryAPISpy:vhTest.Spy.TECH.Query.QueryAPI</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
 	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM APPS_EDI_PrijsBerekening_data.PrijsBerekening  WHERE (KlantID = ?) AND (Datum = ?)")
-	Do $$$AssertEqualsListbuild(QueryAPISpy.Params,$LB(KlantID,Datum))
+	Do $$$AssertEqualsListbuild(QueryAPISpy.Params,$LB(..KlantID,..Datum))
 ]]></Implementation>
 </Method>
 
-<Method name="TestGeefViaKlantEnDatumThrowsException">
+<Method name="GeefQueryAPISpy">
+<FormalSpec>DummyDataID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantID As %String = "UT_KlantID"
-	#dim Datum As %Date = $$$DummyDate
+	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(DummyDataID))
+	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Fake.TECH.Query.QueryAPI).%New()
-	Set ..PrijsBerekeningRepository = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository).%New("",QueryAPISpy)
+	Quit ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns)
+]]></Implementation>
+</Method>
 
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen PrijsBerekeningData gevonden voor KlantID 'UT_KlantID' op datum '62272'.")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.InvalidInputException).%ClassName(1),Substrings))
-	
-	#dim DummyData As APPS.EDI.PrijsBerekening.data.PrijsBerekening = ..PrijsBerekeningRepository.GeefViaKlantEnDatum(KlantID,Datum)
+<Method name="GeefPrijsBerekeningRepository">
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Gateway:vhTest.Mock.TECH.Persistent.Gateway=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository).%New(Gateway, QueryAPI)
 ]]></Implementation>
 </Method>
 </Class>