Index: vhUnitTest/Res/VertalingRepository/Test.cls.xml
===================================================================
diff -u -r60542 -r60854
--- vhUnitTest/Res/VertalingRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 60542)
+++ vhUnitTest/Res/VertalingRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 60854)
@@ -3,118 +3,96 @@
 <Class name="vhUnitTest.Res.VertalingRepository.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: BestaatVertalingViaFilter gebruikt de juiste query en parameters">
+<Method name="Test: BestaatVertaling gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
-	#dim Groep As %String = "Groep"
-	#dim Sleutel As %String = "Sleutel"
-	#dim Type As %String = "L"
-	#dim Taal As %String = "N"
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy(Groep, Sleutel, Type, Taal)
-	Set VertalingRepository = ##class(Res.VertalingRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
-	; test crucible
+	#dim Groep As %String = "RandomGroep"
+	#dim Sleutel As %String = "RandomSleutel"
+	#dim Type As %String = "RandomType"
+	#dim Taal As %String = "RandomTaal"
 	
-	Do VertalingRepository.BestaatVertalingViaFilter(Groep, Sleutel, Type, Taal)
+	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("ExistsId","RandomGroep||RandomSleutel||RandomType||RandomTaal").DanReturn($$$True)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM Res.Vertaling WHERE Groep = ? AND Intern = ? AND Type = ? AND TAAL = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params, $LB("Groep", "Sleutel" ,"L" ,"N"))
+	Do VertalingRepository.BestaatVertaling(Groep, Sleutel, Type, Taal)
+	
+	Do GatewayMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefVertalingViaFilter gebruikt de juiste query en parameters">
+<Method name="Test: GeefVertaling gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
-	#dim Groep As %String = "Groep"
-	#dim Sleutel As %String = "Sleutel"
-	#dim Type As %String = "L"
-	#dim Taal As %String = "N"
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy(Groep, Sleutel, Type, Taal)
-	Set VertalingRepository = ##class(Res.VertalingRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
+	#dim Groep As %String = "RandomGroep"
+	#dim Sleutel As %String = "RandomSleutel"
+	#dim Type As %String = "RandomType"
+	#dim Taal As %String = "RandomTaal"
 	
-	Do VertalingRepository.GeefVertalingViaFilter(Groep, Sleutel, Type, Taal)
+	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("OpenId","RandomGroep||RandomSleutel||RandomType||RandomTaal").DanReturn($$$True)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM Res.Vertaling WHERE Groep = ? AND Intern = ? AND Type = ? AND TAAL = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params, $LB("Groep", "Sleutel" ,"L" ,"N"))
+	Do VertalingRepository.GeefVertaling(Groep, Sleutel, Type, Taal)
+	
+	Do GatewayMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: VerwijderVertalingViaFilter gebruikt de juiste query en parameters">
+<Method name="Test: VerwijderVertaling gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
-	#dim Groep As %String = "Groep"
-	#dim Sleutel As %String = "Sleutel"
-	#dim Type As %String = "L"
-	#dim Taal As %String = "N"
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpy(Groep, Sleutel, Type, Taal)
-	Set VertalingRepository = ##class(Res.VertalingRepository).%New(..MaakGateWayDummy(), QueryAPISpy)
+	#dim Groep As %String = "RandomGroep"
+	#dim Sleutel As %String = "RandomSleutel"
+	#dim Type As %String = "RandomType"
+	#dim Taal As %String = "RandomTaal"
 	
