Index: Tools/Test/Manager.cls.xml =================================================================== diff -u -r1463 -r1485 --- Tools/Test/Manager.cls.xml (.../Manager.cls.xml) (revision 1463) +++ Tools/Test/Manager.cls.xml (.../Manager.cls.xml) (revision 1485) @@ -160,11 +160,15 @@ Set Case = $o(..TheLog(..TestSuite,Case)) } If (FalendeTesten.Count()>0) Set Message = Message_"

Falende unit testen:

"_##class(TECH.ListUtils).ListToPieces(FalendeTesten,"
") - Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_..LogIndex_" Failed on ["_Server_" => "_Namespace_"]",Message,0,1) + #dim Onderwerp As %String = ..#PackagePrefix_..LogIndex_" Failed on ["_Server_" => "_Namespace_"]" + Do ##class(vhLib.Logger).%New().Warning(Onderwerp,Message) + Do SendMiniMailForced^vhLib.Mail(From,MailTo,Onderwerp,Message,0,1) } if (..Qualifiers.MailOnSucces && ..IsSuccess(..TestSuite)){ Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString(..#PackagePrefix_".SendToWhenSucceeded")) - Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_..LogIndex_" Succeeded on ["_Server_" => "_Namespace_"]",Message,0) + Set Onderwerp = ..#PackagePrefix_..LogIndex_" Succeeded on ["_Server_" => "_Namespace_"]" + Do ##class(vhLib.Logger).%New().Warning(Onderwerp,Message) + Do SendMiniMailForced^vhLib.Mail(From,MailTo,Onderwerp,Message,0) } } ]]> Index: Tools/Test/Report.cls.xml =================================================================== diff -u -r1314 -r1485 --- Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 1314) +++ Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 1485) @@ -62,17 +62,29 @@ bg-color:red; } + > - If namespace="" { Quit ..NoNameSpace() } - ElseIf index="" { - if showlast Quit ..ShowSuites(namespace,$order(@GlobalForLogging@(""),-1)) - else Quit ..ShowIndices(namespace) - - + If (namespace = "") { + Quit ..NoNameSpace() + } ElseIf (index = "") { + If showlast { + //Quit ..ShowSuites(namespace,$order(@GlobalForLogging@(""),-1)) + + set index = $order(@GlobalForLogging@(""),-1) + Set suite = $o(@GlobalForLogging@(index,suite)) + } Else { + Quit ..ShowIndices(namespace) + } } - ElseIf suite="" { Quit ..ShowSuites(namespace,index) } - ElseIf case="" { Quit ..ShowCases(namespace,index,suite,mode) } + If suite="" { Quit ..ShowSuites(namespace,index) } + ElseIf case="" { Quit ..ShowCases(namespace,index,suite,mode,showlast) } ElseIf method="" { Quit ..ShowMethods(namespace,index,suite,case) } Else { Quit ..ShowAsserts(namespace,index,suite,case,method) } &html<> @@ -136,37 +148,69 @@ ]]> + +1 +1 +0 + + &html<> + &html<> + &html<> + + If IsRunning { + &html<> + } + &html<> + + &html<> + &html<> + &html<
#(namespace)#:#(..GetDuration(index))#
Triggered:#(..GetLastTriggerTime())#
Finished:#(..GetEndTime(index))#
> + + Do ..ToonConflicten() +]]>
+
+ + +1 +1 +Er zijn subversion conflicten !> + } + If $D(^SYS("SourceControl","SVN","GetLatestBlockedReason")){ + &html<#(^SYS("SourceControl","SVN","GetLatestBlockedReason"))#> + } +]]> + + + +1 +index:%String,suite:%String,case +1 +> + &html<#(..GetReportTitle())#> + If ((($d(@GlobalForLogging@(index)) = 0)) && + ('$G(suite) || ($G(suite) && ($d(@GlobalForLogging@(index,suite)) = 0))) && + ('$G(suite) || $G(case) || ($G(suite) && $G(case) && ($d(@GlobalForLogging@(index,suite,case)) = 0)))) { + &html<
Log Entry Doesn't Exist!> + Quit $$$OK + } +]]>
+
+ 1 1 namespace:%String,index:%Integer %Status > - &html<#(..GetReportTitle())#> - #dim GlobalForLogging As %String = ..#GlobalForLogging - #dim IsRunning As %String = $G(^SYS("SourceControl","SVN","UnitTestInProcess",..GetManager().%ClassName(1)))>0 - If $d(@GlobalForLogging@(index))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK - &html<> - &html<> - &html<> + Do ..BeginReport(index) - If IsRunning { - &html<> - } - &html<> - - &html<> - &html<> - &html<> - &html<
#(namespace)#:#(..GetDuration(index))#
Triggered:#(..GetLastTriggerTime())#
Finished:#(..GetEndTime(index))#
Data:#(..GetDataVersion())#
> - - If $G(^SYS("SourceControl","SVN","HasConflicts")) && (^SYS("SourceControl","SVN","HasConflicts")) { - &html<Er zijn subversion conflicten !> - } - If $D(^SYS("SourceControl","SVN","GetLatestBlockedReason")){ - &html<#(^SYS("SourceControl","SVN","GetLatestBlockedReason"))#> - } + Do ..ToonSHOWLAST() &html<> &html<> @@ -193,39 +237,49 @@ 1 1 -namespace:%String,index:%String,suite:%String,mode:%String +namespace:%String,index:%String,suite:%String,mode:%String,showlast:%String %Status > - &html<#(..GetReportTitle())#> - If $d(@GlobalForLogging@(index,suite))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + + Do ..BeginReport(index,suite) + + If showlast { + Do ..ToonSHOWLAST() + }Else{ + &html<
> + &html<> + &html<> + &html<> + &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #(..GetEndTime(index))# )
TestSuite: #(suite)#
> + } + &html<> - &html<> - &html<> - &html<> - &html<> - &html<> + &html<> + &html<> &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #(..GetEndTime(index))# )
TestSuite: #(suite)#
Toon Failed en Passed
Toon enkel Failed
Toon Failed en Passed || Toon enkel Failed
> - &html<
> + &html<> &html<> &html<> &html<> &html<> &html<> + + #dim ZijnErGefaaldeTesten As %Boolean = 0 Set case="" For Set case=$o(@GlobalForLogging@(index,suite,case)) Quit:case="" Do . Set result=@GlobalForLogging@(index,suite,case) - . If $data(@GlobalForLogging@(index,suite,case))>1 - . If (mode = "ToonAlles") || '..IsSuccess(namespace,index,suite,case) Do + . Set IsSuccess = ..IsSuccess(namespace,index,suite,case) + . Set ZijnErGefaaldeTesten = ZijnErGefaaldeTesten || 'IsSuccess + . If (mode = "ToonAlles") || 'IsSuccess Do . . Set href=..#PackagePrefix_".Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case)_"&MODE="_..EscapeURL(mode) . . &html<> . . If &html<> . . Else &html<> - . . If ..IsSuccess(namespace,index,suite,case) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" } + . . If ..IsSuccess(namespace,index,suite,case) { Set color="green",status="Passed" } Else { Set color="red",status="Failed"} . . If +result . . If &html<> . . Else &html<> @@ -235,6 +289,12 @@ . . &html<> . . &html<> &html<
Test CasesStatusTijd
#(case)##(case)##(status)##(status_"
"_$p(result,":",2,99))#
> + + If ZijnErGefaaldeTesten { + &html<> + }Else{ + &html<> + } Quit $$$OK ]]>
@@ -246,9 +306,8 @@ %Status > - &html<#(..GetReportTitle())#> - If $d(@GlobalForLogging@(index,suite,case))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + Do ..BeginReport(index,suite,case) + &html<> &html<> &html<> @@ -288,9 +347,8 @@ %Status> - &html<> - If $d(@GlobalForLogging@(index,suite,case,method))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + + Do ..BeginReport(index,suite,case) &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #(..GetEndTime(index))# )
> &html<> &html<> @@ -364,7 +422,7 @@ 1 %String -
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #(..GetEndTime(index))# )
"_..#PackagePrefix_" | "_ $zu(110)_"
" +"_..#PackagePrefix_" | "_ $zu(110)_" | DATA "_..GetDataVersion()_" " ]]> @@ -391,7 +449,7 @@ 1 %String - @@ -401,9 +459,9 @@ 1 %String