Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust the result returned to be the old format again.

This commit is contained in:
Willi Goesgens 2014-10-29 21:10:57 +01:00
parent 1376d44110
commit 8db1e18568
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/common/modules/jsunity.js
View File

@ -28,25 +28,17 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
var _ = require("underscore");
var internal = require("internal"); var internal = require("internal");
var print = internal.print; var print = internal.print;
var fs = require("fs"); var fs = require("fs");
var console = require("console"); var console = require("console");
var COMPLETE={
"TOTAL": 0,
"PASSED": 0,
"FAILED": 0,
"DURATION": 0,
"RESULTS": {}
};
var TOTAL = 0; var TOTAL = 0;
var PASSED = 0; var PASSED = 0;
var FAILED = 0; var FAILED = 0;
var DURATION = 0; var DURATION = 0;
var RESULTS = {}; var RESULTS = {};
var COMPLETE = {};
var jsUnity = require("./jsunity/jsunity").jsUnity; var jsUnity = require("./jsunity/jsunity").jsUnity;
var STARTTEST = 0.0; var STARTTEST = 0.0;
@ -148,11 +140,7 @@ function Run (testsuite) {
FAILED += result.failed; FAILED += result.failed;
DURATION += result.duration; DURATION += result.duration;
COMPLETE.TOTAL += result.total; for (var attrname in RESULTS) { COMPLETE[attrname] = RESULTS[attrname]; }
COMPLETE.PASSED += result.passed;
COMPLETE.FAILED += result.failed;
COMPLETE.DURATION += result.duration;
_.defaults(COMPLETE.RESULTS, RESULTS);
return result; return result;
} }
@ -168,18 +156,18 @@ function Done (suiteName) {
var ok = FAILED === 0; var ok = FAILED === 0;
RESULTS.duration = DURATION; COMPLETE.duration = DURATION;
RESULTS.status = ok; COMPLETE.status = ok;
RESULTS.failed = FAILED; COMPLETE.failed = FAILED;
RESULTS.total = TOTAL; COMPLETE.total = TOTAL;
RESULTS.suiteName = suiteName; COMPLETE.suiteName = suiteName;
TOTAL = 0; TOTAL = 0;
PASSED = 0; PASSED = 0;
FAILED = 0; FAILED = 0;
DURATION = 0; DURATION = 0;
return COMPLETE.RESULTS; return COMPLETE;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////