Index: vhUnitTest/Res/Perfion/Synchroniser/PerfionRepository/Test.cls.xml
===================================================================
diff -u -r62936 -r62982
--- vhUnitTest/Res/Perfion/Synchroniser/PerfionRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 62936)
+++ vhUnitTest/Res/Perfion/Synchroniser/PerfionRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 62982)
@@ -5,30 +5,51 @@
 
 <Method name="Test: VerwijderViaSleutel gebruikt de juiste query en parameters met hoofdletter">
 <Implementation><![CDATA[
+	#dim Filter As %String = "Sleutel = ?"
+	#dim TableName As %String = "Res_Perfion_Synchroniser.Perfion"
+	#dim StatementBestaat As %String = "SELECT ID FROM " _TableName _" WHERE " _Filter
+	#dim Parameters As %List = $ListBuild("RandomSleutel")
 	#dim Sleutel As %String = "RandomSleutel"
+	Set DynamicQueryBestaat = ##class(TECH.DynamicQuery).%New(StatementBestaat,Parameters)
 	
+	#dim ResultSetFake As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(##class(TECH.ListUtils).CreateListOfDataTypes("Test"), ##class(TECH.ListUtils).CreateListOfDataTypes("Test"))
 	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
-	Do GatewayMock.VerwachtMethodCall("ExistsId",Sleutel).DanReturn($$$True)
-	Do GatewayMock.VerwachtMethodCall("DeleteId",Sleutel)
-	Set PerfionRepository = ##class(Res.Perfion.Synchroniser.PerfionRepository).%New(GatewayMock)
+	#dim QueryAPIMock As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New("")
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQueryBestaat))).ExactAantalKeer(1).DanReturn(ResultSetFake)
+	
+	Set PerfionRepository = ##class(vhUnitTest.Res.Perfion.Synchroniser.PerfionRepository.spy).%New(,QueryAPIMock)
 	Do PerfionRepository.VerwijderViaSleutel(Sleutel)
 	
-	Do GatewayMock.Verifieer()
+	Do $$$AssertEquals(PerfionRepository.Filter, Filter)
+	Do $$$AssertEquals(PerfionRepository.Params, Parameters)
+	Do QueryAPIMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: VerwijderViaSleutel gebruikt de juiste query en parameters to lower">
 <Implementation><![CDATA[
 	#dim Sleutel As %String = "RandomSleutel"
+	#dim Filter As %String = "Sleutel = ?"
+	#dim TableName As %String = "Res_Perfion_Synchroniser.Perfion"
+	#dim Statement As %String = "SELECT ID FROM " _TableName _" WHERE " _Filter
+	#dim Parameters As %List = $ListBuild(Sleutel)
+	#dim ParametersToLower As %List = $ListBuild(##class(TECH.StringUtils).ToLower(Sleutel))
 	
-	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
-	Do GatewayMock.VerwachtMethodCall("ExistsId",Sleutel).DanReturn($$$False)
-	Do GatewayMock.VerwachtMethodCall("ExistsId",##class(TECH.StringUtils).ToLower(Sleutel)).DanReturn($$$True)
-	Do GatewayMock.VerwachtMethodCall("DeleteId",##class(TECH.StringUtils).ToLower(Sleutel))
-	Set PerfionRepository = ##class(Res.Perfion.Synchroniser.PerfionRepository).%New(GatewayMock)
+	Set DynamicQueryBestaatNiet = ##class(TECH.DynamicQuery).%New(Statement,Parameters)
+	Set DynamicQueryBestaat = ##class(TECH.DynamicQuery).%New(Statement,ParametersToLower)
+	
+	#dim ResultSetFakeEmpty As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New()
+	#dim ResultSetFake As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(##class(TECH.ListUtils).CreateListOfDataTypes("Test"), ##class(TECH.ListUtils).CreateListOfDataTypes("Test"))
+	#dim QueryAPIMock As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New("")
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQueryBestaatNiet))).ExactAantalKeer(1).DanReturn(ResultSetFakeEmpty)
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQueryBestaat))).ExactAantalKeer(1).DanReturn(ResultSetFake)
+	
+	Set PerfionRepository = ##class(vhUnitTest.Res.Perfion.Synchroniser.PerfionRepository.spy).%New(,QueryAPIMock)
 	Do PerfionRepository.VerwijderViaSleutel(Sleutel)
 	
-	Do GatewayMock.Verifieer()
+	Do $$$AssertEquals(PerfionRepository.Filter, Filter)
+	Do $$$AssertEquals(PerfionRepository.Params, ParametersToLower)
+	Do QueryAPIMock.Verifieer()
 ]]></Implementation>
 </Method>