Index: vhUnitTest/Tools/Mock/svnHelper.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Mock/svnHelper.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Mock/svnHelper.cls.xml	(revision 2408)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+
+
+<Class name="vhUnitTest.Tools.Mock.svnHelper">
+<Super>svn.Helper</Super>
+
+<Property name="FakeHelper">
+<Type>vhTest.Fake.Tools.Mock.Helper</Type>
+</Property>
+
+<Method name="CompileImportedSourceCode">
+<FormalSpec>flagRecompile:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("CompileImportedSourceCode")
+]]></Implementation>
+</Method>
+
+<Method name="SVNExport">
+<FormalSpec>InternalName:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("SVNExport")
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>Username:%String="",Password:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..FakeHelper = ##class(vhTest.Fake.Tools.Mock.Helper).%New()
+	Set ..ToCompile = ##class(svn.CompileList).%New()
+	Set ..ToCompile.List = ##class(%ListOfDataTypes).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/Tools/Mock/Fake/Klasse.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Mock/Fake/Klasse.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Mock/Fake/Klasse.cls.xml	(revision 2408)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Tools.Mock.Fake.Klasse">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefTekst">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	Quit "Dit is de echte tekst"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/Tools/Mock/Fake/TestFake.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Mock/Fake/TestFake.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Mock/Fake/TestFake.cls.xml	(revision 2408)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Tools.Mock.Fake.TestFake">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="ID1">
+<Type>%String</Type>
+<Default>ID1</Default>
+</Parameter>
+
+<Parameter name="ID2">
+<Type>%String</Type>
+<Default>ID2</Default>
+</Parameter>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+	Naslagcode: Deze manier van werken heeft uiteindelijk teveel nadelen. Zie vooral testmethode "Test: IndienMethodcall ingesteld Met ID1, opgeroepen met ID2"
+*/
+]]></Content>
+</UDLText>
+
+<Method name="Test: Tekst van echte methode is terug gegeven">
+<Implementation><![CDATA[
+	Set FakeKlasse = ##class(vhUnitTest.Tools.Mock.Fake.FakeKlasse).%New()
+	#dim Tekst As TECH.String = FakeKlasse.GeefTekst(..#ID1)
+	Do $$$AssertEquals(Tekst,"Dit is de echte tekst")
+]]></Implementation>
+</Method>
+
+<Method name="Test: IndienMethodcall ingesteld, opgegeven tekst is terug gegeven">
+<Implementation><![CDATA[
+	Set FakeKlasse = ##class(vhUnitTest.Tools.Mock.Fake.FakeKlasse).%New()
+	Do FakeKlasse.IndienMethodCall("GeefTekst", ..#ID1).DanReturn("FakeTekst")
+	#dim Tekst As TECH.String = FakeKlasse.GeefTekst(..#ID1)
+	Do $$$AssertEquals(Tekst,"FakeTekst")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Code smijt exceptie, exceptie doorgegeven">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Fake exceptie")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+
+	Set FakeKlasse = ##class(vhUnitTest.Tools.Mock.Fake.FakeKlasse).%New()
+	Do FakeKlasse.IndienMethodCall("GeefTekst", ..#ID1).DanException(##class(TECH.Exceptions.GeneralErrorException).%New("Fake exceptie"))
+	#dim Tekst As TECH.String = FakeKlasse.GeefTekst(..#ID1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: IndienMethodcall ingesteld Met ID1, opgeroepen met ID2">
+<Implementation><![CDATA[
+	Set FakeKlasse = ##class(vhUnitTest.Tools.Mock.Fake.FakeKlasse).%New()
+	Do FakeKlasse.IndienMethodCall("GeefTekst", ..#ID1).DanReturn("FakeTekst")
+	#dim Tekst As TECH.String = FakeKlasse.GeefTekst(..#ID2)
+	Do $$$AssertEquals(Tekst,"Dit is de echte tekst")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/Tools/Mock/Fake/FakeKlasse.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Mock/Fake/FakeKlasse.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Mock/Fake/FakeKlasse.cls.xml	(revision 2408)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Tools.Mock.Fake.FakeKlasse">
+<Super>vhUnitTest.Tools.Mock.Fake.Klasse,Tools.Mock.MockClassBase</Super>
+
+<Method name="GeefTekst">
+<Description>
+Naslagwerk: Dit was een nieuw idee om mocking niet verplicht te maken. Maar naar aanleiding van de test zijn er toch teveel nadelen.</Description>
+<FormalSpec>ID:TECH.String</FormalSpec>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim Tekst As TECH.String = ""
+	try {
+		Set Tekst = ..VerwerkMethodCall("GeefTekst", ID)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.MockException")
+		Set Tekst = ##super(ID)
+	}
+	Quit Tekst
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml
===================================================================
diff -u -r1631 -r2408
--- vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml	(.../Test.cls.xml)	(revision 1631)
+++ vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml	(.../Test.cls.xml)	(revision 2408)
@@ -9,7 +9,7 @@
 </Parameter>
 
 <Property name="FakeSvnHelper">
-<Type>vhUnitTest.Fake.svn.Helper</Type>
+<Type>vhUnitTest.Tools.Mock.svnHelper</Type>
 <Private>1</Private>
 </Property>
 
@@ -22,7 +22,7 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	Set ..FakeSvnHelper = ##class(vhUnitTest.Fake.svn.Helper).%New()
+	Set ..FakeSvnHelper = ##class(vhUnitTest.Tools.Mock.svnHelper).%New()
 	Set ..FakeCreator = ##class(vhUnitTest.Tools.Mock.TestDoubleCreator.UpdateTestDouble.FakeCreator).%New(..FakeSvnHelper)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/Tools/Fake/Tools/Mock/Helper/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/Tools/Fake/Tools/Mock/Helper/Test.cls.xml	(revision 0)
+++ vhUnitTest/Tools/Fake/Tools/Mock/Helper/Test.cls.xml	(revision 2408)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.Tools.Fake.Tools.Mock.Helper.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Helper">
+<Type>vhTest.Fake.Tools.Mock.Helper</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="DummyMethodeNaam1">
+<Type>%String</Type>
+<Default>DummyMethodeNaam1</Default>
+</Parameter>
+
+<Parameter name="DummyMethodeNaam2">
+<Type>%String</Type>
+<Default>DummyMethodeNaam2</Default>
+</Parameter>
+
+<Method name="TestOnaangeroepenMethode">
+<Implementation><![CDATA[	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),0)
+]]></Implementation>
+</Method>
+
+<Method name="TestMethode1KeerOpgeroepen">
+<Implementation><![CDATA[
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam1)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),1)
+]]></Implementation>
+</Method>
+
+<Method name="TestMethode2KeerOpgeroepen">
+<Implementation><![CDATA[
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam1)
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam1)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),2)
+]]></Implementation>
+</Method>
+
+<Method name="Test2MethodesBeideNietOpgeroepen">
+<Implementation><![CDATA[
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),0)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam2),0)
+]]></Implementation>
+</Method>
+
+<Method name="Test2MethodesBeideOpgeroepen">
+<Implementation><![CDATA[
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam1)
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam2)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),1)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam2),1)
+]]></Implementation>
+</Method>
+
+<Method name="Test2Methodes1Opgeroepen">
+<Implementation><![CDATA[
+	Do ..Helper.IncrementeerAantalKeerOpgeroepen(..#DummyMethodeNaam1)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam1),1)
+	Do $$$AssertEquals(..Helper.GeefAantalKeerOpgeroepen(..#DummyMethodeNaam2),0)
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..Helper = ##class(vhTest.Fake.Tools.Mock.Helper).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>