From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 17 Feb 2010 05:54:50 +0000 (-0500)
Subject: Modernize this test.  Add additional assertions to verify that
X-Git-Tag: v3.0.0a~1252
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676a793511f3011dab62890a77b178b93ddf2d3e;p=thirdparty%2Flibarchive.git

Modernize this test.  Add additional assertions to verify that
     archive_position_compressed()
     == archive_position_uncompressed()
     == number of bytes actually written
when we didn't overflow the buffer.  These may not match when
the buffer does overflow because some writes down the pipeline
will fail.

SVN-Revision: 1908
---

diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c
index 47a636c9d..2659795d7 100644
--- a/libarchive/test/test_write_compress_gzip.c
+++ b/libarchive/test/test_write_compress_gzip.c
@@ -55,6 +55,8 @@ DEFINE_TEST(test_write_compress_gzip)
 	 */
 	assert((a = archive_write_new()) != NULL);
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_write_set_compression_compress(a));
 	r = archive_write_set_compression_gzip(a);
 	if (r == ARCHIVE_FATAL) {
 		skipping("gzip writing not supported on this platform");
@@ -89,8 +91,6 @@ DEFINE_TEST(test_write_compress_gzip)
 		skipping("Can't verify gzip writing by reading back;"
 		    " gzip reading not fully supported on this platform");
 	} else {
-		assertEqualIntA(a, ARCHIVE_OK,
-		    archive_read_support_compression_all(a));
 		assertEqualIntA(a, ARCHIVE_OK,
 		    archive_read_open_memory(a, buff, used1));
 		for (i = 0; i < 100; i++) {
diff --git a/libarchive/test/test_write_open_memory.c b/libarchive/test/test_write_open_memory.c
index efa167ad6..e9a01de08 100644
--- a/libarchive/test/test_write_open_memory.c
+++ b/libarchive/test/test_write_open_memory.c
@@ -45,28 +45,40 @@ DEFINE_TEST(test_write_open_memory)
 	/* Make sure that we get failure on too-small buffers, success on
 	 * large enough ones. */
 	for (i = 100; i < 1600; i++) {
-		size_t s;
+		size_t used;
 		size_t blocksize = 94;
 		assert((a = archive_write_new()) != NULL);
-		assertA(0 == archive_write_set_format_ustar(a));
-		assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
-		assertA(0 == archive_write_set_bytes_per_block(a, (int)blocksize));
+		assertEqualIntA(a, ARCHIVE_OK,
+		    archive_write_set_format_ustar(a));
+		assertEqualIntA(a, ARCHIVE_OK,
+		    archive_write_set_bytes_in_last_block(a, 1));
+		assertEqualIntA(a, ARCHIVE_OK,
+		    archive_write_set_bytes_per_block(a, (int)blocksize));
 		buff[i] = 0xAE;
-		assertA(0 == archive_write_open_memory(a, buff, i, &s));
+		assertEqualIntA(a, ARCHIVE_OK,
+		    archive_write_open_memory(a, buff, i, &used));
 		/* If buffer is smaller than a tar header, this should fail. */
 		if (i < (511/blocksize)*blocksize)
-			assertA(ARCHIVE_FATAL == archive_write_header(a,ae));
+			assertEqualIntA(a, ARCHIVE_FATAL,
+			    archive_write_header(a,ae));
 		else
-			assertA(0 == archive_write_header(a, ae));
+			assertEqualIntA(a, ARCHIVE_OK,
+			    archive_write_header(a, ae));
 		/* If buffer is smaller than a tar header plus 1024 byte
 		 * end-of-archive marker, then this should fail. */
+		failure("buffer size=%d\n", (int)i);
 		if (i < 1536)
-			assertA(ARCHIVE_FATAL == archive_write_close(a));
-		else
+			assertEqualIntA(a, ARCHIVE_FATAL,
+			    archive_write_close(a));
+		else {
 			assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+			assertEqualInt(used, archive_position_compressed(a));
+			assertEqualInt(archive_position_compressed(a),
+			    archive_position_uncompressed(a));
+		}
 		assertEqualInt(ARCHIVE_OK, archive_write_free(a));
-		assert(buff[i] == 0xAE);
-		assert(s <= i);
+		assertEqualInt(buff[i], 0xAE);
+		assert(used <= i);
 	}
 	archive_entry_free(ae);
 }