Tests + bugfix for ttail_tm_cmp() function

src/include/ttail_search.h

@@ -104,7 +104,6 @@ const char* ttail_logline_subst(ttail_t*, const char*);
  *@param a struct tm*
  *@param b struct tm*
  *@return <0 if a<b, >0 if a>b and 0 if a == b
- *@todo checks
  */
 int ttail_tm_cmp(const struct tm*, const struct tm*);
 

src/ttail_search.c

@@ -127,32 +127,32 @@ int ttail_tm_cmp(const struct tm *ta, const struct tm *tb)
 {
 	int r;
 	r=0;
-	if(ta->tm_year >= 0 && ta->tm_year >= 0)
+	if(ta->tm_year >= 0 && tb->tm_year >= 0)
 	{
 		r = ta->tm_year - tb->tm_year;
 		if(r) { return r; }
 	}
-	if(ta->tm_mon >= 0 && ta->tm_mon >= 0)
+	if(ta->tm_mon >= 0 && tb->tm_mon >= 0)
 	{
 		r = ta->tm_mon - tb->tm_mon;
 		if(r) { return r; }
 	}
-	if(ta->tm_mday >= 0 && ta->tm_mday >= 0)
+	if(ta->tm_mday >= 0 && tb->tm_mday >= 0)
 	{
 		r = ta->tm_mday - tb->tm_mday;
 		if(r) { return r; }
 	}
-	if(ta->tm_hour >= 0 && ta->tm_hour >= 0)
+	if(ta->tm_hour >= 0 && tb->tm_hour >= 0)
 	{
 		r = ta->tm_hour - tb->tm_hour;
 		if(r) { return r; }
 	}
-	if(ta->tm_min >= 0 && ta->tm_min >= 0)
+	if(ta->tm_min >= 0 && tb->tm_min >= 0)
 	{
 		r = ta->tm_min - tb->tm_min;
 		if(r) { return r; }
 	}
-	if(ta->tm_sec >= 0 && ta->tm_sec >= 0)
+	if(ta->tm_sec >= 0 && tb->tm_sec >= 0)
 	{
 		r = ta->tm_sec - tb->tm_sec;
 	}

tests/ttail_search_tm_cmp.c

@@ -0,0 +1,115 @@
+#include <check.h>
+#include <stdio.h>
+
+#include "ttail_check.h"
+#include "ttail.h"
+#include "ttail_init.h"
+#include "ttail_search.h"
+
+#define TTAIL_TM_CMP_INIT \
+struct tm a, b;\
+int ret;\
+ttail_tm_init(&a);\
+ttail_tm_init(&b);\
+
+START_TEST (test_tm_cmp_init)
+{
+	TTAIL_TM_CMP_INIT
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_eq(ret, 0);
+}
+END_TEST
+
+START_TEST (test_tm_cmp_field_priority)
+{
+	TTAIL_TM_CMP_INIT
+	a.tm_sec = 42;
+	b.tm_sec = 41;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_gt(ret, 0);
+	a.tm_min = 41;
+	b.tm_min = 42;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_lt(ret, 0);
+	a.tm_hour = 42;
+	b.tm_hour = 41;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_gt(ret, 0);
+	a.tm_mday = 21;
+	b.tm_mday = 22;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_lt(ret, 0);
+	a.tm_mon = 10;
+	b.tm_mon = 9;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_gt(ret, 0);
+	a.tm_year = 14;
+	b.tm_year = 15;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_lt(ret, 0);
+}
+END_TEST
+
+START_TEST (test_tm_cmp_empty_fields1)
+{
+	TTAIL_TM_CMP_INIT
+	a.tm_sec = 42;
+	b.tm_min = 41;
+	a.tm_hour = 1;
+	b.tm_hour = 1;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_eq(ret, 0);
+}
+END_TEST
+
+START_TEST (test_tm_cmp_empty_fields2)
+{
+	TTAIL_TM_CMP_INIT
+	a.tm_sec = 42;
+	b.tm_min = 41;
+	b.tm_hour = 1;
+	b.tm_mday = 6;
+	b.tm_mon = 7;
+	b.tm_year = 15;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_eq(ret, 0);
+}
+END_TEST
+
+START_TEST (test_tm_cmp_empty_fields3)
+{
+	TTAIL_TM_CMP_INIT
+	a.tm_sec = 42;
+	b.tm_sec = 55;
+	b.tm_min = 41;
+	b.tm_hour = 1;
+	b.tm_mday = 6;
+	b.tm_mon = 7;
+	b.tm_year = 15;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_lt(ret, 0);
+}
+END_TEST
+
+START_TEST (test_tm_cmp_empty_fields4)
+{
+	TTAIL_TM_CMP_INIT
+	b.tm_sec = 42;
+	a.tm_min = 41;
+	a.tm_hour = 1;
+	a.tm_mday = 6;
+	a.tm_mon = 7;
+	a.tm_year = 15;
+	ret = ttail_tm_cmp(&a, &b);
+	ck_assert_int_eq(ret, 0);
+}
+END_TEST
+
+TTAIL_CHECK_START("ttail search functions checks", "ttail_tm_cmp() checks")
+	TTAIL_ADD_TEST(test_tm_cmp_init);
+	TTAIL_ADD_TEST(test_tm_cmp_field_priority);
+	TTAIL_ADD_TEST(test_tm_cmp_empty_fields1);
+	TTAIL_ADD_TEST(test_tm_cmp_empty_fields2);
+	TTAIL_ADD_TEST(test_tm_cmp_empty_fields3);
+	TTAIL_ADD_TEST(test_tm_cmp_empty_fields4);
+TTAIL_CHECK_END