Merge tag 'branchpoint-5.1' into release

[disorder] / libtests / t-dateparse.c

diff --git a/libtests/t-dateparse.c b/libtests/t-dateparse.c
index 1e07c742f2cccc2e0d20db7ce200149d12306cad..452b23dcde2f7e460badd0550ac44785f199ee59 100644 (file)
--- a/libtests/t-dateparse.c
+++ b/libtests/t-dateparse.c
@@ -1,21 +1,19 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2008 Richard Kettlewell
+ * Copyright (C) 2008, 2009 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  * (at your option) any later version.

- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 #include "test.h"
 #include <time.h>
  */
 #include "test.h"
 #include <time.h>


@@ -35,7 +33,7 @@ static void check_date(time_t when,
 }
 
 static void test_dateparse(void) {
 }
 
 static void test_dateparse(void) {

-  time_t now = time(0);
+  time_t now = xtime(0);

   check_date(now, "%Y-%m-%d %H:%M:%S", localtime);
 #if 0         /* see dateparse.c */
   check_date(now, "%Y-%m-%d %H:%M:%S %Z", localtime);
   check_date(now, "%Y-%m-%d %H:%M:%S", localtime);
 #if 0         /* see dateparse.c */
   check_date(now, "%Y-%m-%d %H:%M:%S %Z", localtime);


@@ -48,6 +46,13 @@ static void test_dateparse(void) {
   check_date(now, "%H:%M:%S", localtime);
   /* This one needs a bodge: */
   check_date(now - now % 60, "%H:%M", localtime);
   check_date(now, "%H:%M:%S", localtime);
   /* This one needs a bodge: */
   check_date(now - now % 60, "%H:%M", localtime);

+  /* Reject invalid formats */
+  check_fatal(dateparse("12"));
+  check_fatal(dateparse("12:34:56:23"));
+  /* Reject invalid values */
+  check_fatal(dateparse("25:34"));
+  check_fatal(dateparse("23:61"));
+  check_fatal(dateparse("23:23:62"));

 }
 
 TEST(dateparse);
 }
 
 TEST(dateparse);