From: Tim Kientzle Date: Sat, 27 Dec 2008 22:06:33 +0000 (-0500) Subject: IFC: Various style corrections to libarchive_test: Use more X-Git-Tag: v2.6.0~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7788c5d46a7adbafb05cb47b0f1c508009aa8899;p=thirdparty%2Flibarchive.git IFC: Various style corrections to libarchive_test: Use more informative assertXxxx macros; rework some tests so they give up before failures get out of hand. SVN-Revision: 288 --- diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c index 4745f2c31..932674983 100644 --- a/libarchive/test/test_compat_gtar.c +++ b/libarchive/test/test_compat_gtar.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.4 2008/12/17 19:05:00 kientzle Exp $"); /* * Verify our ability to read sample files created by GNU tar. @@ -43,6 +43,7 @@ test_compat_gtar_1(void) char name[] = "test_compat_gtar_1.tgz"; struct archive_entry *ae; struct archive *a; + int r; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); @@ -51,7 +52,11 @@ test_compat_gtar_1(void) assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); /* Read first entry. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + if (r != ARCHIVE_OK) { + archive_read_finish(a); + return; + } assertEqualString( "12345678901234567890123456789012345678901234567890" "12345678901234567890123456789012345678901234567890" @@ -66,7 +71,11 @@ test_compat_gtar_1(void) assertEqualInt(0100644, archive_entry_mode(ae)); /* Read second entry. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + if (r != ARCHIVE_OK) { + archive_read_finish(a); + return; + } assertEqualString( "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij" "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij" diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c index bf212df80..b47c734c9 100644 --- a/libarchive/test/test_write_compress.c +++ b/libarchive/test/test_write_compress.c @@ -25,7 +25,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.4 2008/12/17 19:05:25 kientzle Exp $"); /* * A basic exercise of compress reading and writing. @@ -85,11 +85,11 @@ DEFINE_TEST(test_write_compress) for (i = 0; i < 100; i++) { sprintf(path, "file%03d", i); - assertEqualInt(0, archive_read_next_header(a, &ae)); + if (!assertEqualInt(0, archive_read_next_header(a, &ae))) + break; assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt(datasize, archive_entry_size(ae)); } - assert(0 == archive_read_close(a)); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c index a4e9aa87c..65075301e 100644 --- a/libarchive/test/test_write_format_ar.c +++ b/libarchive/test/test_write_format_ar.c @@ -26,7 +26,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.8 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.9 2008/12/17 19:03:44 kientzle Exp $"); char buff[4096]; char buff2[64]; @@ -73,8 +73,8 @@ DEFINE_TEST(test_write_format_ar) archive_entry_copy_pathname(ae, "ggghhhjjjrrrttt.o"); archive_entry_set_filetype(ae, AE_IFREG); archive_entry_set_size(ae, 7); - assertA(0 == archive_write_header(a, ae)); - assertA(7 == archive_write_data(a, "7777777", 7)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualIntA(a, 7, archive_write_data(a, "7777777", 7)); archive_entry_free(ae); /* test full pathname */ @@ -82,8 +82,8 @@ DEFINE_TEST(test_write_format_ar) archive_entry_copy_pathname(ae, "/usr/home/xx/iiijjjdddsssppp.o"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, 8); - assertA(0 == archive_write_header(a, ae)); - assertA(8 == archive_write_data(a, "88877766", 8)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualIntA(a, 8, archive_write_data(a, "88877766", 8)); archive_entry_free(ae); /* trailing "/" should be rejected */ @@ -105,46 +105,46 @@ DEFINE_TEST(test_write_format_ar) #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else - assert(0 == archive_write_finish(a)); + assertEqualInt(0, archive_write_finish(a)); #endif /* * Now, read the data back. */ assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); - assertA(0 == archive_read_open_memory(a, buff, used)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); - assertA(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(0, archive_entry_mtime(ae)); assertEqualString("//", archive_entry_pathname(ae)); assertEqualInt(0, archive_entry_size(ae)); - assertA(0 == archive_read_next_header(a, &ae)); - assert(1 == archive_entry_mtime(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(1, archive_entry_mtime(ae)); assertEqualString("abcdefghijklmn.o", archive_entry_pathname(ae)); - assert(8 == archive_entry_size(ae)); - assertA(8 == archive_read_data(a, buff2, 10)); - assert(0 == memcmp(buff2, "87654321", 8)); + assertEqualInt(8, archive_entry_size(ae)); + assertEqualIntA(a, 8, archive_read_data(a, buff2, 10)); + assertEqualMem(buff2, "87654321", 8); - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("ggghhhjjjrrrttt.o", archive_entry_pathname(ae)); - assert(7 == archive_entry_size(ae)); - assertA(7 == archive_read_data(a, buff2, 11)); - assert(0 == memcmp(buff2, "7777777", 7)); + assertEqualInt(7, archive_entry_size(ae)); + assertEqualIntA(a, 7, archive_read_data(a, buff2, 11)); + assertEqualMem(buff2, "7777777", 7); - assert(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, 0, archive_read_next_header(a, &ae)); assertEqualString("iiijjjdddsssppp.o", archive_entry_pathname(ae)); - assert(8 == archive_entry_size(ae)); - assertA(8 == archive_read_data(a, buff2, 17)); - assert(0 == memcmp(buff2, "88877766", 8)); + assertEqualInt(8, archive_entry_size(ae)); + assertEqualIntA(a, 8, archive_read_data(a, buff2, 17)); + assertEqualMem(buff2, "88877766", 8); - assert(0 == archive_read_close(a)); + assertEqualIntA(a, 0, archive_read_close(a)); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); #else - assert(0 == archive_read_finish(a)); + assertEqualInt(0, archive_read_finish(a)); #endif /* @@ -152,18 +152,18 @@ DEFINE_TEST(test_write_format_ar) */ memset(buff, 0, sizeof(buff)); assert((a = archive_write_new()) != NULL); - assertA(0 == archive_write_set_format_ar_bsd(a)); - assertA(0 == archive_write_set_compression_bzip2(a)); - assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ar_bsd(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used)); /* write a entry need long name extension */ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "ttttyyyyuuuuiiii.o"); archive_entry_set_filetype(ae, AE_IFREG); archive_entry_set_size(ae, 5); - assertA(0 == archive_write_header(a, ae)); - assertA(5 == archive_entry_size(ae)); - assertA(5 == archive_write_data(a, "12345", 7)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualInt(5, archive_entry_size(ae)); + assertEqualIntA(a, 5, archive_write_data(a, "12345", 7)); archive_entry_free(ae); /* write a entry with a short name */ @@ -171,41 +171,41 @@ DEFINE_TEST(test_write_format_ar) archive_entry_copy_pathname(ae, "ttyy.o"); archive_entry_set_filetype(ae, AE_IFREG); archive_entry_set_size(ae, 6); - assertA(0 == archive_write_header(a, ae)); - assertA(6 == archive_write_data(a, "555555", 7)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualIntA(a, 6, archive_write_data(a, "555555", 7)); archive_entry_free(ae); archive_write_close(a); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else - assert(0 == archive_write_finish(a)); + assertEqualInt(0, archive_write_finish(a)); #endif /* Now, Read the data back */ assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); - assertA(0 == archive_read_open_memory(a, buff, used)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); assertEqualIntA(a, 0, archive_read_next_header(a, &ae)); assertEqualString("ttttyyyyuuuuiiii.o", archive_entry_pathname(ae)); assertEqualInt(5, archive_entry_size(ae)); - assertA(5 == archive_read_data(a, buff2, 10)); - assert(0 == memcmp(buff2, "12345", 5)); + assertEqualIntA(a, 5, archive_read_data(a, buff2, 10)); + assertEqualMem(buff2, "12345", 5); - assert(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, 0, archive_read_next_header(a, &ae)); assertEqualString("ttyy.o", archive_entry_pathname(ae)); - assert(6 == archive_entry_size(ae)); - assertA(6 == archive_read_data(a, buff2, 10)); - assert(0 == memcmp(buff2, "555555", 6)); + assertEqualInt(6, archive_entry_size(ae)); + assertEqualIntA(a, 6, archive_read_data(a, buff2, 10)); + assertEqualMem(buff2, "555555", 6); /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - assert(0 == archive_read_close(a)); + assertEqualIntA(a, 0, archive_read_close(a)); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); #else - assert(0 == archive_read_finish(a)); + assertEqualInt(0, archive_read_finish(a)); #endif #endif }