Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r914 -r981
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 914)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 981)
@@ -43,9 +43,11 @@
 		set Description = ##class(%GlobalCharacterStream).%New()
 		
 		do Description.WriteLine("Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.")
-		do Description.Write("Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt")
+		do Description.WriteLine("Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt")
+		do Description.Write("Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.")
 		
 		set ..MockClass.Description = Description.Read()
+		set ..MockClass.Super = ..Class.Name_"," _ ..GeefMockParentClassName()
 		do ..MockClass.Methods.Clear()
 		do ..CreatePushedInstanceMethod()
 	
@@ -65,13 +67,21 @@
 <Method name="HasToUpdateMock">
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..HeeftMockKlasseNodig(..Class)
+]]></Implementation>
+</Method>
+
+<Method name="HeeftMockKlasseNodig">
+<FormalSpec>ClassDefinition:%Dictionary.ClassDefinition</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim HasToUpdateMock As %Boolean = 0
-	set HasToUpdateMock = 	(..Class.Abstract) && ( ..DerivesFromCorrectInterface(..Class.Name)) && 		 					
-							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"TECH.Template") ) ) && 
-		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"%Library.Base") ) )
+	#dim HeeftMockKlasseNodig As %Boolean = 0
+	set HeeftMockKlasseNodig = 	(ClassDefinition.Abstract) && ( ..DerivesFromCorrectInterface(ClassDefinition.Name)) && 		 					
+							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"TECH.Template") ) ) && 
+		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"%Library.Base") ) )
 		 					
-	quit HasToUpdateMock
+	quit HeeftMockKlasseNodig
 ]]></Implementation>
 </Method>
 
@@ -184,14 +194,31 @@
 <Implementation><![CDATA[
 	set MockClass = ##class(%Dictionary.ClassDefinition).%New()
 	set MockClass.Name = MockClassName
-	set MockClass.Super = ..Class.Name_",Tools.Mock.MockClassBase"
 	set MockClass.ProcedureBlock = ..Class.ProcedureBlock
 	do MockClass.%Save()
 	
 	quit MockClass
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMockParentClassName">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim MockParentClass As %String = "Tools.Mock.MockClassBase"
+	
+	#Dim SuperKlassen As TECH.Iterator = ##class(TECH.ClassInfo.ClassDefinition).%New( ..Class.Name ).GeefSuperKlassen()
+	While( SuperKlassen.HasNext()) {
+		#Dim SuperKlasseNaam As %String = SuperKlassen.Next()
+		If ..HeeftMockKlasseNodig(##class(%ClassDefinition).%OpenId(SuperKlasseNaam)) {
+			Set MockParentClass = ..GetMockClassName( SuperKlasseNaam )
+		}
+	}
+	
+	Quit MockParentClass
+]]></Implementation>
+</Method>
+
 <Method name="ExportToSVN">
 <FormalSpec>SourceCode:%String</FormalSpec>
 <Private>1</Private>