Index: Tools/Test/Report.cls.xml =================================================================== diff -u -r499 -r501 --- Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 499) +++ Tools/Test/Report.cls.xml (.../Report.cls.xml) (revision 501) @@ -14,6 +14,14 @@ ]]> + +%String + + + +%String + + Adapted to Van Hoecke's needs by FMA (small change: reversed the order of the test runs in the report: most recent first). @@ -38,6 +46,7 @@ +1 1 %Status +1 1 -namespace +namespace:%String %Status Status> &html< > &html<> - Set index="" For Set index=$o(^|namespace|LOG.UnitTestLog(index),-1) Quit:index="" Do - . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index + Set index="" For Set index=$o(@..#GlobalForLogging@(index),-1) Quit:index="" Do + . Set href=..#PackagePrefix_".Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index . &html<> . &html<#(index)#> - . &html<#($zdatetime(^|namespace|LOG.UnitTestLog(index),5,3))#> + . &html<#($zdatetime(@..#GlobalForLogging@(index),5,3))#> . Set succ=0,fail=0 - . Set suite="" For Set suite=$o(^|namespace|LOG.UnitTestLog(index,suite)) Quit:suite="" Do + . 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 . Else &html<All Test Suites Passed> @@ -91,28 +101,29 @@ +1 1 -namespace,index +namespace:%String,index:%Integer %Status > &html<
Unit Test Report
> - If $d(^|namespace|LOG.UnitTestLog(index))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + If $d(@..#GlobalForLogging@(index))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK &html<> &html<> - &html<> + &html<> &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #($zdatetime(^|namespace|LOG.UnitTestLog(index),5,3))# )
LogIndex: #(index)# ( Test finished on #($zdatetime(@..#GlobalForLogging@(index),5,3))# )
> &html<
> &html<> &html<> &html<> &html<> &html<> - Set suite="" For Set suite=$o(^|namespace|LOG.UnitTestLog(index,suite)) Quit:suite="" Do - . Set result=^|namespace|LOG.UnitTestLog(index,suite) - . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite) + 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(^|namespace|LOG.UnitTestLog(index,suite))>1 + . 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" } @@ -126,16 +137,17 @@ +1 1 -namespace,index,suite +namespace:%String,index:%String,suite:%String %Status > &html<
Test SuitesStatus
#(suite)##(suite)#
Unit Test Report
> - If $d(^|namespace|LOG.UnitTestLog(index,suite))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + If $d(@..#GlobalForLogging@(index,suite))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK &html<> &html<> - &html<> + &html<> &html<> &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #($zdatetime(^|namespace|LOG.UnitTestLog(index),5,3))# )
LogIndex: #(index)# ( Test finished on #($zdatetime(@..#GlobalForLogging@(index),5,3))# )
TestSuite: #(suite)#
> &html<
> @@ -145,11 +157,11 @@ &html<Status> &html<Tijd> &html<> - Set case="" For Set case=$o(^|namespace|LOG.UnitTestLog(index,suite,case)) Quit:case="" Do - . Set result=^|namespace|LOG.UnitTestLog(index,suite,case) - . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case) + Set case="" For Set case=$o(@..#GlobalForLogging@(index,suite,case)) Quit:case="" Do + . Set result=@..#GlobalForLogging@(index,suite,case) + . Set href=..#PackagePrefix_".Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case) . &html<> - . If $data(^|namespace|LOG.UnitTestLog(index,suite,case))>1 + . If $data(@..#GlobalForLogging@(index,suite,case))>1 . If &html<#(case)#> . Else &html<#(case)#> . If ..IsSuccess(namespace,index,suite,case) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" } @@ -164,16 +176,17 @@ +1 1 -namespace,index,suite,case +namespace:%String,index:%String,suite:%String,case:%String %Status > &html<
Unit Test Report
> - If $d(^|namespace|LOG.UnitTestLog(index,suite,case))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + If $d(@..#GlobalForLogging@(index,suite,case))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK &html<> &html<> - &html<> + &html<> &html<> &html<> &html<
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #($zdatetime(^|namespace|LOG.UnitTestLog(index),5,3))# )
LogIndex: #(index)# ( Test finished on #($zdatetime(@..#GlobalForLogging@(index),5,3))# )
TestSuite: #(suite)#
TestCase: #(case)#
> @@ -184,11 +197,11 @@ &html<Description> // JCL - Method description toegevoegd &html<Status> &html<> - Set method="" For Set method=$o(^|namespace|LOG.UnitTestLog(index,suite,case,method)) Quit:method="" Do - . Set result=^|namespace|LOG.UnitTestLog(index,suite,case,method) - . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case)_"&METHOD="_..EscapeURL(method) + Set method="" For Set method=$o(@..#GlobalForLogging@(index,suite,case,method)) Quit:method="" Do + . Set result=@..#GlobalForLogging@(index,suite,case,method) + . Set href=..#PackagePrefix_".Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case)_"&METHOD="_..EscapeURL(method) . &html<> - . If $data(^|namespace|LOG.UnitTestLog(index,suite,case,method))>1 + . If $data(@..#GlobalForLogging@(index,suite,case,method))>1 . If &html<#(method)#()> . Else &html<#(method)#()> . If 1 @@ -204,16 +217,17 @@ +1 1 -namespace,index,suite,case,method +namespace:%String,index:%String,suite:%String,case:%String,method:%String %Status > &html<
Unit Test Report
> - If $d(^|namespace|LOG.UnitTestLog(index,suite,case,method))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK + If $d(@..#GlobalForLogging@(index,suite,case,method))=0 &html<
Log Entry Doesn't Exist!> Quit $$$OK &html<> &html<> - &html<> + &html<> &html<> &html<> &html<> @@ -225,8 +239,8 @@ &html<> &html<> &html<> - Set action="" For Set action=$o(^|namespace|LOG.UnitTestLog(index,suite,case,method,action)) Quit:action="" Do - . Set result=^|namespace|LOG.UnitTestLog(index,suite,case,method,action) + Set action="" For Set action=$o(@..#GlobalForLogging@(index,suite,case,method,action)) Quit:action="" Do + . Set result=@..#GlobalForLogging@(index,suite,case,method,action) . &html<> . &html<> . &html<> @@ -239,36 +253,38 @@ +1 1 -namespace,index +namespace:%String,index:%String %Status +1 1 -namespace,index,suite,case,method,action +namespace:%String,index:%String,suite:%String,case:%String,method:%String,action:%String %Boolean %Boolean 1 + + +1 +1 +1 +Tools.Test.Manager +
NameSpace: #(namespace)#
LogIndex: #(index)# ( Test finished on #($zdatetime(^|namespace|LOG.UnitTestLog(index),5,3))# )
LogIndex: #(index)# ( Test finished on #($zdatetime(@..#GlobalForLogging@(index),5,3))# )
TestSuite: #(suite)#
TestCase: #(case)#
Method: #(method)#()
Assert DescriptionStatus
#($p(result,":",2))##($p(result,":",3,99))#