Index: svn/Helper.cls.xml
===================================================================
diff -u -r1686 -r1689
--- svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1686)
+++ svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1689)
@@ -155,14 +155,24 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",1,1)
+	JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",2,1,..#UnitTesten)
 	Quit "GetLatest() uitgevoerd op "_##class(TECH.DateTime).CurrentTimeStamp()_"."_$C(13,10)_"UnitTesten gestart."
 ]]></Implementation>
 </Method>
 
+<Parameter name="UnitTesten">
+<Type>%String</Type>
+<Default>UnitTesten</Default>
+</Parameter>
+
+<Parameter name="IntegratieTesten">
+<Type>%String</Type>
+<Default>IntegratieTesten</Default>
+</Parameter>
+
 <Method name="GetLatestJob">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>UitvoerenUnitTesten:%Boolean</FormalSpec>
+<FormalSpec>UitvoerenUnitTesten:%Boolean,WelkeTesten:%String="UnitTesten",ForceVoerUitTesten:%Boolean=0</FormalSpec>
 <Implementation><![CDATA[
 	Set $ZTRAP = "OnError"
 
@@ -177,8 +187,15 @@
 		Do SvnHelper.VoerUitGetLatest()	
 		If (SvnHelper.IsGetLatestGefaald){
 			Do SvnHelper.MailGefaaldeSvnCommands("GetLatest")
-		}ElseIf(UitvoerenUnitTesten && SvnHelper.IsCodeVeranderd){	
-			Do SvnHelper.VoerUitUnitTesten()		
+		}ElseIf(UitvoerenUnitTesten && (SvnHelper.IsCodeVeranderd || ForceVoerUitTesten)){	
+			If WelkeTesten = ..#UnitTesten {
+				Do SvnHelper.VoerUitUnitTesten()
+				/// Na Unit Testen, de IntegratieTesten Initialiseren
+				#dim ForceTesting As %Boolean = 1
+				JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",3,UitvoerenUnitTesten,..#IntegratieTesten,ForceTesting) 
+			}ElseIf WelkeTesten = ..#IntegratieTesten {
+				Do SvnHelper.VoerUitIntegratieTesten()
+			}
 		}		
 		Do SvnHelper.Failed.Clear()
 	} else {
@@ -199,11 +216,19 @@
 <Implementation><![CDATA[
 	If (##class(svn.Setting).MagUnitTestUitvoeren() && ('..IsGetLatestGefaald)) {
 		Do ##class(vhUnitTest.Manager).RunTest("/MailOnError=1")
-		JOB ClassMethod^vhLib("vhTest.Integratie.Manager","RunTest",1,"/MailOnError=1")
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="VoerUitIntegratieTesten">
+<Private>1</Private>
+<Implementation><![CDATA[
+	If (##class(svn.Setting).MagUnitTestUitvoeren() && ('..IsGetLatestGefaald)) {
+		Do ##class(vhTest.Integratie.Manager).RunTest("/MailOnError=1")
+	}
+]]></Implementation>
+</Method>
+
 <Method name="MailGefaaldeSvnCommands">
 <FormalSpec>Actie:%String</FormalSpec>
 <Implementation><![CDATA[