diff options
Diffstat (limited to 'libarchive/test/test_write_format_zip.c')
-rw-r--r-- | libarchive/test/test_write_format_zip.c | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c index a7ca434f8ea9..54240eeb7afe 100644 --- a/libarchive/test/test_write_format_zip.c +++ b/libarchive/test/test_write_format_zip.c @@ -30,7 +30,6 @@ */ #include "test.h" -__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $"); /* * This test doesn't actually check that the zip writer is @@ -290,9 +289,11 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualString("file", archive_entry_pathname(ae)); if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); + assert(archive_entry_size_is_set(ae)); + assertEqualInt(8, archive_entry_size(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); } - assert(archive_entry_size_is_set(ae)); - assertEqualInt(8, archive_entry_size(ae)); if (content) { assertEqualIntA(a, 8, archive_read_data(a, filedata, sizeof(filedata))); @@ -308,9 +309,11 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualString("file2", archive_entry_pathname(ae)); if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); + assertEqualInt(4, archive_entry_size(ae)); + assert(archive_entry_size_is_set(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); } - assertEqualInt(4, archive_entry_size(ae)); - assert(archive_entry_size_is_set(ae)); if (content) { assertEqualIntA(a, 4, archive_read_data(a, filedata, sizeof(filedata))); @@ -374,10 +377,13 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file_deflate", archive_entry_pathname(ae)); - if (seeking) + if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); - assertEqualInt(8, archive_entry_size(ae)); - assert(archive_entry_size_is_set(ae)); + assertEqualInt(8, archive_entry_size(ae)); + assert(archive_entry_size_is_set(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); + } if (content) { assertEqualIntA(a, 8, archive_read_data(a, filedata, sizeof(filedata))); @@ -392,10 +398,13 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file2_deflate", archive_entry_pathname(ae)); - if (seeking) + if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); - assertEqualInt(4, archive_entry_size(ae)); - assert(archive_entry_size_is_set(ae)); + assertEqualInt(4, archive_entry_size(ae)); + assert(archive_entry_size_is_set(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); + } if (content) { assertEqualIntA(a, 4, archive_read_data(a, filedata, sizeof(filedata))); @@ -410,6 +419,7 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file3_deflate", archive_entry_pathname(ae)); if (seeking) { + assert(archive_entry_size_is_set(ae)); assertEqualInt(5, archive_entry_size(ae)); assertEqualInt(AE_IFREG | 0621, archive_entry_mode(ae)); } else { @@ -460,10 +470,13 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file_stored", archive_entry_pathname(ae)); - if (seeking) + if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); - assert(archive_entry_size_is_set(ae)); - assertEqualInt(8, archive_entry_size(ae)); + assert(archive_entry_size_is_set(ae)); + assertEqualInt(8, archive_entry_size(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); + } if (content) { assertEqualIntA(a, 8, archive_read_data(a, filedata, sizeof(filedata))); @@ -478,10 +491,13 @@ verify_contents(struct archive *a, int seeking, int content) assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file2_stored", archive_entry_pathname(ae)); - if (seeking) + if (seeking) { assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae)); - assertEqualInt(4, archive_entry_size(ae)); - assert(archive_entry_size_is_set(ae)); + assertEqualInt(4, archive_entry_size(ae)); + assert(archive_entry_size_is_set(ae)); + } else { + assertEqualInt(0, archive_entry_size_is_set(ae)); + } if (content) { assertEqualIntA(a, 4, archive_read_data(a, filedata, sizeof(filedata))); |