diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_read_format_ar.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_read_format_ar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/libarchive/libarchive/test/test_read_format_ar.c b/contrib/libarchive/libarchive/test/test_read_format_ar.c index fc95978..5d50d7c 100644 --- a/contrib/libarchive/libarchive/test/test_read_format_ar.c +++ b/contrib/libarchive/libarchive/test/test_read_format_ar.c @@ -38,7 +38,7 @@ DEFINE_TEST(test_read_format_ar) extract_reference_file(reffile); assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_support_format_all(a)); assertA(0 == archive_read_open_file(a, reffile, 7)); @@ -58,7 +58,7 @@ DEFINE_TEST(test_read_format_ar) assertEqualInt(0, archive_entry_gid(ae)); assert(8 == archive_entry_size(ae)); assertA(8 == archive_read_data(a, buff, 10)); - assert(0 == memcmp(buff, "55667788", 8)); + assertEqualMem(buff, "55667788", 8); /* Second Entry */ assertA(0 == archive_read_next_header(a, &ae)); @@ -68,7 +68,7 @@ DEFINE_TEST(test_read_format_ar) assertEqualInt(0, archive_entry_gid(ae)); assert(4 == archive_entry_size(ae)); assertA(4 == archive_read_data(a, buff, 10)); - assert(0 == memcmp(buff, "3333", 4)); + assertEqualMem(buff, "3333", 4); /* Third Entry */ assertA(0 == archive_read_next_header(a, &ae)); @@ -78,10 +78,11 @@ DEFINE_TEST(test_read_format_ar) assertEqualInt(0, archive_entry_gid(ae)); assert(9 == archive_entry_size(ae)); assertA(9 == archive_read_data(a, buff, 9)); - assert(0 == memcmp(buff, "987654321", 9)); + assertEqualMem(buff, "987654321", 9); /* Test EOF */ assertA(1 == archive_read_next_header(a, &ae)); - assert(0 == archive_read_close(a)); - assert(0 == archive_read_finish(a)); + assertEqualInt(4, archive_file_count(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } |
