Más tests para stringizeStats

codenautas · Nov 8, 2016 · 0014740 · 0014740
1 parent bfd665f
commit 0014740
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 13 deletions.
diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -654,13 +654,25 @@ function finalizeStats(info) {
 }
 
 function stringizeStats(stats) {
-    var s=[];
-    s.push('rows:'+stats.rows);
-    s.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
+    var r=[];
+    r.push('rows:'+stats.rows);
+    r.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
     if(stats.primaryKey.length) {
-        s.push('primary key:'+stats.primaryKey.join(','));
+        r.push('primary key:'+stats.primaryKey.join(','));
     }
-    return s.join(', ');
+    var time = stats.endTime - stats.startTime;
+    var ms = parseInt((time%1000)),
+        secs = parseInt((time/1000)%60),
+        mins = parseInt((time/(1000*60))%60),
+        hs = parseInt((time/(1000*60*60))%24);
+    var t=[];
+    if(hs) { t.push(hs+'h'); }
+    if(mins) { t.push(mins+'m'); }
+    if(secs) { t.push(secs+'s'); }
+    if(ms) { t.push(ms+'ms'); }
+    if(! t.length) { t.push('0ms'); }
+    r.push('time:'+t.join(', '));
+    return r.join(', ');
 }
 
 function generateScripts(info){

diff --git a/test/test.js b/test/test.js
@@ -234,13 +234,15 @@ describe("file encoding", function(){
 
 describe("stringizeStats", function(){
     [
-        {stats:{rows:3,columns:3,textColumns:1, nullColumns:2, primaryKey:[]},
-           out:'rows:3, columns:3 (text:1, null:2)' },
+        {stats:{rows:3,columns:3,textColumns:1, nullColumns:2, primaryKey:[], startTime:0, endTime:1000},
+           out:'rows:3, columns:3 (text:1, null:2), time:1s' },
+        {stats:{rows:0,columns:1,textColumns:0, nullColumns:1, primaryKey:[], startTime:1000, endTime:8010},
+           out:'rows:0, columns:1 (text:0, null:1), time:7s, 10ms' },
     ].forEach(function(check, index) {
         if(check.skip) {
             it.skip(check.name);
         } else {
-            it(JSON.stringify(index), function(){
+            it((index+1)+': '+JSON.stringify(check.stats).substr(0,40)+'...', function(){
                 expect(txtToSql.stringizeStats(check.stats)).to.eql(check.out);
             });
         }

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -654,13 +654,25 @@ function finalizeStats(info) {
 }
 
 function stringizeStats(stats) {
-    var s=[];
-    s.push('rows:'+stats.rows);
-    s.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
+    var r=[];
+    r.push('rows:'+stats.rows);
+    r.push('columns:'+stats.columns+' (text:'+stats.textColumns+', null:'+stats.nullColumns+')');
     if(stats.primaryKey.length) {
-        s.push('primary key:'+stats.primaryKey.join(','));
+        r.push('primary key:'+stats.primaryKey.join(','));
     }
-    return s.join(', ');
+    var time = stats.endTime - stats.startTime;
+    var ms = parseInt((time%1000)),
+        secs = parseInt((time/1000)%60),
+        mins = parseInt((time/(1000*60))%60),
+        hs = parseInt((time/(1000*60*60))%24);
+    var t=[];
+    if(hs) { t.push(hs+'h'); }
+    if(mins) { t.push(mins+'m'); }
+    if(secs) { t.push(secs+'s'); }
+    if(ms) { t.push(ms+'ms'); }
+    if(! t.length) { t.push('0ms'); }
+    r.push('time:'+t.join(', '));
+    return r.join(', ');
 }
 
 function generateScripts(info){