Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r789 -r797
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 789)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 797)
@@ -53,6 +53,7 @@
 			#dim Method As %Dictionary.MethodDefinition = itMethods.Next()
 			continue:'Method.Abstract
 			do ..CreateMethod(Method)
+			do ..CreatePushedInstanceMethod()
 		}
 	
 		do ..ExportToSVN(..MockClass.Name)
@@ -85,6 +86,42 @@
 ]]></Implementation>
 </Method>
 
+<Method name="CreatePushedInstanceMethod">
+<Private>1</Private>
+<Implementation><![CDATA[
+	if ##class(TECH.StringUtils).EndsWith(..Class.Name,"API") {
+
+		set Method = ##class(%Dictionary.MethodDefinition).%New()
+		set Method.Name = "MockInstance"
+		set Method.parent = ..MockClass
+		set Method.ReturnType = ..MockClass.Name
+		set Method.FormalSpec = ""
+		set Method.ClassMethod = 1
+		#dim APIClassName As %String = $piece(..Class.Name,".",$length(..Class.Name,"."))
+		
+		do Method.Implementation.WriteLine($char(9)_"do ##class("_..GetContextClassName()_").Instance().Push"_APIClassName_"ClassName("""_..MockClass.Name_""")")
+		do Method.Implementation.WriteLine($char(9)_"quit ##class("_..GetContextClassName()_").Instance().Geef"_APIClassName_"()")
+		
+		do Method.%Save()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GetContextClassName">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ContextClassName As %String = ""
+	if ##class(TECH.StringUtils).StartsWith(..Class.Name,"DOM") {
+		set ContextClassName = "DOM.DomeinContext"
+	} elseif ##class(TECH.StringUtils).StartsWith(..Class.Name,"APPS") {
+		set ContextClassName = "APPS.ApplicatieContext"
+	} elseif ##class(TECH.StringUtils).StartsWith(..Class.Name,"TECH") {
+		set ContextClassName = "TECH.Context"
+	}
+	quit ContextClassName
+]]></Implementation>
+</Method>
+
 <Method name="CreateMethod">
 <FormalSpec>Method:%Dictionary.MethodDefinition</FormalSpec>
 <Private>1</Private>