Index: vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml	(revision 1786)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.UniqueList.InsertAt.Test">
+<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+
+<Method name="CreateKeyValueList">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: InsertAt">
+<Implementation><![CDATA[
+	#Define Key "Key"	
+	#Define Value "Value"
+	
+	#Dim KeyValuePair1 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key, $$$Value)
+	#Dim KeyValuePair2 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key, $$$Value)
+	
+	#Dim SubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Key already exists", $$$Key)
+	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
+	
+	Do ..KeyValueList.InsertAt(KeyValuePair1, 1)
+	Do ..KeyValueList.InsertAt(KeyValuePair2, 2)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml	(revision 1786)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.UniqueList.InsertKeyValue.Test">
+<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+
+<Method name="CreateKeyValueList">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: InsertKeyValue">
+<Implementation><![CDATA[
+	#Define Key "Key"	
+	#Define Value "Value"
+	
+	#Dim SubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Key already exists", $$$Key)
+	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
+	
+	Do ..KeyValueList.InsertKeyValue($$$Key, $$$Value)
+	Do ..KeyValueList.InsertKeyValue($$$Key, $$$Value)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml	(revision 1786)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.List.FindByKey.Test">
+<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+
+<Method name="CreateKeyValueList">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.List).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Unexisting key returns null">
+<Implementation><![CDATA[	Do $$$AssertEquals(..KeyValueList.FindByKey("UnExistingKey"), "")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Existing keys returned as TECH.KeyValue.List">
+<Implementation><![CDATA[
+	#Define Key "Key"
+	#Define Value "Value"
+	#Define Aantal 5
+	
+	#Dim Index As %Integer
+	
+	For Index = 1 : 1 : $$$Aantal {
+		Do ..KeyValueList.InsertKeyValue($$$Key, $$$Value)
+	}
+	
+	Do $$$AssertEquals($$$Aantal, ..KeyValueList.Count())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml	(revision 1786)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.UniqueList.FindByKey.Test">
+<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+
+<Method name="CreateKeyValueList">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Unexisting key returns null">
+<Implementation><![CDATA[	Do $$$AssertEquals(..KeyValueList.FindByKey("UnExistingKey"), "")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Existing key returned as TECH.KeyValuePair">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	
+	#Dim KeyValuePair1 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key1, $$$Value1)
+	#Dim KeyValuePair2 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key2, $$$Value2)
+	
+	Do ..KeyValueList.Insert(KeyValuePair1)
+	Do ..KeyValueList.Insert(KeyValuePair2)
+	
+	Do $$$AssertEquals(KeyValuePair1, ..KeyValueList.FindByKey($$$Key1))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml	(revision 1786)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.ListBase.TestBase">
+<Abstract>1</Abstract>
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KeyValueList">
+<Type>TECH.KeyValue.ListBase</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ..CreateKeyValueList()
+]]></Implementation>
+</Method>
+
+<Method name="Test: GetKeys">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	Do ..KeyValueList.InsertKeyValue($$$Key1)
+	Do ..KeyValueList.InsertKeyValue($$$Key2)
+		
+	#Dim Keys As %ListOfDataTypes = ..KeyValueList.GetKeys()
+
+	Do $$$AssertEquals(Keys.GetAt(1), $$$Key1)
+	Do $$$AssertEquals(Keys.GetAt(2), $$$Key2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GetValues">
+<Implementation><![CDATA[
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	
+	Do ..KeyValueList.InsertKeyValue("Key1", $$$Value1)
+	Do ..KeyValueList.InsertKeyValue("Key2", $$$Value2)
+		
+	#Dim Values As %ListOfDataTypes = ..KeyValueList.GetValues()
+
+	Do $$$AssertEquals(Values.GetAt(1), $$$Value1)
+	Do $$$AssertEquals(Values.GetAt(2), $$$Value2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Insert">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	
+	#Dim KeyValuePair1 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key1, $$$Value1)
+	#Dim KeyValuePair2 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key2, $$$Value2)
+	
+	Do ..KeyValueList.Insert(KeyValuePair1)
+	Do ..KeyValueList.Insert(KeyValuePair2)
+	
+	Do $$$AssertEquals(..KeyValueList.GetAt(1).Key, $$$Key1)
+	Do $$$AssertEquals(..KeyValueList.GetAt(2).Key, $$$Key2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: InsertAt">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	
+	#Define Index1 1
+	#Define Index2 2
+	
+	#Dim KeyValuePair1 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key1, $$$Value1)
+	#Dim KeyValuePair2 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key2, $$$Value2)
+	
+	Do ..KeyValueList.InsertAt(KeyValuePair1, $$$Index1)
+	Do ..KeyValueList.InsertAt(KeyValuePair2, $$$Index2)
+	
+	Do $$$AssertEquals(..KeyValueList.GetAt($$$Index1).Key, $$$Key1)
+	Do $$$AssertEquals(..KeyValueList.GetAt($$$Index2).Key, $$$Key2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: InsertKeyValuePair">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+
+	Do ..KeyValueList.InsertKeyValue($$$Key1, $$$Value1)
+	Do ..KeyValueList.InsertKeyValue($$$Key2, $$$Value2)
+	
+	Do $$$AssertEquals(..KeyValueList.GetAt(1).Key, $$$Key1)
+	Do $$$AssertEquals(..KeyValueList.GetAt(2).Key, $$$Key2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: ToStream">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	#Define Key3 "Key3"
+	#Define Key4 "Key4"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	#Define Value3 "ValueValueValue3"
+	#Define Value4 "Value4"
+	
+	Do ..KeyValueList.InsertKeyValue($$$Key1, $$$Value1)
+	Do ..KeyValueList.InsertKeyValue($$$Key2, $$$Value2)
+	Do ..KeyValueList.InsertKeyValue($$$Key3, $$$Value3)
+	Do ..KeyValueList.InsertKeyValue($$$Key4, $$$Value4)
+	
+	#Dim Stream As %GlobalCharacterStream = ..KeyValueList.ToStream()
+	
+	Do $$$AssertEquals(Stream.ReadLine(), "Key:" _ $$$Key1 _ ", Value:" _ $$$Value1)
+	Do $$$AssertEquals(Stream.ReadLine(), "Key:" _ $$$Key2 _ ", Value:" _ $$$Value2)
+	Do $$$AssertEquals(Stream.ReadLine(), "Key:" _ $$$Key3 _ ", Value:" _ $$$Value3)
+	Do $$$AssertEquals(Stream.ReadLine(), "Key:" _ $$$Key4 _ ", Value:" _ $$$Value4)
+]]></Implementation>
+</Method>
+
+<Method name="CreateKeyValueList">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml	(revision 1786)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValue.UniqueList.Insert.Test">
+<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+
+<Method name="CreateKeyValueList">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Insert">
+<Implementation><![CDATA[
+	#Define Key "Key"	
+	#Define Value "Value"
+	
+	#Dim KeyValuePair1 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key, $$$Value)
+	#Dim KeyValuePair2 As TECH.KeyValuePair = ##class(TECH.KeyValuePair).%New($$$Key, $$$Value)
+	
+	#Dim SubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Key already exists", $$$Key)
+	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
+	
+	Do ..KeyValueList.Insert(KeyValuePair1)
+	Do ..KeyValueList.Insert(KeyValuePair2)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>