Tests updates

tests/ttail_argparse_check.c

@@ -186,11 +186,32 @@ START_TEST (test_argparse_file_multiple)
 }
 END_TEST
 
+START_TEST (test_argparse_prefix_short)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-p", "^[^ ]+ "};
+	t = ttail_init(3, args);
+	ck_assert(t != NULL);
+	ck_assert((t->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+}
+END_TEST
+
+START_TEST (test_argparse_prefix_long)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "--re-prefix", "^[^ ]+ "};
+	t = ttail_init(3, args);
+	ck_assert(t != NULL);
+	ck_assert((t->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
 	TCase *tc_argparse_empty;
 	TCase *tc_argparse_files;
+	TCase *tc_argparse_prefix;
 
 	s = suite_create("ttail argument parsing checks");
 
@@ -211,8 +232,13 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_argparse_files, test_argparse_file_exist);
 	tcase_add_test(tc_argparse_files, test_argparse_file_multiple);
 
-	suite_add_tcase(s, tc_argparse_files);
+	tc_argparse_prefix = tcase_create("re-prefix arguments parsing");
+	tcase_add_test(tc_argparse_empty, test_argparse_prefix_short);
+	tcase_add_test(tc_argparse_empty, test_argparse_prefix_long);
+
 	suite_add_tcase(s, tc_argparse_empty);
+	suite_add_tcase(s, tc_argparse_files);
+	suite_add_tcase(s, tc_argparse_prefix);
 	return s;
 }
 

tests/ttail_init_check.c

@@ -115,10 +115,88 @@ START_TEST (test_init_same_nonexist_logfilename)
 }
 END_TEST
 
+START_TEST (test_init_multiple_logfilename)
+{
+	char *fname[20];
+	int ret;
+	int i, j;
+	for(i=0;i<20;i++)
+	{
+		fname[i] = tempnam(NULL, "ttail_check");
+	}
+	
+	for(i=0; i<20; i++)
+	{
+		for(j=0; j<i; j++)
+		{
+			ret = ttail_add_logfile(ttail, fname[j]);
+			ck_assert_int_eq(ret, -1);
+			ck_assert_int_eq(ttail->logfile_sz, i);
+		}
+		ret = ttail_add_logfile(ttail, fname[i]);
+		ck_assert_int_eq(ret, 1);
+		ck_assert_int_eq(ttail->logfile_sz, i+1);
+		for(j=0; j<i+1; j++)
+		{
+			ck_assert_str_eq(ttail->logfile_name[j], fname[j]);
+			ck_assert(ttail->logfile[j] == NULL);
+		}
+	}
+	for(i=0; i<20; i++)
+	{
+		free(fname[i]);
+	}
+}
+END_TEST
+
+START_TEST (test_init_prefix)
+{
+	int ret;
+	ret = ttail_set_prefix(ttail, "^[^ ]+ ");
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+}
+END_TEST
+
+START_TEST (test_init_bad_prefix)
+{
+	int ret;
+	ret = ttail_set_prefix(ttail, "^[^ + ");
+	ck_assert_int_eq(ret, -1);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == 0);
+}
+END_TEST
+
+START_TEST (test_init_again_prefix)
+{
+	int ret;
+	ret = ttail_set_prefix(ttail, "^[^ ]+ ");
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+	ret = ttail_set_prefix(ttail, "^[^ + ");
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+}
+END_TEST
+
+START_TEST (test_init_againbad_prefix)
+{
+	int ret;
+	ret = ttail_set_prefix(ttail, "^[^ + ");
+	ck_assert_int_eq(ret, -1);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == 0);
+
+	ret = ttail_set_prefix(ttail, "^[^ ]+ ");
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
 	TCase *tc_init_logfile;
+	TCase *tc_init_prefix;
 
 	s = suite_create("ttail init checks");
 
@@ -130,7 +208,18 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_init_logfile, test_init_exist_logfilename);
 	tcase_add_test(tc_init_logfile, test_init_same_exist_logfilename);
 	tcase_add_test(tc_init_logfile, test_init_same_nonexist_logfilename);
+	tcase_add_test(tc_init_logfile, test_init_multiple_logfilename);
+
+	tc_init_prefix = tcase_create("date prefix regex init checks");
+	tcase_add_checked_fixture(tc_init_prefix,
+		setup_ttail_empty, teardown_ttail);
+	tcase_add_test(tc_init_prefix, test_init_prefix);
+	tcase_add_test(tc_init_prefix, test_init_bad_prefix);
+	tcase_add_test(tc_init_prefix, test_init_again_prefix);
+	tcase_add_test(tc_init_prefix, test_init_againbad_prefix);
+
 	suite_add_tcase(s, tc_init_logfile);
+	suite_add_tcase(s, tc_init_prefix);
 	return s;
 }