Index: vhUnitTest/TECH/GlobalIterator/Test.cls.xml
===================================================================
diff -u -r1244 -r1406
--- vhUnitTest/TECH/GlobalIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 1244)
+++ vhUnitTest/TECH/GlobalIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 1406)
@@ -35,6 +35,7 @@
 	
 	Do ..InitGlobalIterator()
 	Do $$$AssertEquals(..Iterator.Next(), @..#Global@(0))
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -47,10 +48,13 @@
 	
 	Do ..InitGlobalIterator()
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),1)
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 2")
+	Do $$$AssertEquals(..Iterator.Key(),2)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -62,6 +66,7 @@
 	
 	Do ..InitGlobalIterator()
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -73,6 +78,7 @@
 	
 	Do ..InitGlobalIterator(..#Global_"(0)")
 	Do $$$AssertEquals(..Iterator.Next(), "SubWaarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -84,6 +90,7 @@
 	
 	Do ..InitGlobalIterator(,1,)
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),1)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -96,8 +103,10 @@
 	
 	Do ..InitGlobalIterator(,,2)
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),1)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -111,6 +120,7 @@
 	
 	Do ..InitGlobalIterator()
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertFalse(..Iterator.HasNext())
 	Do ..Iterator.Next()
 ]]></Implementation>
@@ -122,6 +132,7 @@
 	Set @..#Global@(2) = "Waarde 2"
 	Do ..InitGlobalIterator(,1,)
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 2")
+	Do $$$AssertEquals(..Iterator.Key(),2)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -132,6 +143,7 @@
 	Set @..#Global@(2) = "Waarde 2"
 	Do ..InitGlobalIterator(,,1)
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -142,8 +154,10 @@
 	Set @..#Global@(1) = "Waarde 1"
 	Do ..InitGlobalIterator(,,5)
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 1")
+	Do $$$AssertEquals(..Iterator.Key(),1)
 	Do $$$AssertFalse(..Iterator.HasNext())
 ]]></Implementation>
 </Method>
@@ -155,13 +169,36 @@
 	Do ..InitGlobalIterator()
 	
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do ..Iterator.Reset()
 	Do $$$AssertTrue(..Iterator.HasNext())
 	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
 ]]></Implementation>
 </Method>
 
+<Method name="TestKey2KeerNaElkaarOpvragen">
+<Implementation><![CDATA[
+	Set @..#Global@(0) = "Waarde 0"
+	Set @..#Global@(1) = "Waarde 1"
+	Do ..InitGlobalIterator()
+	
+	Do $$$AssertEquals(..Iterator.Next(), "Waarde 0")
+	Do $$$AssertEquals(..Iterator.Key(),0)
+	Do $$$AssertEquals(..Iterator.Key(),0)
+]]></Implementation>
+</Method>
+
+<Method name="TestKeyOpvragenVoorNext">
+<Implementation><![CDATA[
+	Set @..#Global@(0) = "Waarde 0"
+	Do ..InitGlobalIterator()
+	
+	Do $$$AssertEquals(..Iterator.Key(),"")
+]]></Implementation>
+</Method>
+
 <Method name="InitGlobalIterator">
 <FormalSpec>Global:%String=..#Global,StartPos:%String="",EindPos:%String=""</FormalSpec>
 <Private>1</Private>