changeset 21663:2a7bffd568e7

lib-mail: Place input/output of message-date tests in one struct Define both input and output of a message date test case in a single struct so it is easier to follow and less error prone. Also add some leap second tests.
author Martti Rannanj?rvi <martti.rannanjarvi@dovecot.fi>
date Tue, 21 Feb 2017 16:25:48 +0200
parents 4f63ef17d9dc
children 1cfecca4693d
files src/lib-mail/test-message-date.c
diffstat 1 files changed, 28 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/test-message-date.c	Tue Feb 21 17:00:14 2017 +0200
+++ b/src/lib-mail/test-message-date.c	Tue Feb 21 16:25:48 2017 +0200
@@ -4,7 +4,8 @@
 #include "message-date.h"
 #include "test-common.h"
 
-struct test_message_date_output {
+struct test_message_date {
+	const char *input;
 	time_t time;
 	int tz_offset;
 	bool ret;
@@ -12,33 +13,29 @@
 
 static void test_message_date_parse(void)
 {
-	static const char *input[] = {
+	static const struct test_message_date tests[] = {
 #ifdef TIME_T_SIGNED
-		"Thu, 01 Jan 1970 01:59:59 +0200",
-		"Fri, 13 Dec 1901 20:45:53 +0000",
+		{ "Thu, 01 Jan 1970 01:59:59 +0200", -1, 2*60, TRUE },
+		{ "Fri, 13 Dec 1901 20:45:53 +0000", -2147483647, 0, TRUE },
 #endif
 #if (TIME_T_MAX_BITS > 32 || !defined(TIME_T_SIGNED))
-		"Sun, 07 Feb 2106 06:28:15 +0000",
+		{ "Sun, 07 Feb 2106 06:28:15 +0000", 4294967295U, 0, TRUE },
 #endif
-		"Wed, 07 Nov 2007 01:07:20 +0200",
-		"Wed, 07 Nov 2007 01:07:20",
-		"Thu, 01 Jan 1970 02:00:00 +0200",
-		"Tue, 19 Jan 2038 03:14:07 +0000",
-		"Tue, 19 Jan 2038"
-	};
-	static struct test_message_date_output output[] = {
-#ifdef TIME_T_SIGNED
-		{ -1, 2*60, TRUE },
-		{ -2147483647, 0, TRUE },
-#endif
-#if (TIME_T_MAX_BITS > 32 || !defined(TIME_T_SIGNED))
-		{ 4294967295U, 0, TRUE },
-#endif
-		{ 1194390440, 2*60, TRUE },
-		{ 1194397640, 0, TRUE },
-		{ 0, 2*60, TRUE },
-		{ 2147483647, 0, TRUE },
-		{ 0, 0, FALSE }
+		{ "Wed, 07 Nov 2007 01:07:20 +0200", 1194390440, 2*60, TRUE },
+		{ "Wed, 07 Nov 2007 01:07:20", 1194397640, 0, TRUE },
+		{ "Thu, 01 Jan 1970 02:00:00 +0200", 0, 2*60, TRUE },
+		{ "Tue, 19 Jan 2038 03:14:07 +0000", 2147483647, 0, TRUE },
+		{ "Tue, 19 Jan 2038", 0, 0, FALSE },
+		/* June leap second */
+		{ "Tue, 30 Jun 2015 23:59:59 +0300", 1435697999, 3*60, TRUE },
+		{ "Tue, 30 Jun 2015 23:59:60 +0300", 1435697999, 3*60, TRUE },
+		{ "Wed, 01 Jul 2015 00:00:00 +0300", 1435698000, 3*60, TRUE },
+		/* Invalid leap second */
+		{ "Tue, 24 Jan 2017 15:59:60 +0300", 1485262799, 3*60, TRUE },
+		/* December leap second */
+		{ "Sat, 31 Dec 2016 23:59:59 +0200", 1483221599, 2*60, TRUE },
+		{ "Sat, 31 Dec 2016 23:59:60 +0200", 1483221599, 2*60, TRUE },
+		{ "Sun, 01 Jan 2017 00:00:00 +0200", 1483221600, 2*60, TRUE },
 	};
 	unsigned int i;
 	bool success;
@@ -46,12 +43,13 @@
 	int tz;
 	bool ret;
 
-	for (i = 0; i < N_ELEMENTS(input); i++) {
-		ret = message_date_parse((const unsigned char *)input[i],
-					 strlen(input[i]), &t, &tz);
-		success = (!ret && !output[i].ret) ||
-			(ret == output[i].ret && t == output[i].time &&
-			 tz == output[i].tz_offset);
+	for (i = 0; i < N_ELEMENTS(tests); i++) {
+		const struct test_message_date *test = &tests[i];
+		ret = message_date_parse((const unsigned char *)test->input,
+					 strlen(test->input), &t, &tz);
+		success = (!ret && !test->ret) ||
+			(ret == test->ret && t == test->time &&
+			 tz == test->tz_offset);
 		test_out(t_strdup_printf("message_date_parse(%d)", i), success);
 	}
 }