Add tests on ttail_logline2date() function

src/include/ttail_search.h

@@ -74,7 +74,7 @@ ttail_cmp_res ttail_cmp_logline(ttail_t*, const char*, struct tm*);
  *@param ttail_t* ttail
  *@param const char* logline
  *@param struct tm* tm will be set to extracted date if not NULL
- *@return 0 if ok, -1 if error 1 if no date found
+ *@return 0 if ok, -1 if error 1 if no prefix found 2 if no date found
  */
 int ttail_logline2date(ttail_t*, const char*, struct tm*);
 

src/ttail_search.c

@@ -35,10 +35,16 @@ int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
 	subst = ttail_logline_subst(ttail, logline);
 	if(!subst)
 	{
+		memset(tm, 0,sizeof(struct tm));
 		return 1;
 	}
 	ret = strptime(subst, ttail->fmt, tm);
-	return ret?0:1;
+	if(!ret)
+	{
+		memset(tm, 0,sizeof(struct tm));
+		return 2;
+	}
+	return 0;
 }
 
 const char* ttail_logline_subst(ttail_t* t, const char* logline)

tests/ttail_search_check.c

@@ -238,12 +238,72 @@ START_TEST (test_search_subst_re_nomatch)
 }
 END_TEST
 
+/*
+ * ttail_logline2date() checks
+ */
+START_TEST (test_search_log2date1)
+{
+	char re[] = "^[0-9]+ ";
+	char fmt[] = "%Y-%m-%d:%H:%M";
+	struct tm tm;
+	int ret;
+	ttail_set_flag_re_ex(ttail);
+	ttail_set_prefix(ttail, re);
+	ttail_set_fmt(ttail, fmt);
+	ret = ttail_logline2date(ttail, "1337 1988-10-22:22:10 foobar", &tm);
+	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(tm.tm_year, 88);
+	ck_assert_int_eq(tm.tm_mon, 9);
+	ck_assert_int_eq(tm.tm_mday, 22);
+	ck_assert_int_eq(tm.tm_hour, 22);
+	ck_assert_int_eq(tm.tm_min, 10);
+}
+END_TEST
+
+START_TEST (test_search_log2date_failpref)
+{
+	char re[] = "^[0-9]+aa ";
+	char fmt[] = "%Y-%m-%d:%H:%M";
+	struct tm tm;
+	int ret;
+	ttail_set_flag_re_ex(ttail);
+	ttail_set_prefix(ttail, re);
+	ttail_set_fmt(ttail, fmt);
+	ret = ttail_logline2date(ttail, "1337 1988-10-22:22:10 foobar", &tm);
+	ck_assert_int_eq(ret, 1);
+	ck_assert_int_eq(tm.tm_year, 0);
+	ck_assert_int_eq(tm.tm_mon, 0);
+	ck_assert_int_eq(tm.tm_mday, 0);
+	ck_assert_int_eq(tm.tm_hour, 0);
+	ck_assert_int_eq(tm.tm_min, 0);
+}
+END_TEST
+
+START_TEST (test_search_log2date_faildate)
+{
+	char re[] = "^[0-9]+ ";
+	char fmt[] = "%y-%m-%d:%H:%M";
+	struct tm tm;
+	int ret;
+	ttail_set_flag_re_ex(ttail);
+	ttail_set_prefix(ttail, re);
+	ttail_set_fmt(ttail, fmt);
+	ret = ttail_logline2date(ttail, "1337 1988-10-22:22:10 foobar", &tm);
+	ck_assert_int_eq(ret, 2);
+	ck_assert_int_eq(tm.tm_year, 0);
+	ck_assert_int_eq(tm.tm_mon, 0);
+	ck_assert_int_eq(tm.tm_mday, 0);
+	ck_assert_int_eq(tm.tm_hour, 0);
+	ck_assert_int_eq(tm.tm_min, 0);
+}
+END_TEST
+
 Suite * ttail_search_files_suite(void)
 {
 	Suite *s;
-	TCase *tc_search_subst;
 	TCase *tc_search_closest_fileinit, *tc_file_line,
 		*tc_file_minmax;
+	TCase *tc_search_subst, *tc_search_logline2date;
 
 	s = suite_create("ttail search_files checks");
 	tc_search_closest_fileinit = tcase_create("\
@@ -276,10 +336,18 @@ ttail_logline_closest_files_init() checks");
 	tcase_add_test(tc_search_subst, test_search_subst_re2);
 	tcase_add_test(tc_search_subst, test_search_subst_re_nomatch);
 
-	suite_add_tcase(s, tc_search_subst);
+	tc_search_logline2date = tcase_create("ttail_logline2date() checks");
+	tcase_add_checked_fixture(tc_search_logline2date,
+		setup_closest_fileinit, teardown_closest_fileinit);
+	tcase_add_test(tc_search_subst, test_search_log2date1);
+	tcase_add_test(tc_search_subst, test_search_log2date_failpref);
+	tcase_add_test(tc_search_subst, test_search_log2date_faildate);
+
 	suite_add_tcase(s, tc_search_closest_fileinit);
 	suite_add_tcase(s, tc_file_line);
 	suite_add_tcase(s, tc_file_minmax);
+	suite_add_tcase(s, tc_search_subst);
+	suite_add_tcase(s, tc_search_logline2date);
 	return s;
 }