Index: CHUI/VKP/OrderIngave/OrderControle.cls.xml
===================================================================
diff -u -r51244 -r51278
--- CHUI/VKP/OrderIngave/OrderControle.cls.xml	(.../OrderControle.cls.xml)	(revision 51244)
+++ CHUI/VKP/OrderIngave/OrderControle.cls.xml	(.../OrderControle.cls.xml)	(revision 51278)
@@ -3,16 +3,32 @@
 <Class name="CHUI.VKP.OrderIngave.OrderControle">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderApi = $$$Inject(OrderApi, ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsOrderVolledigGemarkeerd">
 <FormalSpec>Index:%Integer,KlantNummer:%String,OrderNummer:%Integer</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsVolledigGemarkeerd As %Boolean = $$$True
 	
-	#dim OrderApi As DOM.VKP.impl.DataM.DataMOrderAPI = ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New()
-	#dim Order As DOM.VKP.Order = OrderApi.GeefOrder(OrderNummer)
+	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(OrderNummer)
 	
-	#dim OrderLijnIterator As %String = Order.GeefOrderLijnIterator()
+	#dim OrderLijnIterator As TECH.Iterator = Order.GeefOrderLijnIterator()
 	
 	While (OrderLijnIterator.HasNext() && IsVolledigGemarkeerd) {
 		#dim OrderLijn As DOM.VKP.Orderlijn = OrderLijnIterator.Next()
Index: vhUnitTest/CHUI/VKP/OrderIngave/OrderControle/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/CHUI/VKP/OrderIngave/OrderControle/Test.cls.xml	(revision 0)
+++ vhUnitTest/CHUI/VKP/OrderIngave/OrderControle/Test.cls.xml	(revision 51278)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.CHUI.VKP.OrderIngave.OrderControle.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="Index">
+<Type>%Integer</Type>
+<Default>9999999999</Default>
+</Parameter>
+
+<Parameter name="KlantNr">
+<Type>%Integer</Type>
+<Default>1234</Default>
+</Parameter>
+
+<Parameter name="OrderNummer">
+<Type>%Integer</Type>
+<Default>199999</Default>
+</Parameter>
+
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..OrderApi = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	;Do ..DataKill()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..DataKill()
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	;Do ..DataKill()
+ 	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Default werking -&gt; IsOrderVolledigGemarkeerd -&gt; True">
+<Implementation><![CDATA[
+	#dim AantalOrderLijnen As %Integer = 3
+	
+	Do ..DataSetup(AantalOrderLijnen)
+	#dim OrderLijnIteratorMock as TECH.Iterator = ..GeefOrderLijnIterator(AantalOrderLijnen)
+	
+	#dim OrderMock As DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderMock.IndienMethodCall("GeefOrderLijnIterator").DanReturn(OrderLijnIteratorMock)
+	
+	Do ..OrderApi.IndienMethodCall("GeefOrder",..#OrderNummer).DanReturn(OrderMock)
+	
+	#dim Result As %boolean = ..GeefOrdercontrole().IsOrderVolledigGemarkeerd(..#Index,..#KlantNr,..#OrderNummer)
+	
+	Do $$$AssertTrue(Result)
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrdercontrole">
+<Private>1</Private>
+<ReturnType>CHUI.VKP.OrderIngave.OrderControle</ReturnType>
+<Implementation><![CDATA[	Quit ##class(CHUI.VKP.OrderIngave.OrderControle).%New(..OrderApi)
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderLijnIterator">
+<FormalSpec>AantalOrderLijnen:%Integer=1</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim OrderLijnLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim ProductOrderLijnFake As DOM.VKP.ProductOrderlijn
+	#dim Lijn As %Integer
+	#dim OrderLijnId As %Integer
+	
+	For Lijn=0:1:(AantalOrderLijnen - 1) {
+		Set OrderLijnId = Lijn*10+100
+		Set ProductOrderLijnFake = ##class(vhTest.Fake.DOM.VKP.ProductOrderlijn).%New(OrderLijnId)
+		Do OrderLijnLijst.Insert(ProductOrderLijnFake)
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(OrderLijnLijst)
+]]></Implementation>
+</Method>
+
+<Method name="DataSetup">
+<FormalSpec>AantalOrderLijnen:%Integer=1</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Lijn As %Integer
+	
+	For Lijn=0:1:(AantalOrderLijnen - 1) {
+		Set ^HULP(..#Index,..#KlantNr,"M","A",..#OrderNummer,Lijn*10+100) = "Data"
+	}
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="DataKill">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Kill ^HULP(..#Index,..#KlantNr)
+	
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>