Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(revision 0)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(revision 34102)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Utils.TECH.Persistent.KeyValuePairRepository.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ..VerwijderDummyKeyValuePair()
+	Do ..VoegToeDummyKeyValuePair()
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ..VerwijderDummyKeyValuePair()
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaKeyValue geeft KeyValuePair weer. ">
+<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 KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("DummyKey","DummyValue")
+	
+	Do $$$AssertEquals(KeyValuePair.Key, "DummyKey")
+	Do $$$AssertEquals(KeyValuePair.Value, "DummyValue")
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderDummyKeyValuePair">
+<Implementation><![CDATA[	Do ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%KillExtent()
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeDummyKeyValuePair">
+<Implementation><![CDATA[
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
+	Set KeyValuePair.Key = "DummyKey"
+	Set KeyValuePair.Value = "DummyValue"
+
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+	Do KeyValuePairRepository.Bewaar(KeyValuePair)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml
===================================================================
diff -u
--- vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(revision 0)
+++ vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(revision 34102)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.TECH.Persistent.KeyValuePairRepository">
+<Super>TECH.Persistentie.Repository</Super>
+
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>vhTest.Utils.TECH.Persistent.KeyValuePair</Default>
+</Parameter>
+
+<Method name="%OnNew">
+<FormalSpec>Gateway:TECH.Persistent.Gateway="",QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit ##super(Gateway,QueryAPI)
+]]></Implementation>
+</Method>
+
+<Method name="GeefViaKeyValue">
+<FormalSpec>Key:%String,Value:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Value = ?", $LB(Value))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml
===================================================================
diff -u
--- vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml	(revision 0)
+++ vhTest/Utils/TECH/Persistent/KeyValuePair.cls.xml	(revision 34102)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.TECH.Persistent.KeyValuePair">
+<ClassType>persistent</ClassType>
+<Super>TECH.Persistent</Super>
+
+<Property name="Key">
+<Type>%String</Type>
+</Property>
+
+<Property name="Value">
+<Type>%String</Type>
+</Property>
+
+<Index name="IndexKey">
+<Properties>Key</Properties>
+<Unique>1</Unique>
+</Index>
+
+<Index name="IndexValue">
+<Properties>Value</Properties>
+</Index>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^vhTest.Utils.TDF0.KeyValuePairD</DataLocation>
+<DefaultData>KeyValuePairDefaultData</DefaultData>
+<IdLocation>^vhTest.Utils.TDF0.KeyValuePairD</IdLocation>
+<IndexLocation>^vhTest.Utils.TDF0.KeyValuePairI</IndexLocation>
+<StreamLocation>^vhTest.Utils.TDF0.KeyValuePairS</StreamLocation>
+<Data name="KeyValuePairDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Key</Value>
+</Value>
+<Value name="3">
+<Value>Value</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>