From: Paul K. <pki...@us...> - 2005-02-28 01:55:36
|
Update of /cvsroot/octave/octave-forge/main/time In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13384 Modified Files: datesplit.m Log Message: Remove dd/mm forms from tests. Index: datesplit.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/datesplit.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- datesplit.m 28 Feb 2005 01:32:05 -0000 1.1 +++ datesplit.m 28 Feb 2005 01:55:26 -0000 1.2 @@ -421,25 +421,21 @@ endfunction %!shared today -%! today=datevec(now); % Some tests could fail around midnight! +%! nowvec=datevec(now); % Some tests could fail around midnight! %!assert (datevec("07-Sep-2000 15:38:09"),[2000,9,7,15,38,9]); %!assert (datevec("07-Sep-2000"),[2000,9,7,0,0,0]); -%!assert (datevec("09/07/00"),[2000,9,7,0,0,0]); -%!assert (datevec("Sep"),[today(1),9,7,0,0,0]); -%!assert (datevec("09/13"),[today(1),9,13,0,0,0]); +%!#ambiguous assert (datevec("09/07/00"),[2000,9,7,0,0,0]); +%!assert (datevec("Sep"),[nowvec(1),9,7,0,0,0]); +%!#ambiguous assert (datevec("09/13"),[nowvec(1),9,13,0,0,0]); %!assert (datevec("2000"),[2000,1,1,0,0,0]); %!assert (datevec("Sep00"),[2000,9,1,0,0,0]); -%!assert (datevec("15:38:09"),[today(1:3),15,38,9]); -%!assert (datevec("03:38:09 PM"),[today(1:3),15,38,9]); -%!assert (datevec("15:38"),[today(1:3),15,38,0]); -%!assert (datevec("3:38 PM"),[today(1:3),15,38,0]); +%!assert (datevec("15:38:09"),[nowvec(1:3),15,38,9]); +%!assert (datevec("03:38:09 PM"),[nowvec(1:3),15,38,9]); +%!assert (datevec("15:38"),[nowvec(1:3),15,38,0]); +%!assert (datevec("3:38 PM"),[nowvec(1:3),15,38,0]); %!assert (datevec("Q3-00"),[2000,7,1,0,0,0]); -%!assert (datevec("13/03"),[today(1),3,13,0,0,0]); -%!assert (datevec("13/03/95"),[1995,3,13,0,0,0]); %!assert (datevec("Mar.03.1962 13:53:06"),[1962,3,3,13,53,6]); %!assert (datavec("03/13/1962"),[1962,3,13,0,0,0]); -%!assert (datavec("12/03/1962"),[1962,12,3,0,0,0]); -%!assert (datavec("95/03/13"),[1995,3,13,0,0,0]); %!assert (datevec("1995/03/13"),[1995,3,13,0,0,0]); %!assert (datevec("Q4-2132"),[2132,10,1,0,0,0]); %!assert (datevec("Mar2047"),[2047,3,1,0,0,0]); |