Tests update

tests/ttail_argparse_check.c

@@ -190,15 +190,15 @@ void teardown_fname(void)
 START_TEST (test_argparse_file_non_exist)
 {
 	ttail_t *t;
-	char *args[3] = {"foo", "-l", NULL};
+	char *args[4] = {"foo", "-d", "Mar 6 13:37", NULL};
 
-	args[2] = fname[FNAME_NO_EXIST];
-	t = ttail_init(3, args);
+	args[3] = fname[FNAME_NO_EXIST];
+	t = ttail_init(4, args);
 	ck_assert_msg(t != NULL, "init failed");
 
 	ck_assert_msg(t->logfile_sz == 1,
 		"ttail_t.logfile_sz should be 1");
-	ck_assert_msg(strcmp(t->logfile_name[0], args[2]) == 0,
+	ck_assert_msg(strcmp(t->logfile_name[0], args[3]) == 0,
 		"ttail_t.logfile_name[0] does not contain the filename");
 	ck_assert_msg(t->logfile[0] == NULL,
 		"ttail_t.logfile[0] should be NULL");
@@ -211,16 +211,16 @@ END_TEST
 START_TEST (test_argparse_file_exist)
 {
 	ttail_t *t;
-	char *args[3] = {"foo", "-l", NULL};
+	char *args[4] = {"foo", "-d", "Mar 10 13:37", NULL};
 
-	args[2] = fname[FNAME_EXIST];
+	args[3] = fname[FNAME_EXIST];
 
-	t = ttail_init(3, args);
+	t = ttail_init(4, args);
 	ck_assert_msg(t != NULL, "init failed");
 
 	ck_assert_msg(t->logfile_sz == 1,
 		"ttail_t.logfile_sz should be 1");
-	ck_assert_msg(strcmp(t->logfile_name[0], args[2]) == 0,
+	ck_assert_msg(strcmp(t->logfile_name[0], args[3]) == 0,
 		"ttail_t.logfile_name[0] does not contain the filename");
 	ck_assert_msg(t->logfile[0] != NULL,
 		"ttail_t.logfile[0] shouldn't be NULL");
@@ -234,15 +234,15 @@ START_TEST (test_argparse_file_multiple)
 {
 	ttail_t *t;
 	int i;
-	char *args[11] = {"foo", "-l", NULL, "-l", NULL,
-		"-l", NULL, "-l", NULL, "-l", NULL};
+	char *args[8] = {"foo", "-d", "mar 10 13:37", NULL, NULL, NULL, NULL,
+		NULL};
 	
 	for(i=0; i<__Fname_sz; i++)
 	{
-		args[(i*2)+2] = fname[i];
+		args[i+3] = fname[i];
 	}
 
-	t = ttail_init(11, args);
+	t = ttail_init(8, args);
 	ck_assert_msg(t != NULL, "init failed");
 	
 	ck_assert_msg(t->logfile_sz == __Fname_sz,
@@ -250,7 +250,7 @@ START_TEST (test_argparse_file_multiple)
 
 	for(i=0;i<__Fname_sz; i++)
 	{
-		ck_assert_msg(strcmp(t->logfile_name[i], args[(i*2)+2]) == 0,
+		ck_assert_msg(strcmp(t->logfile_name[i], args[i+3]) == 0,
 			"some filename corrupted in ttail_t.logfile_name");
 		if(i%2)
 		{

tests/ttail_search_check.c

@@ -319,11 +319,13 @@ START_TEST (test_search_files1)
 	ttail->flag |= TTAIL_FLAG_PREFIX;
 	ttail->prefix_sz = 0;
 	ttail_set_fmt(ttail, "%B%n%d %H:%M");
+	memcpy(&(ttail->date_min), &tm, sizeof(tm));
+	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 
-	ret = _ttail_search_closest_files(ttail, &tm);
+	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
-	ck_assert(ttail->session->file.id == 0);
-	ck_assert(ttail->session->file.off == 0);
+	ck_assert(ttail->session->file.off_min.id == 0);
+	ck_assert(ttail->session->file.off_min.off == 0);
 }
 END_TEST
 
@@ -348,11 +350,13 @@ START_TEST (test_search_files2)
 	tm.tm_hour = 0;
 	tm.tm_min = 29;
 	tm.tm_sec = -1;
+	memcpy(&(ttail->date_min), &tm, sizeof(tm));
+	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 	
-	ret = _ttail_search_closest_files(ttail, &tm);
+	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
-	ck_assert(ttail->session->file.id == 0);
-	ck_assert_int_eq(ttail->session->file.off, 221);
+	ck_assert(ttail->session->file.off_min.id == 0);
+	ck_assert_int_eq(ttail->session->file.off_min.off, 221);
 }
 END_TEST
 
@@ -377,11 +381,13 @@ START_TEST (test_search_files3)
 	tm.tm_hour = 1;
 	tm.tm_min = 0;
 	tm.tm_sec = -1;
+	memcpy(&(ttail->date_min), &tm, sizeof(tm));
+	ttail->flag |= TTAIL_FLAG_DATE_MIN;
 
-	ret = _ttail_search_closest_files(ttail, &tm);
+	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
-	ck_assert_int_eq(ttail->session->file.id, 5);
-	ck_assert_int_eq(ttail->session->file.off, 0);
+	ck_assert_int_eq(ttail->session->file.off_min.id, 5);
+	ck_assert_int_eq(ttail->session->file.off_min.off, 0);
 }
 END_TEST