diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_read_format_iso_Z.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_read_format_iso_Z.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c b/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c index e0cf7f7..7cbbf12 100644 --- a/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c +++ b/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c @@ -36,22 +36,23 @@ test1(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 512)); assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(1, archive_file_count(a)); assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } -static -void test2(void) +static void +test2(void) { struct archive_entry *ae; struct archive *a; @@ -61,7 +62,7 @@ void test2(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, @@ -83,11 +84,12 @@ void test2(void) assertEqualString("C/D", archive_entry_pathname(ae)); assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + assertEqualInt(5, archive_file_count(a)); assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_read_format_iso_Z) @@ -95,5 +97,3 @@ DEFINE_TEST(test_read_format_iso_Z) test1(); test2(); } - - |
