Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f8f0b34
Add tests for format_trailer(), and apply consequential fixes to the code.
Matthew Seaman committed 12 years ago
commit f8f0b3483a58deafaa7cea6e59b0e733b4250816
parent d4749d3
2 files changed +60 -3
modified libpkg/pkg_printf.c
@@ -1642,7 +1642,7 @@ format_trailer(const char *f, struct percent_esc *p)




		if (sep) {
- 
			sep = false;
+ 
			done = false;



			for (f2 = f1; *f2 != '\0'; f2++) {

				if (f2[0] == '%' && f2[1] == '}') {
@@ -1656,13 +1656,13 @@ format_trailer(const char *f, struct percent_esc *p)
		}

		

		if (done) {
- 
			sbuf_finish(p->item_fmt);
- 
			sbuf_finish(p->sep_fmt);

			f = f1;

		} else {

			sbuf_clear(p->item_fmt);

			sbuf_clear(p->sep_fmt);

		}
+ 
		sbuf_finish(p->item_fmt);
+ 
		sbuf_finish(p->sep_fmt);

	}



	return (f);
modified tests/pkg_printf/test.c
@@ -1978,6 +1978,62 @@ ATF_TC_BODY(format_code, tc)
	free_percent_esc(p);

}
+ 
ATF_TC(format_trailer);
+ 
ATF_TC_HEAD(format_trailer, tc)
+ 
{
+ 
	atf_tc_set_md_var(tc, "descr",
+ 
	    "Testing format_trailer() format parsing routine");
+ 
}
+ 
ATF_TC_BODY(format_trailer, tc)
+ 
{
+ 
	struct percent_esc	*p;
+ 
	const char		*f;
+ 
	int		 	i;
+
+ 
	struct ft_test_vals {
+ 
		const char *in;
+ 
		const char *item;
+ 
		const char *sep;
+ 
		ptrdiff_t   fend_offset; /* Where f is left pointing */
+ 
		char	    fend_val; /* expected first char in fend */
+ 
	} ft_test_vals[] = {
+ 
		{ "%{aaaaaaaa", "",   "",    0, '%',  },
+ 
		{ "%{bb%|cccc", "",   "",    0, '%',  },
+ 
		{ "ddd%|eee%}", "",   "",    0, 'd',  },
+ 
		{ "%{ff%|gg%}", "ff", "gg", 10, '\0', },
+ 
		{ "%{hh%}",     "hh", "",    6, '\0', },
+ 
		{ "%{%|iii%}",  "",   "iii", 9, '\0', },
+
+ 
		{ NULL,         NULL, NULL,  0, '\0', },
+ 
	};
+
+ 
	p = new_percent_esc(NULL);
+
+ 
	ATF_REQUIRE_EQ(p != NULL, true);
+
+ 
	for (i = 0; ft_test_vals[i].in != NULL; i++) {
+ 
		sbuf_clear(p->item_fmt);
+ 
		sbuf_clear(p->sep_fmt);
+
+ 
		f = format_trailer(ft_test_vals[i].in, p);
+
+ 
		ATF_CHECK_STREQ_MSG(sbuf_data(p->item_fmt),
+ 
				    ft_test_vals[i].item,
+ 
				    "(test %d)", i);
+ 
		ATF_CHECK_STREQ_MSG(sbuf_data(p->sep_fmt),
+ 
				    ft_test_vals[i].sep,
+ 
				    "(test %d)", i);
+ 
		ATF_CHECK_EQ_MSG(f - ft_test_vals[i].in,
+ 
				 ft_test_vals[i].fend_offset,
+ 
				 "(test %d)", i);
+ 
		ATF_CHECK_EQ_MSG(*f, ft_test_vals[i].fend_val,
+ 
				 "(test %d)", i);
+ 
	}
+
+ 
	free_percent_esc(p);
+ 
}
+
+ 




ATF_TP_ADD_TCS(tp)

{
@@ -1999,6 +2055,7 @@ ATF_TP_ADD_TCS(tp)
	ATF_TP_ADD_TC(tp, field_modifier);

	ATF_TP_ADD_TC(tp, field_width);

	ATF_TP_ADD_TC(tp, format_code);
+ 
	ATF_TP_ADD_TC(tp, format_trailer);



	return atf_no_error();

}