Index: Tools/Mock/MockClassBase.cls.xml
===================================================================
diff -u -r1952 -r3150
--- Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1952)
+++ Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 3150)
@@ -7,6 +7,19 @@
 Unit tests kunnen IndienMethodCall(...) of VerwachtMethodCall(...) oproepen.</Description>
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="FormalSpecParser">
+<Type>TECH.ClassInfo.FormalSpecParser</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="FormalSpecParserGet">
+<ReturnType>TECH.ClassInfo.FormalSpecParser</ReturnType>
+<Implementation><![CDATA[
+	set r%FormalSpecParser = $$$LazyLoad(r%FormalSpecParser,##class(TECH.ClassInfo.FormalSpecParser).%New())
+	quit r%FormalSpecParser
+]]></Implementation>
+</Method>
+
 <Property name="MethodCallStubs">
 <Description>
 ELEMENTTYPE="Tools.Mock.MethodCallStub"</Description>
@@ -30,7 +43,7 @@
 		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalUsageException).%New("Method "_$classname($this)_":"_MethodNaam_" is niet meer in gebruik!!"))
 	}
 	
-	#dim VerwachteParameterWaardenList As %ListOfDataTypes = ##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .VerwachteParameterWaarden )		
+	#dim VerwachteParameterWaardenList As %ListOfDataTypes = ..ParametersToList(MethodNaam,VerwachteParameterWaarden...)
 	
 	#dim MethodCallStub As Tools.Mock.MethodCallStub = ..FindMethodCall(MethodNaam,VerwachteParameterWaardenList)
 	if $IsObject(MethodCallStub) {
@@ -93,7 +106,7 @@
 <FormalSpec>MethodNaam:%String,Parameters...:%List</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim ActueleParameterWaarden As %ListOfDataTypes = ##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .Parameters )
+	#dim ActueleParameterWaarden As %ListOfDataTypes = ..ParametersToList(MethodNaam,Parameters...)
 	#dim HeeftReturnWaarde As %Boolean = 0
 	#dim ReturnWaarde As %String = ""
 	#dim VerwerkMethodCall As %CacheString = ""
@@ -108,11 +121,50 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ParametersToList">
+<FormalSpec>MethodNaam:%String,ParameterValues...:%List</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim CompiledMethod As %Dictionary.CompiledMethod = ##class(%Dictionary.CompiledMethod).%OpenId($classname($this)_"||"_MethodNaam,$$$ConcurrenyNoLocks)
+	
+	#dim IsValid As %Boolean = $IsObject(CompiledMethod)
+	
+	if IsValid {
+		#dim ParameterValueList As %ListOfDataTypes =  ##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .ParameterValues )
+		#dim Parameters As %ListOfDataTypes = ..FormalSpecParser.Parse(CompiledMethod.FormalSpec)
+		while ( IsValid ) && ( ParameterValueList.Count() < Parameters.Count() ) {
+			try {
+				#dim DefaultValue As %String = ..GetDefaultValue(Parameters.GetAt(ParameterValueList.Count()+1).GeefDefaultWaarde())
+				do ParameterValueList.Insert(DefaultValue)
+			} catch {
+				#dim Exception As TECH.Exception = ##class(TECH.ExceptionHandler).Catch()
+				set IsValid = $$$False
+			}
+		}
+	}
+
+	Quit $$$If(IsValid,ParameterValueList,##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .ParameterValues ))
+]]></Implementation>
+</Method>
+
+<Method name="GetDefaultValue">
+<FormalSpec>DefaultValueString:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	new Code,Value
+	set Code = "set Value = "_DefaultValueString
+	xecute Code
+	quit Value
+]]></Implementation>
+</Method>
+
 <Method name="BepaalMethodCallStub">
 <FormalSpec>MethodNaam:%String,Parameters...:%List</FormalSpec>
 <ReturnType>Tools.Mock.MethodCallStub</ReturnType>
 <Implementation><![CDATA[
-	#dim ActueleParameterWaarden As %ListOfDataTypes = ##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .Parameters )
+	#dim ActueleParameterWaarden As %ListOfDataTypes = ..ParametersToList(MethodNaam,Parameters...)
 	#dim MethodCallStub As Tools.Mock.MethodCallStub
 	#dim MatchGevonden As %Boolean = 0
 	#Dim Mismatches As %String = ""