Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34118 -r34135
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34118)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34135)
@@ -3,27 +3,28 @@
 <Class name="vhUnitTest.Utils.TECH.Persistent.KeyValuePairRepository.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnBeforeAllTests">
+<Method name="OnBeforeOneTest">
 <Implementation><![CDATA[
 	Do ..VerwijderDummyKeyValuePair()
-	Do ..VoegToeDummyKeyValuePair()
+	Do ..VoegToeDummyKeyValuePair(2)
 	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ..VerwijderDummyKeyValuePair()
-	Do ##super()
+	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: GeefViaKeyValue geeft object KeyValuePair weer.">
 <Implementation><![CDATA[
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
-	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("DummyKey","DummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("DummyKey1","DummyValue")
 	
-	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey1")
 	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
 ]]></Implementation>
 </Method>
@@ -42,17 +43,15 @@
 <Method name="Test: GeefViaKeyOfValue met OR operator in de filter, geeft KeyValuePair weer.">
 <Implementation><![CDATA[
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
-	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("VerkeerdeDummyKey","DummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("DummyKey1","VerkeerdeDummyValue")
 	
-	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey1")
 	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 KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen unieke data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
@@ -68,26 +67,20 @@
 </Method>
 
 <Method name="VoegToeDummyKeyValuePair">
+<FormalSpec>AantalKeyValuePairs:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
-	Set KeyValuePair.Sleutel = "DummyKey"
-	Set KeyValuePair.Waarde = "DummyValue"
-
-	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
-	Do KeyValuePairRepository.Bewaar(KeyValuePair)
+	#dim Counter As %Integer = 1
+	for Counter=1:1:AantalKeyValuePairs
+	{
+		#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
+		Set KeyValuePair.Sleutel = "DummyKey" _Counter
+		Set KeyValuePair.Waarde = "DummyValue"
+		Do KeyValuePair.Save()
+		Do KeyValuePair.%Close()
+		Set 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>