javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

closing tag fixed and duration added

Browse Source
This commit is contained in:
Vladimir Enchev
2016-02-23 15:14:16 +02:00
parent b14d878dd8
commit 53c3ee568c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/tests/TKUnit.ts
View File

@@ -27,6 +27,7 @@ export interface TestInfoEntry {
isPassed: boolean; isPassed: boolean;
errorMessage: string; errorMessage: string;
testTimeout: number; testTimeout: number;
duration: number;
} }
export function time(): number { export function time(): number {
@@ -56,6 +57,7 @@ var runTest = function (testInfo: TestInfoEntry) {
if (testInfo.isTest) { if (testInfo.isTest) {
duration = time() - start; duration = time() - start;
testInfo.duration = duration;
write("--- [" + testInfo.testName + "] OK, duration: " + duration, trace.messageType.info); write("--- [" + testInfo.testName + "] OK, duration: " + duration, trace.messageType.info);
testInfo.isPassed = true; testInfo.isPassed = true;
} }
@@ -63,6 +65,7 @@ var runTest = function (testInfo: TestInfoEntry) {
catch (e) { catch (e) {
if (testInfo.isTest) { if (testInfo.isTest) {
duration = time() - start; duration = time() - start;
testInfo.duration = duration;
write("--- [" + testInfo.testName + "] FAILED: " + e.message + ", duration: " + duration, trace.messageType.error); write("--- [" + testInfo.testName + "] FAILED: " + e.message + ", duration: " + duration, trace.messageType.error);
testInfo.isPassed = false; testInfo.isPassed = false;
testInfo.errorMessage = e.message; testInfo.errorMessage = e.message;
@@ -109,6 +112,7 @@ function runAsync(testInfo: TestInfoEntry, recursiveIndex: number, testTimeout?:
let duration; let duration;
var checkFinished = function () { var checkFinished = function () {
duration = time() - testStartTime; duration = time() - testStartTime;
testInfo.duration = duration;
if (isDone) { if (isDone) {
write("--- [" + testInfo.testName + "] OK, duration: " + duration, trace.messageType.info); write("--- [" + testInfo.testName + "] OK, duration: " + duration, trace.messageType.info);
//write("--- [" + testInfo.testName + "] took: " + (new Date().getTime() - testStartTime), trace.messageType.info); //write("--- [" + testInfo.testName + "] took: " + (new Date().getTime() - testStartTime), trace.messageType.info);

11
apps/tests/testRunner.ts
View File

@@ -127,6 +127,7 @@ function printRunTestStats() {
for (j = 0; j < allTests.length; j++) { for (j = 0; j < allTests.length; j++) {
let testName = allTests[j].testName; let testName = allTests[j].testName;
let duration = allTests[j].duration;
if (!allTests[j].isPassed) { if (!allTests[j].isPassed) {
failedTestCount++; failedTestCount++;
@@ -135,10 +136,10 @@ function printRunTestStats() {
failedTestInfo.push(allTests[j].testName + " FAILED: " + allTests[j].errorMessage); failedTestInfo.push(allTests[j].testName + " FAILED: " + allTests[j].errorMessage);
testFileContent.push(`<testcase classname="classname" name="${testName}" time="0"><failure type="exceptions.AssertionError">${errorMessage}</failure></testcase>`); testFileContent.push(`<testcase classname="classname" name="${testName}" time="${duration}"><failure type="exceptions.AssertionError">${errorMessage}</failure></testcase>`);
} else { } else {
testFileContent.push(`<testcase classname="classname" name="${testName}" time="0"></testcase>`); testFileContent.push(`<testcase classname="classname" name="${testName}" time="${duration}"></testcase>`);
} }
} }
@@ -151,7 +152,7 @@ function printRunTestStats() {
finalMessage += "\n" + failureMessage; finalMessage += "\n" + failureMessage;
} }
testFileContent.push("</testsuite"); testFileContent.push("</testsuite>");
testFileContent.push("</testsuites>"); testFileContent.push("</testsuites>");
let testFile = fs.File.fromPath(fs.path.join(fs.knownFolders.documents().path, "test-results.xml")); let testFile = fs.File.fromPath(fs.path.join(fs.knownFolders.documents().path, "test-results.xml"));
@@ -263,8 +264,9 @@ class TestInfo implements TKUnit.TestInfoEntry {
isPassed: boolean; isPassed: boolean;
errorMessage: string; errorMessage: string;
testTimeout: number; testTimeout: number;
duration: number;
constructor(testFunc, testInstance?: any, isTest?, testName?, isPassed?, errorMessage?, testTimeout?) { constructor(testFunc, testInstance?: any, isTest?, testName?, isPassed?, errorMessage?, testTimeout?, duration?) {
this.testFunc = testFunc; this.testFunc = testFunc;
this.instance = testInstance || null; this.instance = testInstance || null;
this.isTest = isTest || false; this.isTest = isTest || false;
@@ -272,5 +274,6 @@ class TestInfo implements TKUnit.TestInfoEntry {
this.isPassed = isPassed || false; this.isPassed = isPassed || false;
this.errorMessage = errorMessage || ""; this.errorMessage = errorMessage || "";
this.testTimeout = testTimeout; this.testTimeout = testTimeout;
this.duration = duration;
} }
} }