Index: vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml
===================================================================
diff -u -r34105 -r34111
--- vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34105)
+++ vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34111)
@@ -24,6 +24,13 @@
 <Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? AND Waarde = ?", $LB(Sleutel,Waarde))
 ]]></Implementation>
 </Method>
+
+<Method name="GeefViaKeyOfValue">
+<FormalSpec>Sleutel:%String,Waarde:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? OR Waarde = ?", $LB(Sleutel,Waarde))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34106 -r34111
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34106)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34111)
@@ -18,7 +18,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyValue geeft KeyValuePair weer. ">
+<Method name="Test: GeefViaKeyValue geeft KeyValuePair weer.">
 <Implementation><![CDATA[
 	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
 	
@@ -30,17 +30,46 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyValue geeft geen resultaat. ">
+<Method name="Test: GeefViaKeyValue geeft geen resultaat.">
 <Implementation><![CDATA[
 	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
 	
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
+
 	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("VerkeerdeDummyKey","DummyValue")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaKeyOfValue KeyValuePair weer.">
+<Implementation><![CDATA[
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
 	
-	Do $$$AssertNotIsObject(KeyValuePair)
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("VerkeerdeDummyKey","DummyValue")
+	
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
 ]]></Implementation>
 </Method>
 
+<Method name="Test: GeefViaKeyOfValue verwacht exceptie bij meer dan één object als resultaat.">
+<Implementation><![CDATA[
+	Do ..VoegToeDummyKey2ValuePairMetDezelfdeWaarde()
+	
+	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
+	
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen unieke data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
+
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("DummyKey","DummyValue")
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderDummyKeyValuePair">
 <Implementation><![CDATA[	Do ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%KillExtent()
 ]]></Implementation>
@@ -56,6 +85,17 @@
 	Do KeyValuePairRepository.Bewaar(KeyValuePair)
 ]]></Implementation>
 </Method>
+
+<Method name="VoegToeDummyKey2ValuePairMetDezelfdeWaarde">
+<Implementation><![CDATA[
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
+	Set KeyValuePair.Sleutel = "DummyKey2"
+	Set KeyValuePair.Waarde = "DummyValue"
+
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+	Do KeyValuePairRepository.Bewaar(KeyValuePair)
+]]></Implementation>
+</Method>
 </Class>