Primer test corregido de Date

codenautas · Oct 4, 2016 · 1138b93 · 1138b93
1 parent 2556d5e
commit 1138b93
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/lib/discrepances.js b/lib/discrepances.js
@@ -80,35 +80,31 @@ function compareArrays(a, b) {
 }
 
 function compareDates(a, b) {
-    var rv = {};
+    var res = [];
     var timesDiffer = timeStr(a) !== timeStr(b);
     var msDiff = a.getTime()-b.getTime();
     var showTimeDiff = Math.abs(msDiff) <= 359999000; // 99 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000;
     if(datetime(a).toYmd() !== datetime(b).toYmd()) {
         var aas = datetime(a).toYmdHmsM();
         var bbs = datetime(b).toYmdHmsM();
-        var left=[], right=[];
-        left.push(aas.slice(0, 10));
+        res.push(aas.slice(0, 10));
         if(timesDiffer) {
-            left.push(' ');
-            left.push(aas.substr(11, a.getMilliseconds()?12:8));
+            res.push(' ');
+            res.push(aas.substr(11, a.getMilliseconds()?12:8));
         }
-        right.push(bbs.slice(0, 10));
+        res.push(' != ');
+        res.push(bbs.slice(0, 10));
         if(timesDiffer) {
-            right.push(' ');
-            right.push(bbs.substr(11, b.getMilliseconds()?12:8));
+            res.push(' ');
+            res.push(bbs.substr(11, b.getMilliseconds()?12:8));
         }
-        rv.left = left.join('');
-        rv.right = right.join('');
     }
     if(timesDiffer && showTimeDiff) {
-        var diff=[];
-        diff.push(timeInterval(msDiff).toHms());
+        res.push(timeInterval(msDiff).toHms());
         var ms = Math.floor(Math.abs(msDiff) % 1000);
-        if(ms>0) { diff.push('.'+ms); }
-        rv.diff = diff.join('');
+        if(ms>0) { res.push('.'+ms); }
     }
-    return Object.keys(rv).length ?  {difference:rv, values:[a,b]} : null;
+    return res.length ?  {difference:res.join(''), values:[a,b]} : null;
 }
 
 function compareObjects(a, b) {

diff --git a/test/test.js b/test/test.js
@@ -22,9 +22,9 @@ describe("discrepances", function(){
         {a:"un pez negro"        , b:"un pez blanco"    , expect: {differences: ['negro', 'blanco', {pos:7}], values:["un pez negro", "un pez blanco"]}                        },
         {a:"negro el ocho"       , b:"rojo el ocho"     , expect: {differences: ['negro', 'rojo'  , {pos:0}], values:["negro el ocho", "rojo el ocho"]}                        },
         {a:fechaActual           , b:fechaActual        , expect: null                        },
-        {a:new Date(2011,1,3), b:new Date(2011,1,4) , expect: {difference:{left:'2011-02-03', right:'2011-02-04'}, values:[new Date(2011,1,3), new Date(2011,1,4)] }},
-        {skip:true, a: new Date(1992,11,5)  , b:new Date(1935,8,1) , expect: {difference: {left:'1992-12-05', right:'1935-09-01'}}                     },
-        {skip:true, a: new Date(1992,11,5,10,0,0), b:new Date(1935,8,1,15,0,0), expect: { difference: {left:'1992-12-05 10:00:00', right:'1935-09-01 15:00:00'}}},
+        {a:new Date(2011,1,3), b:new Date(2011,1,4) , expect: {difference:'2011-02-03 != 2011-02-04', values:[new Date(2011,1,3), new Date(2011,1,4)] }},
+        {skip:true, a: new Date(1992,11,5)       , b:new Date(1935,8,1)         , expect:'1992-12-05 != 1935-09-01'},
+        {skip:true, a: new Date(1992,11,5,10,0,0), b:new Date(1935,8,1,15,0,0)  , expect:'1992-12-05 10:00:00 != 1935-09-01 15:00:00'},
         {skip:true, a: new Date(1992,11,5,15,0,0), b:new Date(1992,11,5,10,10,0), expect:'04:50:00'},
         {skip:true, a: new Date(1992,11,5,0,0,0),  b:new Date(1992,11,6,15,25,0), expect:'1992-12-05 00:00:00 != 1992-12-06 15:25:00 => -39:25:00'},
         {skip:true, a: new Date(1992,11,5,0,0,0,100),  b:new Date(1992,11,6,15,25,0,200), expect:'1992-12-05 00:00:00.100 != 1992-12-06 15:25:00.200 => -39:25:00.100'},