Index: Tools/Mock/MockClassBase.cls.xml
===================================================================
diff -u -r1805 -r1842
--- Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1805)
+++ Tools/Mock/MockClassBase.cls.xml	(.../MockClassBase.cls.xml)	(revision 1842)
@@ -26,15 +26,48 @@
 <FormalSpec>MethodNaam:%String,VerwachteParameterWaarden...:%String</FormalSpec>
 <ReturnType>Tools.Mock.MethodCallStub</ReturnType>
 <Implementation><![CDATA[
-	Set MethodCallStub = ##class(Tools.Mock.MethodCallStub).%New($this)
-	Do MethodCallStub.ZetMethodNaam( MethodNaam )
 	#dim VerwachteParameterWaardenList As %ListOfDataTypes = ##class(TECH.ListUtils).MultiDimensionalToListOfDataTypes( .VerwachteParameterWaarden )		
-	Do MethodCallStub.ZetParameters( VerwachteParameterWaardenList )
-	Do ..MethodCallStubs.Insert( MethodCallStub )
+	
+	#dim MethodCallStub As Tools.Mock.MethodCallStub = ..FindMethodCall(MethodNaam,VerwachteParameterWaardenList)
+	if $IsObject(MethodCallStub) {
+		do:( MethodCallStub.IsVerwacht() ) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("VerwachtMethodCall '"_MethodNaam_"' mag niet overschreven worden."))
+	} else {
+		Set MethodCallStub = ##class(Tools.Mock.MethodCallStub).%New($this)
+		Do MethodCallStub.ZetMethodNaam( MethodNaam )
+		Do MethodCallStub.ZetParameters( VerwachteParameterWaardenList )
+		Do ..MethodCallStubs.Insert( MethodCallStub )
+	}
 	Quit MethodCallStub
 ]]></Implementation>
 </Method>
 
+<Method name="FindMethodCall">
+<FormalSpec>MethodNaam:%String,VerwachteParameterWaardenList:%ListOfDataTypes</FormalSpec>
+<ReturnType>Tools.Mock.MethodCallStub</ReturnType>
+<Implementation><![CDATA[
+	#Dim FoundMethodCall As Tools.Mock.MethodCallStub = ""
+	#Dim MethodCallHash As %String = ..GeefHash(MethodNaam, VerwachteParameterWaardenList)
+	#Dim Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..MethodCallStubs)
+	
+	While (Iterator.HasNext() && (FoundMethodCall = "")) {
+		#Dim MethodCall As Tools.Mock.MethodCallStub = Iterator.Next()
+		#Dim IteratedMethodCallHash As %String = ..GeefHash(MethodCall.GeefMethodNaam(), MethodCall.GeefVerwachteParameters())
+		Set:(MethodCallHash = IteratedMethodCallHash) FoundMethodCall = MethodCall	
+	}
+	
+	Quit FoundMethodCall
+]]></Implementation>
+</Method>
+
+<Method name="GeefHash">
+<FormalSpec>MethodNaam:%String,VerwachteParameterWaardenList:%ListOfDataTypes</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Code As %String = MethodNaam _ "_" _##class(TECH.ListUtils).ListToPieces(VerwachteParameterWaardenList,",")
+	quit $system.Encryption.SHA1Hash(Code)
+]]></Implementation>
+</Method>
+
 <Method name="VerwachtMethodCall">
 <Description>
 Aan te roepen door de unit test.</Description>