Index: vhUnitTest/Manager.cls.xml =================================================================== diff -u -r915 -r1065 --- vhUnitTest/Manager.cls.xml (.../Manager.cls.xml) (revision 915) +++ vhUnitTest/Manager.cls.xml (.../Manager.cls.xml) (revision 1065) @@ -1,5 +1,5 @@ - + Adopted from InterSystems's %UnitTest.Manager by logist (Dimas ltd., Russia) @@ -12,7 +12,7 @@ vhLib.Macro 1 %RegisteredObject -62146,31947.407668 +62208,42576.680702 59429,65352.216564 0 @@ -113,11 +113,13 @@ Set port=$get(^%SYS("SSPort"),1972) set Message = "http://"_$$$Server_":"_port_"/csp/admin1/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL($znspace)_"&INDEX="_manager.LogIndex_"&SUITE="_testsuite if 'manager.IsSuccess(testsuite) { - Do SendMiniMail^vhLib(From,$LB("ict_development@vanhoecke.be"),"UnitTest "_manager.LogIndex_" Failed on ["_$$$Server_"]",Message,0) + Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenFailed")) + Do SendMiniMail^vhLib(From,MailTo,"UnitTest "_manager.LogIndex_" Failed on ["_$$$Server_"]",Message,0) } else { - Do SendMiniMail^vhLib(From,$LB("ICT_UnittestSysOp@vanhoecke.be"),"UnitTest "_manager.LogIndex_" Succeeded on ["_$$$Server_"]",Message,0) - } + Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenSucceeded")) + Do SendMiniMail^vhLib(From,MailTo,"UnitTest "_manager.LogIndex_" Succeeded on ["_$$$Server_"]",Message,0) + } } Quit $$$OK @@ -157,20 +159,27 @@ Do ..LogStateBegin(suite,class) Do Do ..LogStateEnd(suite,class) . Set testcase=$zobjclassmethod(class,"%New",##this) . Set testcase.Debug=..Debug + . Set $zt= "MethErrorOnBeforeAllTests" . Set sc=testcase.OnBeforeAllTests() If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnBeforeAllTests") Quit + . Set method="" For Set method=$$$comMemberNext(class,$$$cCLASSmethod,method) q:method="" If $e(method,1,4)="Test" Do . . Do ..LogStateBegin(suite,class,method) Do Do ..LogStateEnd(suite,class,method) . . . Set success=0 + . . . Set $zt="MethError" . . . Set sc=testcase.OnBeforeOneTest(method) If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnBeforeOneTest") Quit - . . . If '..Debug Set $zt="MethError" . . . Set zhbeg=$zh Do $zobjmethod(testcase,method) Set zhend=$zh . . . Set ..TestCount=..TestCount+1 . . . Do ..LogMessage("Duration of execution: "_(zhend-zhbeg)_" sec.") . . . Set sc=testcase.OnAfterOneTest(method) If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnAfterOneTest") Quit . . . Quit MethError . . . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError,$ze_":"_$Text(@$Piece($ze,">",2,32767))),method) . . . Quit + . Set $zt= "MethErrorOnAfterAllTests" . Set sc=testcase.OnAfterAllTests() If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnAfterAllTests") Quit + . Goto Einde +MethErrorOnBeforeAllTests . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError),"OnBeforeAllTests") Goto Einde +MethErrorOnAfterAllTests . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError),"OnAfterAllTests") Goto Einde +Einde . Kill testcase Do ..LogStateEnd(suite) ; @@ -381,5 +390,5 @@ ]]> - +