Style fixes to test case.

SVN-Revision: 346

diff --git a/libarchive/test/test_read_format_tz.c b/libarchive/test/test_read_format_tz.c
index fa48cbbba4fb135e4cc941a5109e89e7feaef5c8..703917ec0bb4f950a12ae7e33fa87e7087992a5d 100644 (file)
--- a/libarchive/test/test_read_format_tz.c
+++ b/libarchive/test/test_read_format_tz.c
@@ -39,17 +39,22 @@ DEFINE_TEST(test_read_format_tz)
        struct archive_entry *ae;
        struct archive *a;
        assert((a = archive_read_new()) != NULL);
-       assertA(0 == archive_read_support_compression_all(a));
-       assertA(0 == archive_read_support_format_all(a));
-       assertA(0 == archive_read_open_memory(a, archive, sizeof(archive)));
-       assertA(0 == archive_read_next_header(a, &ae));
-       assertA(archive_compression(a) == ARCHIVE_COMPRESSION_COMPRESS);
-       assertA(archive_format(a) == ARCHIVE_FORMAT_TAR_USTAR);
-       assert(0 == archive_read_close(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_support_compression_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       failure("archive_compression_name(a)=\"%s\"",
+           archive_compression_name(a));
+       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       failure("archive_format_name(a)=\"%s\"", archive_format_name(a));
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 #if ARCHIVE_VERSION_NUMBER < 2000000
        archive_read_finish(a);
 #else
-       assert(0 == archive_read_finish(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 #endif
 }