Merge jv
authorMerge Script
Mon, 05 Dec 2016 06:48:09 +0100
branchjv
changeset 3238ec01ca33d6e
parent 322 9ec2abb1218e (current diff)
parent 321 ef82ce6fb3e9 (diff)
child 325 3bd7d9ad8b3f
Merge
reports/Builder__TestReportFormat.st
     1.1 --- a/.hgtags	Mon Nov 14 23:43:14 2016 +0000
     1.2 +++ b/.hgtags	Mon Dec 05 06:48:09 2016 +0100
     1.3 @@ -2,6 +2,10 @@
     1.4  1ce506fc7d855f0c8c61d14ec8d6aecd3e4c1d93 expecco_2_4_1
     1.5  24df7fe6d628f83445c3b76e5eb53310b137520c initialR
     1.6  258f98c24a4ea30137f622291db0d03ed808fdd9 expeccoALM_1_9_0_1
     1.7 +28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0
     1.8 +28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0_a
     1.9 +28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0_win75_lx36
    1.10 +28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_1
    1.11  29a8a74674f552a856e108465497c0b7169a340c expecco_2_2_0
    1.12  29a8a74674f552a856e108465497c0b7169a340c expecco_2_2_5
    1.13  3f9e255e7d47d6949286e64dab39c7acfedf02a4 expecco_2_5_0
     2.1 --- a/reports/Builder__TestReportFormat.st	Mon Nov 14 23:43:14 2016 +0000
     2.2 +++ b/reports/Builder__TestReportFormat.st	Mon Dec 05 06:48:09 2016 +0100
     2.3 @@ -303,18 +303,18 @@
     2.4  writeTestCase:testcase outcome:outcome time:time exception: exception stacktrace:stacktrace
     2.5      | result |
     2.6  
     2.7 -    outcome result == TestResult statePass ifTrue:[ 
     2.8 +    outcome result == TestResult statePass ifTrue:[
     2.9          result := #pass.
    2.10 -    ] ifFalse:[ 
    2.11 -        outcome result == TestResult stateFail ifTrue:[ 
    2.12 +    ] ifFalse:[
    2.13 +        outcome result == TestResult stateFail ifTrue:[
    2.14              result := #failure.
    2.15              failures := failures + 1
    2.16 -        ] ifFalse:[ 
    2.17 -            outcome result == TestResult stateError ifTrue:[ 
    2.18 +        ] ifFalse:[
    2.19 +            outcome result == TestResult stateError ifTrue:[
    2.20                  result := #error.
    2.21                  errors := errors + 1.
    2.22 -            ] ifFalse:[ 
    2.23 -                outcome result == TestResult stateSkip ifTrue:[ 
    2.24 +            ] ifFalse:[
    2.25 +                outcome result == TestResult stateSkip ifTrue:[
    2.26                      result := #skip.
    2.27                      skipped := skipped + 1
    2.28                  ] ifFalse:[
    2.29 @@ -324,11 +324,11 @@
    2.30          ].
    2.31      ].
    2.32  
    2.33 -    stream tab; 
    2.34 -            nextPutAll: '<testcase classname="'; 
    2.35 -            nextPutAll: (self encode: testcase nameForHDTestReport); 
    2.36 -            nextPutAll: '" name="'; 
    2.37 -            nextPutAll: (self encode: testcase selectorForHDTestReport); 
    2.38 +    stream tab;
    2.39 +            nextPutAll: '<testcase classname="';
    2.40 +            nextPutAll: (self encode: testcase nameForHDTestReport);
    2.41 +            nextPutAll: '" name="';
    2.42 +            nextPutAll: (self encode: testcase selectorForHDTestReport);
    2.43              nextPutAll: '" time="'; print: (time ? 0) / 1000.0; nextPutAll: '">'; cr.
    2.44  
    2.45      result == #skip ifTrue:[
    2.46 @@ -339,12 +339,12 @@
    2.47  
    2.48              exception isNil ifTrue:[
    2.49                  type := 'unknown exception'.
    2.50 -                message := 'unknown exception occured (no exception details available)'
    2.51 +                message := 'unknown exception occurred (no exception details available)'
    2.52              ] ifFalse:[
    2.53                  type := exception class name.
    2.54                  message := exception messageText ifNil:[ exception description ].
    2.55              ].
    2.56 -            
    2.57 +
    2.58  
    2.59              stream tab; tab;
    2.60                  nextPut:$<; nextPutAll: result;
    2.61 @@ -364,10 +364,10 @@
    2.62              stream nextPutAll:'    <system-out><!![CDATA['; cr.
    2.63              self writeCDATA: outcome collectedOutput.
    2.64              stream nextPutAll:']]> </system-out>'; cr.
    2.65 -        ].   
    2.66 +        ].
    2.67      ].
    2.68  
    2.69 -    stream tab; 
    2.70 +    stream tab;
    2.71              nextPutAll: '</testcase>'; cr.
    2.72  
    2.73  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/reports/run.sh	Mon Dec 05 06:48:09 2016 +0100
     3.3 @@ -0,0 +1,1 @@
     3.4 +../../../projects/smalltalk/stx -I --noBanner  -f report-runner.st -D /tmp -r Builder::TestReport -p exept:regression