Index: vhUnitTest/Tools/Mock/MockClassBase/BasisMock.cls.xml
===================================================================
diff -u -r1842 -r3150
--- vhUnitTest/Tools/Mock/MockClassBase/BasisMock.cls.xml	(.../BasisMock.cls.xml)	(revision 1842)
+++ vhUnitTest/Tools/Mock/MockClassBase/BasisMock.cls.xml	(.../BasisMock.cls.xml)	(revision 3150)
@@ -26,6 +26,12 @@
 <Implementation><![CDATA[	Do ..VerwerkMethodCall("MethodeMetParameter",Param)
 ]]></Implementation>
 </Method>
+
+<Method name="MethodMetDefaultParameters">
+<FormalSpec>Param:%Integer,Param2:%String="A",Param3:vhUnitTest.Tools.ExportKlasseEnum=##class(vhUnitTest.Tools.ExportKlasseEnum).Waarde1()</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkMethodCall("MethodMetDefaultParameters",Param, Param2, Param3)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: Tools/Mock/MethodCallStub.cls.xml
===================================================================
diff -u -r2767 -r3150
--- Tools/Mock/MethodCallStub.cls.xml	(.../MethodCallStub.cls.xml)	(revision 2767)
+++ Tools/Mock/MethodCallStub.cls.xml	(.../MethodCallStub.cls.xml)	(revision 3150)
@@ -210,7 +210,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Quit:(..MethodNaam '= MethodNaam) 0
-		
+
 	Quit:(..VerwachteParameters.Count() '= ActueleParameterWaarden.Count()) 0
 	
 	#dim ParameterWaardenGelijk As %Boolean = 1
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 = ""
Index: vhUnitTest/Tools/ExportKlasseEnum.cls.xml
===================================================================
diff -u -r957 -r3150
--- vhUnitTest/Tools/ExportKlasseEnum.cls.xml	(.../ExportKlasseEnum.cls.xml)	(revision 957)
+++ vhUnitTest/Tools/ExportKlasseEnum.cls.xml	(.../ExportKlasseEnum.cls.xml)	(revision 3150)
@@ -7,6 +7,20 @@
 <Parameter name="VALUELIST">
 <Default>;Waarde1;Waarde2</Default>
 </Parameter>
+
+<Method name="Waarde1">
+<ClassMethod>1</ClassMethod>
+<ReturnType>vhUnitTest.Tools.ExportKlasseEnum</ReturnType>
+<Implementation><![CDATA[	quit "Waarde1"
+]]></Implementation>
+</Method>
+
+<Method name="Waarde2">
+<ClassMethod>1</ClassMethod>
+<ReturnType>vhUnitTest.Tools.ExportKlasseEnum</ReturnType>
+<Implementation><![CDATA[	quit "Waarde2"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/Tools/Mock/MockClassBase/IndienMethodCallDefaultParameters/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Mock/MockClassBase/IndienMethodCallDefaultParameters/Test.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Mock/MockClassBase/IndienMethodCallDefaultParameters/Test.cls.xml	(revision 3150)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Tools.Mock.MockClassBase.IndienMethodCallDefaultParameters.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Mock">
+<Type>vhUnitTest.Tools.Mock.MockClassBase.BasisMock</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..Mock = ##class(vhUnitTest.Tools.Mock.MockClassBase.BasisMock).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Alle waarden ingevuld">
+<Implementation><![CDATA[
+	Do ..Mock.IndienMethodCall("MethodMetDefaultParameters",1,"A","Waarde1")
+	
+	Do ..Mock.MethodMetDefaultParameters(1,"A","Waarde1")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Laatste waarde wordt niet voorzien en we rekenen niet op de default">
+<Implementation><![CDATA[
+	Do ..Mock.IndienMethodCall("MethodMetDefaultParameters",1,"A")
+	
+	Do ..Mock.MethodMetDefaultParameters(1,"A","Waarde1")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Laatste waarde wordt voorzien en we rekenen op de default">
+<Implementation><![CDATA[
+	Do ..Mock.IndienMethodCall("MethodMetDefaultParameters",1,"A","Waarde1")
+	
+	Do ..Mock.MethodMetDefaultParameters(1,"A")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Laatste waarde worden niet voorzien en we rekenen op de default">
+<Implementation><![CDATA[
+	Do ..Mock.IndienMethodCall("MethodMetDefaultParameters",1,"A")
+	
+	Do ..Mock.MethodMetDefaultParameters(1,"A")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Laatste twee waarden worden niet voorzien en we rekenen op de default">
+<Implementation><![CDATA[
+	Do ..Mock.IndienMethodCall("MethodMetDefaultParameters",1)
+	
+	Do ..Mock.MethodMetDefaultParameters(1)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/ClassInfo/FormalSpecParser.cls.xml
===================================================================
diff -u -r9 -r3150
--- TECH/ClassInfo/FormalSpecParser.cls.xml	(.../FormalSpecParser.cls.xml)	(revision 9)
+++ TECH/ClassInfo/FormalSpecParser.cls.xml	(.../FormalSpecParser.cls.xml)	(revision 3150)
@@ -26,20 +26,18 @@
 	
 	Set ..Position = 1
 	
-	While (..Position <= $Length(..FormalSpec))
-	{	
-		Set ParameterName = ..ParsePart()
+	While (..Position <= $Length(..FormalSpec)) {	
+		#dim ParameterName As %String = ..ParsePart()
 		
-		Set ParameterType = ""
-		If (..GeefChar()  = ":")
+		#dim ParameterType As %String = ""
+		if (..GeefChar()  = ":")
 		{
 			Set ..Position = ..Position + 1
 			Set ParameterType = ..ParsePart()
 		}
 		
-		Set ParameterDefault = ""
-		If (..GeefChar() = "=")
-		{
+		#dim ParameterDefault As %String = ""
+		If (..GeefChar() = "=") {
 			Set ..Position = ..Position + 1
 			Set ParameterDefault = ..ParsePart()
 		}
@@ -61,8 +59,7 @@
 	Set AantalOpenBrackets = 0
 	Set AantalQuotes = 0
 	Set Char = ..GeefChar()
-	While (..Position <= $Length(..FormalSpec)) && ((AantalOpenBrackets > 0) || (AantalQuotes#2 = 1) || ((Char '= "=") && (Char '= ",") && (Char '= ":")))
-	{
+	While (..Position <= $Length(..FormalSpec)) && ((AantalOpenBrackets > 0) || (AantalQuotes#2 = 1) || ((Char '= "=") && (Char '= ",") && (Char '= ":")))	{
 		Set Part = Part _ Char
 		Set ..Position = ..Position + 1