Index: vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefProductIterator/Test.cls.xml
===================================================================
diff -u -r33374 -r33377
--- vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefProductIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 33374)
+++ vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefProductIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 33377)
@@ -3,47 +3,77 @@
 <Class name="vhUnitTest.DOM.AKP.impl.ToeleveringService.GeefProductIterator.Test">
 <Super>vhUnitTest.TestCase,DOM.AKP.impl.ToeleveringService</Super>
 
+<Property name="ToeleveringID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringStub">
+<Type>vhTest.Fake.DOM.AKP.Toelevering</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringAPI">
+<Type>vhTest.Mock.DOM.AKP.ToeleveringAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringService">
+<Type>DOM.AKP.impl.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductIDIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..ToeleveringID = 222222
+	Set ..ToeleveringStub = ##class(vhTest.Fake.DOM.AKP.Toelevering).%New(..ToeleveringID, 1234)
+	Set ..ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	do ..ToeleveringAPI.IndienMethodCall("GeefToelevering",..ToeleveringID).DanReturn(..ToeleveringStub)
+	Set ..ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Iterator heeft 1 productID">
 <Implementation><![CDATA[
-	#dim ToeleveringId = 222222
-	set ToeleveringStub = ##class(vhTest.Fake.DOM.AKP.Toelevering).%New(ToeleveringId, 1234)
-	Do ToeleveringStub.MaakNieuweProductLijn(1000)
-	#dim ToeleveringAPI As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	Do ..ToeleveringStub.MaakNieuweProductLijn(1000)
 	
-	do ToeleveringAPI.IndienMethodCall("GeefToelevering",ToeleveringId).DanReturn(ToeleveringStub)
-	
-	#dim ToeleveringService As DOM.AKP.impl.ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()	
-	#dim ProductIDIterator As TECH.Iterator = ToeleveringService.GeefProductIDIterator(ToeleveringId)
-	
-	if $$$AssertTrue(ProductIDIterator.HasNext()) {
-		do $$$AssertEquals(ProductIDIterator.Next(),1000)
+	Set ..ProductIDIterator = ..ToeleveringService.GeefProductIDIterator(..ToeleveringID)	
+	if $$$AssertTrue(..ProductIDIterator.HasNext()) {
+		do $$$AssertEquals(..ProductIDIterator.Next(),1000)
 	}
-	do $$$AssertFalse(ProductIDIterator.HasNext())
+	do $$$AssertFalse(..ProductIDIterator.HasNext())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Iterator heeft 2 productIDs">
 <Implementation><![CDATA[
-	#dim ToeleveringId = 222222
-	set ToeleveringStub = ##class(vhTest.Fake.DOM.AKP.Toelevering).%New(ToeleveringId, 1234)
-	Do ToeleveringStub.MaakNieuweProductLijn(1000)
-	Do ToeleveringStub.MaakNieuweProductLijn(1001)
+	Do ..ToeleveringStub.MaakNieuweProductLijn(1000)
+	Do ..ToeleveringStub.MaakNieuweProductLijn(1001)
 	
-	#dim ToeleveringAPI As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-	do ToeleveringAPI.IndienMethodCall("GeefToelevering",ToeleveringId).DanReturn(ToeleveringStub)
-	
-	#dim ToeleveringService As DOM.AKP.impl.ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()	
-	#dim ProductIDIterator As TECH.Iterator = ToeleveringService.GeefProductIDIterator(ToeleveringId)
-	
-	if $$$AssertTrue(ProductIDIterator.HasNext()) {
-		do $$$AssertEquals(ProductIDIterator.Next(),1000)
+	Set ..ProductIDIterator = ..ToeleveringService.GeefProductIDIterator(..ToeleveringID)	
+	if $$$AssertTrue(..ProductIDIterator.HasNext()) {
+		do $$$AssertEquals(..ProductIDIterator.Next(),1000)
 	}
-	if $$$AssertTrue(ProductIDIterator.HasNext()) {
-		do $$$AssertEquals(ProductIDIterator.Next(),1001)
+	if $$$AssertTrue(..ProductIDIterator.HasNext()) {
+		do $$$AssertEquals(..ProductIDIterator.Next(),1001)
 	}
-	do $$$AssertFalse(ProductIDIterator.HasNext())
+	do $$$AssertFalse(..ProductIDIterator.HasNext())
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Iterator heeft niets">
+<Implementation><![CDATA[
+	Set ..ProductIDIterator = ..ToeleveringService.GeefProductIDIterator(..ToeleveringID)	
+	do $$$AssertFalse(..ProductIDIterator.HasNext())
+]]></Implementation>
+</Method>
 </Class>