Index: Tools/Test/Report.cls.xml =================================================================== diff -u -r1137 -r1258 --- Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 1137) +++ Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 1258) @@ -36,7 +36,30 @@ set case=%request.Get("CASE") set method=%request.Get("METHOD") set showlast=%request.Get("SHOWLAST") - &html<#(..HyperEventHead())#> + &html< + + #(..HyperEventHead())# + + + > If namespace="" { Quit ..NoNameSpace() } ElseIf index="" { if showlast Quit ..ShowSuites(namespace,$order(@GlobalForLogging@(""),-1)) @@ -100,7 +123,7 @@ . Set succ=0,fail=0 . Set suite="" For Set suite=$o(@GlobalForLogging@(index,suite)) Quit:suite="" Do . . If ..IsSuccess(namespace,index,suite) { Set succ=succ+1 } Else { Set fail=fail+1 } - . If fail &html<#(fail)# Test Suite#($s(fail=1:"",1:"s"))# Failed> If 1 + . If fail &html<#(fail)# Test Suite#($s(fail=1:"",1:"s"))# Failed> If 1 . Else &html<All Test Suites Passed> . &html<> . &html<> @@ -121,31 +144,39 @@ #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<> + &html<> + If IsRunning { &html<> } - &html<> - - &html<> - &html<> + &html<> + + &html<> + &html<> + &html<> &html<

NameSpace:	#(namespace)#
#(namespace)#:	#(..GetDuration(index))#

	Duration #(..GetDuration(index))#
	Finished #(..GetEndTime(index))#
Triggered:	#(..GetLastTriggerTime())#
Finished:	#(..GetEndTime(index))#
Data:	#(..GetDataVersion())#

> + + If $G(^SYS("SourceControl","SVN","HasConflicts")) && (^SYS("SourceControl","SVN","HasConflicts")) { + &html<
Er zijn subversion conflicten !

> + } + &html<> &html<> - &html<> - &html<> + &html<> + &html<> &html<> Set suite="" For Set suite=$o(@GlobalForLogging@(index,suite)) Quit:suite="" Do . Set result=@GlobalForLogging@(index,suite) . Set href=..#PackagePrefix_".Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite) . &html<> . If $data(@GlobalForLogging@(index,suite))>1 - . If &html<> - . Else &html<> - . If ..IsSuccess(namespace,index,suite) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" } + . If &html<> + . Else &html<> + . If ..IsSuccess(namespace,index,suite) { Set status="Passed", styleClass="goed" } Else {Set status="Failed",styleClass="fout" } . If +result - . If &html<> - . Else &html<> + . If &html<> + . Else &html<> . &html<> &html<

Test Suites ( ID #(index)# )	Status	Test Suites ( ID #(index)# )	Status
#(suite)#	#(suite)#	#(suite)#	#(suite)#	#(status)#	#(status_" "_$p(result,":",2,99))#	#(status)#	#(status_" "_$p(result,":",2,99))#

> Quit $$$OK @@ -346,6 +377,13 @@ ]]> + +1 +%String + + + 1 Tijdstip:%String @@ -382,6 +420,13 @@ ]]> + +1 +%String + + + 1 1