hg/stx-goodies-builder: comparison reports/Builder_

equal deleted inserted replaced

-:9d572c1caefa
+:f50803f4bb59
 writeTestCase: testcase outcome: outcome time: time exception: exception
 | stacktrace |
 exception isNil ifTrue:[
 stacktrace := nil.
 ] ifFalse:[
 stacktrace :=
 (String streamContents:[:s|
 self writeStackTrace: exception of: testcase on: s
 ])
 ].
 ^self writeTestCase: testcase outcome: outcome time: time exception: exception
 stacktrace: stacktrace
 "Created: / 03-08-2011 / 19:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 context args keysAndValuesDo:[:idx :eachArg |
 s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '. eachArg printOn: s.s cr.
 ].
 s nextPutAll:'vars: '; cr.
 context vars keysAndValuesDo:[:idx :eachVar |
 s nextPutAll:'  '. idx printOn: s. s nextPutAll:': '.
 eachVar isString ifTrue:[
 eachVar storeOn: s.
 ] ifFalse:[
 eachVar printOn: s.
 ].
 s cr.
 ].
 s nextPutAll:'source: '; cr.
 [
 home := context methodHome.
 mthd := home method.
 mthd isNil ifTrue:[
 src isNil ifTrue:[
 s nextPutAll: '** no source **'. s cr. s cr.
 ^ self.
 ].
 ] on: Error do:[:ex|
 s
 nextPutAll: '** error when getting source: ';
 nextPutAll:  ex description;
 nextPutAll: '**';
 cr; cr.
 ^ self.
 nextPut:Character lf.
 stream
 nextPutAll:'<testsuite name="';
 nextPutAll:(Report encode:report name);
 nextPutAll:'" tests="';
-print:report suite testCount;
+print:report suite countTests;
 nextPutAll:('" hostname="%1"' bindWith:OperatingSystem getHostName);
 nextPutAll:'>'.
 "Now this is ugly. We want to update the time and the number of failures and errors, but still at the same time stream a valid XML. So remember this position and add some whitespace, that we can fill later."
 position := stream stream position - 1.
 stream
 nextPutLine:('    <property name="user.name" value="%1" />' bindWith:OperatingSystem getLoginName);
 nextPutLine:('    <property name="user.language" value="%1" />' bindWith:Smalltalk language).
 "/    stream
 "/        nextPutLine:('    <property name="smalltalk.libbasic.version" value="%1" />'bindWith:stx_libbasic versionString).
 stream
 nextPutLine: '  </properties>'.
 startTime := OperatingSystem getMillisecondTime.
 "Created: / 03-08-2011 / 19:14:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-06-2014 / 01:14:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !TestReportFormat::JUnit methodsFor:'writing - utilities'!
 writeCDATA: string
 | start stop |
 start := 1.
 stop := start.
 [ (stop := (string indexOf: $] startingAt: stop)) ~~ 0 ] whileTrue:[
 ((stop < (string size - 1))
 and:[(string at: stop + 1) == $]
 and:[(string at: stop + 2) == $>]]) ifTrue:[
 " Okay, found CDATA end token "
 stream nextPutAll: string startingAt: start to: stop + 1.
 stream nextPutAll: ']]><!![CDATA[>'.
 ] ifFalse:[
 stop := stop + 1.
 ].
 ].
 start < string size ifTrue:[
 stream nextPutAll: string startingAt: start to: string size.
 ].
 "
 String streamContents:[:s | Builder::TestReportFormat::JUnit new report: nil stream: s; writeCDATA:'ABCD']
 String streamContents:[:s | Builder::TestReportFormat::JUnit new report: nil stream: s; writeCDATA:']]]]']
 String streamContents:[:s | Builder::TestReportFormat::JUnit new report: nil stream: s; writeCDATA:'Some <[CDATA[ CDATA ]]> Some Text and stray terminator ]]> here']
 "
 "Created: / 05-07-2013 / 16:54:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 "
 Example:
 <test
 name='test_format_link_not_in_repos_with_line'
 executed='exec-status'
 <result>
 <success passed='result-status' state='result-state'/>
 <errorlog><!![CDATA[EXEMPLE OF ERROR LOG]]></errorlog>
 </result>
 </test>
 "
 |testClassName executionTime testName testDescription
 successPassed successState exceptionInfo
 compilerName compilerVersion compilerConfiguration compilerVersionDate
 timeUnit timeMeasure
 sysInfo osType osVersion cpuType|
 testClassName := testcase printString.
 testName := testcase selector.
 nextPutLine:('      <version><!![CDATA[%1]]></version>' bindWith:osVersion);
 nextPutLine:'    </os>';
 nextPutLine:('    <processor arch="%1">' bindWith:cpuType);
 "/ nextPutLine:('      <frequency> unit="Mhz" cpufreq="%1" />' bindWith:cpuSpeed);
 nextPutLine:'    </processor>';
 nextPutLine:('    <compiler name="%1" version="%2" versiondate="%3" configuration="%4" />'
 bindWith:compilerName with:compilerVersion
 with:compilerVersionDate with:compilerConfiguration);
 "/ nextPutLine:'    <environment />';
 nextPutLine:'  </platform>';
 nextPutLine:'  <result>';
 nextPutLine:('    <success passed="%1" state="100" />'
 bindWith:successPassed with:successState);
 "/ cg: in the perfPublisher documentation, I found "mesure".
 "/ I am not sure, if that was a typo, or is actually what is expected...
 "/ to be on the save side, I generate both a mesure and a measure attribute,
 "/ so it will work, even if they ever fix perfPublisher's xml parser.
 nextPutLine:('    <executiontime unit="%1" mesure="%2" measure="%2" isRelevant="yes" />'
 bindWith:timeUnit with:timeMeasure).
 exceptionInfo notNil ifTrue:[
 stream
 nextPutLine:'    <errorlog><!![CDATA[';
 | testClassName result |
 testClassName := testcase class printString.
 outcome result == TestResult statePass ifTrue:[
 result := #success.
 ] ifFalse:[
 outcome result == TestResult stateFail ifTrue:[
 result := #failure.
 ] ifFalse:[
 outcome result == TestResult stateError ifTrue:[
 result := #error.
 ] ifFalse:[
 outcome result == TestResult stateSkip ifTrue:[
 result := #skip.
 ] ifFalse:[
 self error: 'Invalid test result'.
 ]
 ].
 ].
 ].
 stream
 nextPutAll:'<test duration="'; nextPutAll:time; nextPutLine:'"';
 tab; nextPutAll:'status="'; nextPutAll: result; nextPutLine:'"';
 tab; nextPutAll:'ficture="'; nextPutAll: testClassName; nextPutLine:'"';
 tab; nextPutAll:'name="'; nextPutAll: testcase selector; nextPutLine:'"';
 "It seems that some tools requires the file attributes. So we supply one :-)"
 tab; nextPutAll:'file="'; nextPutAll: testClassName , '.st'; nextPutLine:'">'.
 "Modified: / 03-08-2011 / 20:05:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 writeHeader
-stream nextPutAll: '1..'; nextPutAll: report suite testCount printString; cr.
+stream nextPutAll: '1..'; nextPutAll: report suite countTests printString; cr.
 index := 0
 "Modified: / 04-08-2011 / 13:49:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 writeTestCase:testcase outcome:outcome time:time exception:exception stacktrace:stacktrace
 | result testDescription statusString |
 index := index + 1.
 outcome result == TestResult statePass ifTrue:[
 result := #pass.
 ] ifFalse:[
 outcome result == TestResult stateFail ifTrue:[
 result := #failure.
 ] ifFalse:[
 outcome result == TestResult stateError ifTrue:[
 result := #error.
 ] ifFalse:[
 outcome result == TestResult stateSkip ifTrue:[
 result := #skip.
 ] ifFalse:[
 self error: 'Invalid test result'.
 ]
 ].
 ].
 ].
 testDescription := '%1-%2 (%3ms)'
 bindWith:testcase printString
 with:testcase selector
 with:time.

changeset 513	f50803f4bb59
parent 319	f525a38861f1