Mercurial > forge

changeset 2647:20265bb9772e octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reorganize the test codem disabling some that can't work
author adb014
date Mon, 09 Oct 2006 20:33:49 +0000
parents 67569b84e26c
children d916245fad40
files main/time/inst/datesplit.m
diffstat 1 files changed, 20 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/main/time/inst/datesplit.m	Mon Oct 09 20:01:44 2006 +0000
+++ b/main/time/inst/datesplit.m	Mon Oct 09 20:33:49 2006 +0000
@@ -460,21 +460,29 @@
 %! 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]);
-%!#ambiguous assert (datevec("09/07/00"),[2000,9,7,0,0,0]);
-%!assert (datevec("Sep"),[nowvec(1),9,1,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("1 Jan 2000"),[2000,1,1,0,0,0]);
 %!assert (datevec("Sep00"),[2000,9,1,0,0,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,9,30,23,59,59]);
-%!assert (datevec("Mar.03.1962 13:53:06"),[1962,3,3,13,53,6]);
 %!assert (datevec("03/13/1962"),[1962,3,13,0,0,0]);
-%!assert (datevec("1995/03/13"),[1995,3,13,0,0,0]);
-%!assert (datevec("Q4-2132"),[2132,12,31,23,59,59]);
-%!assert (datevec("Mar2047"),[2047,3,1,0,0,0]);
-%!assert (datevec("20470313"),[2047,3,13,0,0,0]);
-%!assert (datevec("20470313T132603"),[2047,3,13,13,26,3]);
-%!assert (datevec("1047-03-13 13:26:03"),[1047,3,13,13,26,3]);
+
+## Ambiguous
+%!#assert (datevec("09/07/00"),[2000,9,7,0,0,0]);
+%!#assert (datevec("09/13"),[nowvec(1),9,13,0,0,0]);
+
+## Not supported in octave version of datevec
+%!#assert (datevec("Sep"),[nowvec(1),9,1,0,0,0]);
+%!#assert (datevec("Q3-00"),[2000,9,30,23,59,59]);
+%!#assert (datevec("Q4-2132"),[2132,12,31,23,59,59]);
+
+## This should be a standard string (without or without the time)
+%!assert (datevec("Mar.03.1962 13:53:06","mmm.dd.yyyy HH:MM:SS"),[1962,3,3,13,53,6]);
+
+## No longer a predefined string to parse the date in octave version
+%!assert (datevec("1995/03/13","yyyy/mm/dd"),[1995,3,13,0,0,0]);
+%!assert (datevec("Mar2047","mmmyyyy"),[2047,3,1,0,0,0]);
+%!assert (datevec("20470313","yyyymmdd"),[2047,3,13,0,0,0]);
+%!assert (datevec("20470313T132603","yyyymmddTHHMMSS"),[2047,3,13,13,26,3]);
+%!assert (datevec("1047-03-13 13:26:03","yyyy-mm-dd HH:MM:SS"),[1047,3,13,13,26,3]);