-	Do VertalingRepository.VerwijderVertalingViaFilter(Groep, Sleutel, Type, Taal)
+	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("ExistsId","RandomGroep||RandomSleutel||RandomType||RandomTaal").DanReturn($$$True)
+	Do GatewayMock.VerwachtMethodCall("DeleteId","RandomGroep||RandomSleutel||RandomType||RandomTaal")
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock)
 	
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM Res.Vertaling WHERE Groep = ? AND Intern = ? AND Type = ? AND TAAL = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params, $LB("Groep", "Sleutel" ,"L" ,"N"))
+	Do VertalingRepository.VerwijderVertaling(Groep, Sleutel, Type, Taal)
+	
+	Do GatewayMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: UpdateVertalingIndienBestaat gebruikt de juiste query en parameters">
+<Method name="Test: WijzigOfMaakVertaling waar geen vertaling van bestaat">
 <Implementation><![CDATA[
-	#dim Groep As %String = "Groep"
-	#dim Sleutel As %String = "Sleutel"
-	#dim Type As %String = "L"
-	#dim Taal As %String = "N"
-	#dim Vertaling As %String = "Sleutel" 
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ..MaakQueryAPISpyMetVertaling(Groep, Sleutel, Type, Taal, Vertaling)
+	#dim Groep As %String = "RandomGroep"
+	#dim Sleutel As %String = "RandomSleutel"
+	#dim Type As %String = "RandomType"
+	#dim Taal As %String = "RandomTaal"
+	#dim Vertaling As %String = "RandomVertaling"
 	Set VertalingObject = ##class(Res.Vertaling).%New()
-	Do VertalingObject.GroepSetObjectId(Groep)
-	Do VertalingObject.TypeSetObjectId(Type)
-	Do VertalingObject.TaalSetObjectId(Taal)
-	Set VertalingObject.Intern = Sleutel
-	Set VertalingObject.Vertaling = Vertaling
-	Set GatewayMock = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("Res.Vertaling")
 	
-	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock, QueryAPISpy)
-	Do GatewayMock.VerwachtMethodCall("Save",..Matches.Object(VertalingObject))
-	Do GatewayMock.VerwachtMethodCall("OpenId",Groep)
+	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("ExistsId","RandomGroep||RandomSleutel||RandomType||RandomTaal")
+	Do GatewayMock.VerwachtMethodCall("Save",$$$ElkeWaarde)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock)
 	
-	Do VertalingRepository.UpdateVertalingIndienBestaat(Groep, Sleutel, Type, Taal , Vertaling)
+	Do VertalingRepository.WijzigOfMaakVertaling(Groep, Sleutel, Type, Taal, Vertaling)
 	
 	Do GatewayMock.Verifieer()
-	Do $$$AssertEquals(QueryAPISpy.Statement,"SELECT ID FROM Res.Vertaling WHERE Groep = ? AND Intern = ? AND Type = ? AND TAAL = ?")
-	Do $$$AssertEquals(QueryAPISpy.Params, $LB("Groep", "Sleutel" ,"L" ,"N", "Sleutel"))
 ]]></Implementation>
 </Method>
 
-<Method name="MaakGateWayDummy">
-<Private>1</Private>
-<ReturnType>vhTest.Mock.TECH.Persistent.impl.Gateway</ReturnType>
+<Method name="Test: WijzigOfMaakVertaling waar een vertaling van bestaat">
 <Implementation><![CDATA[
-	#dim GateWayDummy As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("Res.Vertaling")
-	Do GateWayDummy.IndienMethodCall("OpenId",$$$ElkeWaarde).DanReturn(##class(Res.Vertaling).%New())
-	Quit GateWayDummy
-]]></Implementation>
-</Method>
-
-<Method name="MaakQueryAPISpy">
-<FormalSpec>Groep:%String,Sleutel:%String,Type:%String,Taal:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
-<Implementation><![CDATA[
-	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(Groep, Sleutel, Type, Taal))
-	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("Groep","Sleutel","Type","Taal"))
+	#dim Groep As %String = "RandomGroep"
+	#dim Sleutel As %String = "RandomSleutel"
+	#dim Type As %String = "RandomType"
+	#dim Taal As %String = "RandomTaal"
+	#dim Vertaling As %String = "RandomVertaling"
+	Set VertalingObject = ##class(Res.Vertaling).%New()
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
+	Set GatewayMock = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("ExistsId","RandomGroep||RandomSleutel||RandomType||RandomTaal").DanReturn($$$True)
+	Do GatewayMock.VerwachtMethodCall("OpenId","RandomGroep||RandomSleutel||RandomType||RandomTaal").DanReturn(VertalingObject)
+	Do GatewayMock.VerwachtMethodCall("Save",VertalingObject)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock)
 	
-	Quit QueryAPISpy
-]]></Implementation>
-</Method>
-
-<Method name="MaakQueryAPISpyMetVertaling">
-<FormalSpec>Groep:%String,Sleutel:%String,Type:%String,Taal:%String,Vertaling:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>vhTest.Spy.TECH.Query.QueryAPI</ReturnType>
-<Implementation><![CDATA[
-	#dim ResultSetData As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB(Groep, Sleutel, Type, Taal, Vertaling))
-	#dim ResultSetColumns As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($LB("Groep","Sleutel","Type","Taal","Vertaling"))
+	Do VertalingRepository.WijzigOfMaakVertaling(Groep, Sleutel, Type, Taal, Vertaling)
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New(ResultSetData,ResultSetColumns )
-	
-	Quit QueryAPISpy
+	Do GatewayMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>