Index: svn/StudioHook.cls.xml
===================================================================
diff -u -r1642 -r1649
--- svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1642)
+++ svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1649)
@@ -66,6 +66,10 @@
 <Type>svn.Helper</Type>
 </Property>
 
+<Property name="UnitTestHelper">
+<Type>svn.UnitTestHelper</Type>
+</Property>
+
 <Property name="tNsp">
 <Type>%String</Type>
 <Private>1</Private>
@@ -79,6 +83,8 @@
 <MenuItem Name="Reload File" />
 <MenuItem Name="Synchronize All" />
 <MenuItem Name="Synchronize Changes" />
+<MenuItem Name="Compile All" />
+<MenuItem Name="Compile CompileList" />
 <MenuItem Separator="1" Name="----------------------------------"/> 
 <MenuItem Name="Settings"/>
 <MenuItem Name="Dump Settings" />
@@ -94,59 +100,15 @@
 ]]></Data>
 </XData>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-	<MenuItem Name="Synchronize All" />
-	<MenuItem Name="Import namespace to Subversion" />
-	<MenuItem Name="Check Out" Save="100" />
-	<MenuItem Name="Synchronize" />
-	<MenuItem Separator="1" Name="----------------------------------"/> 
-	<MenuItem Name="Status" />
-	<MenuItem Name="Update to HEAD revision" Save="100" />
-	<MenuItem Name="Update to revision #" Save="100" />
-	<MenuItem Name="Commit" Save="100" />
-	<MenuItem Separator="1" Name="----------------------------------"/> 
-	<MenuItem Name="Branch - Set Current" />
-	<MenuItem Name="Branch - Show Current" />
-	<MenuItem Name="Branch - Create a New Project Branch/Tag" />
-	<MenuItem Name="Branch - Merge or Revert" />
-	<MenuItem Name="Branch - Delete Project Branch/Tag" />
-	<MenuItem Separator="1" Name="----------------------------------"/> 
-	<MenuItem Name="Pre-commit Check" Save="100" />
-	<MenuItem Name="Merge (!)" />
-	<MenuItem Name="Resolved" />
-	<MenuItem Separator="1" Name="----------------------------------"/> 
-	<MenuItem Name="Deploy" Memo="Deploy to test machine" />
-	<MenuItem Separator="1" Name="----------------------------------"/> 
-	<MenuItem Name="More commands..." />
-	</Menu>
-
-	<Menu Name="Subversion integration" Type="1">
-	<MenuItem Name="Status" Save="100" />
-	<MenuItem Name="Update file to HEAD revision" Save="100" />
-	<MenuItem Name="Update file to revision #" Save="100" />
-	<MenuItem Name="Commit File" Save="100" />
-	<MenuItem Name="Revert" />
-	<MenuItem Name="Pre-commit Check" Save="100" />
-	<MenuItem Name="Merge" />
-	<MenuItem Name="Resolved" />
-	</Menu> 
-*/
-]]></Content>
-</UDLText>
-
 <Method name="UserAction">
 <FormalSpec><![CDATA[Type:%Integer,Name:%String,InternalName:%String,SelectedText:%String,&Action:%String,&Target:%String,&Msg:%String,&Reload:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	if ..Debug write !,"Method 'UserAction' Type:"_Type_" Name:"_Name_" InternalName:"_InternalName_" SelectedText:"_SelectedText_" Action:"_Action_" Target:"_Target_" Msg:"_Msg_" Reload:"_Reload
 	#dim tCmd as svn.Command
-	#dim tIsPopupMenu As %Boolean = $zcvt($p(Name,",",1),"L")["integration"
-	#dim Menu As %String = $zcvt($p(Name,",",1),"L")
-	#dim tMenu As %String =$zcvt($p($p(Name,",",2)," ",1),"L")
-	set tMenu(2) = $zcvt($p($p(Name,",",2)," ",2,99),"L")
-	
+	set tIsPopupMenu=$zcvt($p(Name,",",1),"L")["integration"
+	set tMenu=$zcvt($p($p(Name,",",2)," ",1),"L")
+	set tMenu(2)=$zcvt($p($p(Name,",",2)," ",2,99),"L")
 	// DK 2.15
 	
 	set ..tNsp=$zutil(5)
@@ -170,57 +132,72 @@
 	// FMA
 	//if '##class(%File).DirectoryExists(..LocalWorkspacePath(..svnHelper.Branch)) do ..svnHelper.MakeDir(..LocalWorkspacePath(..svnHelper.Branch))
 	//
-	if Menu="subversion" {
-		if tMenu="settings" { 
-			do ..SubversionSettings(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="import" {
-			do ..SubversionImport(.InternalName,.Action,.Target,.Msg,.Reload)
-			// branches
-		} elseif tMenu="branch" {
-			if tMenu(2)["set current" {
-				do ..SubversionBranchSetCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
-			} elseif tMenu(2)["show" {
-				do ..SubversionBranchShowCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
-			} elseif tMenu(2)["create" {
-				do ..SubversionBranchCreate(.InternalName,.Action,.Target,.Msg,.Reload)
-			} elseif tMenu(2)["merge" {
-				do ..SubversionBranchMerge(.InternalName,.Action,.Target,.Msg,.Reload)
-			} else {
-			    do ..SubversionBranchDelete(.InternalName,.Action,.Target,.Msg,.Reload)
+	if tMenu="settings" { 
+		do ..SubversionSettings(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="import" {
+		do ..SubversionImport(.InternalName,.Action,.Target,.Msg,.Reload)
+		// branches
+	} elseif tMenu="branch" {
+		if tMenu(2)["set current" {
+			do ..SubversionBranchSetCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu(2)["show" {
+			do ..SubversionBranchShowCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu(2)["create" {
+			do ..SubversionBranchCreate(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu(2)["merge" {
+			do ..SubversionBranchMerge(.InternalName,.Action,.Target,.Msg,.Reload)
+		} else {
+		    do ..SubversionBranchDelete(.InternalName,.Action,.Target,.Msg,.Reload)
+		}
+	} elseif tMenu="update" { 
+		set UpdateToVersion = $select(tMenu(2)["to head":"",1:0)
+		do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion)
+	} elseif tMenu="getlatest" {
+		do ..svnHelper.SubversionGetLatest()
+	} elseif tMenu="pre-commit" {
+		do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="check" {
+		do ..SubversionCheck(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="revert" {
+		do ..SubversionRevert(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="status" {
+	    do ..SubversionStatus(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="synchronize" {
+		if tMenu(2)[ "changes" do ..SubversionSynchronizeChanges(.InternalName,.Action,.Target,.Msg,.Reload)
+		if tMenu(2)[ "all" {
+			Set Action = 1
+			set Target = "Alle bestanden synchronizeren met het file-systeem ?"
+		}
+	} elseif tMenu="compile" {
+		if tMenu(2)[ "compilelist" {
+			write !,"Compiling compilelist started"
+			do ..svnHelper.CompileImportedSourceCode(1)
+			write !,"Compiling compilelist finished"
+		}	
+		if tMenu(2)[ "all" {
+			Set Action = 1
+			set Target = "Alle code hercompileren ?"
+		}		
+	} elseif tMenu="reload" {
+		if $length(InternalName) {
+			#dim Repo As svn.Repository = ..svnHelper.GeefRepository(InternalName)
+			if $IsObject(Repo) {
+				set Action = 1
+				set Target = "Reload file "_InternalName_" from "_Repo.ExternalName(InternalName)_"?"
 			}
-		} elseif tMenu="update" { 
-			set UpdateToVersion = $select(tMenu(2)["to head":"",1:0)
-			do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion)
-		} elseif tMenu="getlatest" {
-			do ..svnHelper.SubversionGetLatest()
-		} elseif tMenu="pre-commit" {
-			do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="check" {
-			do ..SubversionCheck(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="revert" {
-			do ..SubversionRevert(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="status" {
-		    do ..SubversionStatus(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="synchronize" {
-			if tMenu(2)[ "changes" do ..SubversionSynchronizeChanges(.InternalName,.Action,.Target,.Msg,.Reload)
-			if tMenu(2)[ "all" {
-				Set Action = 1
-				set Target = "Alle bestanden synchronizeren met het file-systeem ?"
-			}
-		} elseif tMenu="reload" {
-			if $length(InternalName) {
-				#dim Repo As svn.Repository = ..svnHelper.GeefRepository(InternalName)
-				if $IsObject(Repo) {
-					set Action = 1
-					set Target = "Reload file "_InternalName_" from "_Repo.ExternalName(InternalName)_"?"
-				}
-			}
-		} elseif tMenu="source" {
-			set Action=1
-			Set path = $g(^SYS("SourceControl",$$$PRODUCT,"LocalSourceControlWorkspace"))
-			set Target="Update source control code from "_$zcvt(path,"l")_" ?"_$C(13,10)_$C(13,10)_"You have to restart the Studio afterwards."	
-		} elseif tMenu="tortoisesvn" {
-			if (tMenu(2) [ "log") do ..TortoiseSVN("log",.InternalName) 
+		}
+	} elseif tMenu="unittest" {
+		if tMenu(2)="uitvoeren" {
+			do ..RunUnitTest(.InternalName)
+		} elseif tMenu(2)="openen" {
+			do ..OpenUnitTest(.InternalName,.Action,.Target)	
+		} elseif tMenu(2)["package" {
+			do ..RunUnitTestPackage(.InternalName)
+		}
+	}
+	
+	elseif tMenu="tortoisesvn" {
+			if (tMenu(2) [ "log") do ..TortoiseSVN("log") 
 			if (tMenu(2) [ "status") do ..TortoiseSVN("repostatus")
 			if (tMenu(2) [ "update") {
 				if (tMenu(2) [ "head") { do ..TortoiseSVN("update") }
@@ -229,32 +206,24 @@
 			if (tMenu(2) [ "commit") do ..TortoiseSVN("commit")
 			if (tMenu(2) [ "browse") do ..TortoiseSVN("repobrowser")
 			if (tMenu(2) [ "merge") do ..TortoiseSVN("merge")
-		} elseif tMenu="commit" {
-			do ..SubversionCommit(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="project" {
-			do ..SubversionProject(.InternalName,.Action,.Target,.Msg,.Reload,.tMenu)
-		} elseif tMenu="resolved" {
-			set Action=1
-			set Target="Run 'resolved'?"	
-		} elseif tMenu="more" {
-			do ..SubversionMore(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="merge" {
-			do ..SubversionMerge(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu="deploy" {
-			do ..SubversionDeploy(.InternalName,.Action,.Target,.Msg,.Reload)
-		}
-	} elseif Menu="unit testing" {
-		if tMenu="unittest" {
-			if tMenu(2)="uitvoeren" {
-				do ..RunUnitTest(.InternalName)
-			} elseif tMenu(2)="openen" {
-				do ..OpenUnitTest(.InternalName,.Action,.Target)	
-			}
-		}
-		elseif tMenu="alle" {
-			do ..ExecUnitTest()	
-		}
-	}  else { // nothing
+	} elseif tMenu="commit" {
+		do ..SubversionCommit(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="project" {
+		do ..SubversionProject(.InternalName,.Action,.Target,.Msg,.Reload,.tMenu)
+	} elseif tMenu="resolved" {
+		set Action=1
+		set Target="Run 'resolved'?"	
+	} elseif tMenu="more" {
+		do ..SubversionMore(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="merge" {
+		do ..SubversionMerge(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="deploy" {
+		do ..SubversionDeploy(.InternalName,.Action,.Target,.Msg,.Reload)
+	} elseif tMenu="source" {
+		set Action=1
+		Set path = $g(^SYS("SourceControl",$$$PRODUCT,"LocalSourceControlWorkspace"))
+		set Target="Update source control code from "_$zcvt(path,"l")_" ?"_$C(13,10)_$C(13,10)_"You have to restart the Studio afterwards."	
+	} else { // nothing
 	}
 done	//
 	Quit $$$OK
@@ -384,6 +353,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="SubversionCompileAll">
+<FormalSpec><![CDATA[&InternalName:%String,&Action:%String,&Target:%String,&Msg:%String,&Reload:%Boolean]]></FormalSpec>
+<Implementation><![CDATA[
+	set Action=0
+	set ..Cmd=0
+	do ..svnHelper.DisplayMessage("Recompile sources started")
+	do ##class(TECH.CompileUtils).CompileAll()
+	do ..svnHelper.DisplayMessage("Recompile sources finished")
+]]></Implementation>
+</Method>
+
 <Method name="SubversionSynchronizeAll">
 <FormalSpec><![CDATA[&InternalName:%String,&Action:%String,&Target:%String,&Msg:%String,&Reload:%Boolean]]></FormalSpec>
 <Implementation><![CDATA[
@@ -708,6 +688,12 @@
 					Do ..SubversionSynchronizeAll()	
 				}
 			}
+		} elseif tMenu="compile" {
+			if tMenu(2)["all" {
+				if Answer=1 {
+					Do ..SubversionCompileAll()	
+				}
+			}
 		} elseif tMenu="reload" {
 			if Answer=1 {
 				Do ..SubversionSynchronizeFile(InternalName)	
@@ -770,35 +756,27 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ExecUnitTest">
-<FormalSpec>Filter:%String=""</FormalSpec>
-<Implementation><![CDATA[
-	write !,"UnitTest uitvoeren : ",Filter
-	do ##class(vhUnitTest.Manager).RunTest("/display=all",Filter)
+<Method name="RunUnitTest">
+<FormalSpec>InternalName:%String</FormalSpec>
+<Implementation><![CDATA[	do ..UnitTestHelper.RunUnitTest(InternalName)
 ]]></Implementation>
 </Method>
 
-<Method name="RunUnitTest">
+<Method name="RunUnitTestPackage">
 <FormalSpec>InternalName:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim UnitTestName As %String = $piece(InternalName,".",1,$length(InternalName,".")-1)
-	if '##class(TECH.StringUtils).StartsWith(UnitTestName,"vhUnitTest") { 
-		set UnitTestName = ..BepaalUnitTestName(InternalName)
+	if ##class(TECH.StringUtils).StartsWith(InternalName,"vhUnitTest.") {
+		set InternalName = $piece(InternalName,"vhUnitTest.",2)
 	}
-	
-	if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
-		set UnitTestName = $piece(UnitTestName,"vhUnitTest.",2,$length(UnitTestName,"vhUnitTest."))
-		do ..ExecUnitTest(UnitTestName)
-	} else {
-		write !,"Geen unittest ("_UnitTestName_") voor "_InternalName	
-	}
+	#dim Package As %String = $piece(InternalName,".") 
+	do ..UnitTestHelper.ExecUnitTest(Package)
 ]]></Implementation>
 </Method>
 
 <Method name="OpenUnitTest">
 <FormalSpec><![CDATA[&InternalName:%String,&Action:%String,&Target:%String]]></FormalSpec>
 <Implementation><![CDATA[
-	#dim UnitTestName = ..BepaalUnitTestName(InternalName)
+	#dim UnitTestName = ..UnitTestHelper.BepaalUnitTestName(InternalName)
 	if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
 		set Action = 5
 		set Target = UnitTestName_".cls"
@@ -809,25 +787,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="BepaalUnitTestName">
-<FormalSpec>InternalName:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim UnitTestName As %String = $piece(InternalName,".",1,$length(InternalName,".")-2)
-	if '##class(TECH.StringUtils).StartsWith(UnitTestName,"vhUnitTest.") {
-		set UnitTestName = "vhUnitTest."_UnitTestName
-	}
-	#dim ClassName As %String = $piece(InternalName,".",$length(InternalName,".")-1)
-	if '##class(TECH.StringUtils).StartsWith(ClassName,"Test") {
-		set ClassName = "Test"_ClassName
-	}
-	set UnitTestName = UnitTestName_"."_ClassName
-	
-	quit UnitTestName
-]]></Implementation>
-</Method>
-
 <Method name="IsStudioHookActive">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -865,16 +824,19 @@
  	set ..Password =Password
 	
 	if '$IsObject(..svnHelper) {
-		set ..svnHelper = ##class(Helper).%New(Name,Password)
+		set ..svnHelper = ##class(svn.Helper).%New(Name,Password)
 	}
 	
+	if '$IsObject(..UnitTestHelper) {
+		set ..UnitTestHelper = ##class(svn.UnitTestHelper).%New()
+	}
+	
+	
 	if '..IsStudioHookActive() {
 		set ..IsDisconnected = 1
 		quit $$$OK
 	}	
 	
-	
-	
 	set tSC=$$$OK
 	try {
 	 	if $$$ISWINDOWS {
@@ -900,9 +862,10 @@
 	} catch (ex) {
 		Set Exception = ##class(TECH.ExceptionHandler).Catch()
 		write !,"[[ Error in 'Login()' :,",Exception.ToString()
-	 	d BACK^%ETN
-		set tSC=$$$ERROR($$$GeneralError)
+		 	d BACK^%ETN
+			set tSC=$$$ERROR($$$GeneralError)
 	}
+	
 	quit tSC
 ]]></Implementation>
 </Method>
@@ -922,7 +885,6 @@
 <FormalSpec>InternalName:%String,Object:%RegisteredObject=$$$NULLOREF</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	
 	Try {
 		if ..Debug Write !,"Method 'OnAfterSave' InternalName:"_InternalName_" Object: "_Object
 		#dim tCmd as svn.Command
@@ -1014,6 +976,12 @@
 	// item deleted
 	do ..svnHelper.SVNDelete(InternalName)
 	
+	if ##class(svn.Setting).MagUnitTestUitvoeren() {
+		set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(##class(TECH.SourceCodeUtils).StripExtension(InternalName))
+		do UnitTestAnalyser.RemoveUnitTestInfo()
+	}
+
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -1030,7 +998,15 @@
 	do ..svnHelper.SVNExport(InternalName)
 	
 	do ##class(svn.InterfaceControleur).%New().Controleer($piece(InternalName,".",1,$length(InternalName,".")-1))
-
+		
+	if ##class(svn.Setting).MagUnitTestUitvoeren()  {
+		set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(##class(TECH.SourceCodeUtils).StripExtension(InternalName))
+		do UnitTestAnalyser.StoreUnitTestInfo()
+		if ##class(svn.Setting).RunUnitsTestOnCompile() {
+			do ..UnitTestHelper.RunUnitTestsForInternalName(InternalName)
+		}
+	}
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -1087,13 +1063,6 @@
 	if $IsObject(Repository) {
 		do Repository.Status(InternalName)
 	}
-	/*
-	if ##class(TECH.SourceCodeUtils).Type(InternalName)="project" {
-		set ..ProjectNameOriginal=$p(InternalName,".",1)
-		set ..ProjectNameModified = ..svnHelper.ExternalName(InternalName,$$$FULLPATH)
-		set ..IsNewProject=0
-	}
-	*/
 	quit $$$OK
 ]]></Implementation>
 </Method>