diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_read_format_ar.c')
-rw-r--r-- | archivers/libarchive/files/libarchive/test/test_read_format_ar.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_read_format_ar.c b/archivers/libarchive/files/libarchive/test/test_read_format_ar.c index efea38d2c53..1cc3cc04722 100644 --- a/archivers/libarchive/files/libarchive/test/test_read_format_ar.c +++ b/archivers/libarchive/files/libarchive/test/test_read_format_ar.c @@ -38,9 +38,9 @@ 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)); + assertA(0 == archive_read_open_filename(a, reffile, 7)); /* Filename table. */ assertA(0 == archive_read_next_header(a, &ae)); @@ -49,6 +49,8 @@ DEFINE_TEST(test_read_format_ar) assertEqualInt(0, archive_entry_uid(ae)); assertEqualInt(0, archive_entry_gid(ae)); assertEqualInt(0, archive_entry_size(ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); /* First Entry */ assertA(0 == archive_read_next_header(a, &ae)); @@ -58,7 +60,9 @@ 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); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); /* Second Entry */ assertA(0 == archive_read_next_header(a, &ae)); @@ -68,7 +72,9 @@ 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); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); /* Third Entry */ assertA(0 == archive_read_next_header(a, &ae)); @@ -78,10 +84,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)); } |