From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 17 Feb 2010 05:50:43 +0000 (-0500)
Subject: Modernize this test a bit.
X-Git-Tag: v3.0.0a~1255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d378858388ebdd8ebe1ba600487a042d0d65634;p=thirdparty%2Flibarchive.git

Modernize this test a bit.

SVN-Revision: 1905
---

diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c
index aebcb76f2..b9c266408 100644
--- a/libarchive/test/test_write_compress.c
+++ b/libarchive/test/test_write_compress.c
@@ -51,9 +51,12 @@ DEFINE_TEST(test_write_compress)
 	memset(data, 0, datasize);
 
 	assert((a = archive_write_new()) != NULL);
-	assertA(0 == archive_write_set_format_ustar(a));
-	assertA(0 == archive_write_set_compression_compress(a));
-	assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_write_set_format_ustar(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_write_set_compression_compress(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_write_open_memory(a, buff, buffsize, &used));
 
 	for (i = 0; i < 100; i++) {
 		sprintf(path, "file%03d", i);
@@ -61,12 +64,12 @@ DEFINE_TEST(test_write_compress)
 		archive_entry_copy_pathname(ae, path);
 		archive_entry_set_size(ae, datasize);
 		archive_entry_set_filetype(ae, AE_IFREG);
-		assertA(0 == archive_write_header(a, ae));
-		assertA(datasize == (size_t)archive_write_data(a, data, datasize));
+		assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+		assertEqualInt(datasize,
+		    archive_write_data(a, data, datasize));
 		archive_entry_free(ae);
 	}
 
-
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
@@ -74,9 +77,9 @@ DEFINE_TEST(test_write_compress)
 	 * Now, read the data back.
 	 */
 	assert((a = archive_read_new()) != NULL);
-	assertA(0 == archive_read_support_format_all(a));
-	assertA(0 == archive_read_support_compression_all(a));
-	assertA(0 == archive_read_open_memory(a, buff, used));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
 
 
 	for (i = 0; i < 100; i++) {