From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 2 Dec 2012 11:05:33 +0000 (+0900)
Subject: Split a test for 7-Zip writer into seven tests to know easily what
X-Git-Tag: v3.1.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00b4762335035d9b774b9d026acc605fbd34122;p=thirdparty%2Flibarchive.git

Split a test for 7-Zip writer into seven tests to know easily what
compression fails.
---

diff --git a/libarchive/test/test_write_format_7zip.c b/libarchive/test/test_write_format_7zip.c
index dd62d9e65..7c2702fad 100644
--- a/libarchive/test/test_write_format_7zip.c
+++ b/libarchive/test/test_write_format_7zip.c
@@ -894,20 +894,48 @@ DEFINE_TEST(test_write_format_7zip)
 	/* Test that making a 7-Zip archive file by default compression
 	 * in whatever compressions are supported on the running platform. */
 	test_basic(NULL);
+	/* Test that making a 7-Zip archive file without empty files. */
+	test_basic2(NULL);
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_bzip2)
+{
+	/* Test that making a 7-Zip archive file with bzip2 compression. */
+	test_basic("bzip2");
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_copy)
+{
 	/* Test that making a 7-Zip archive file without compression. */
 	test_basic("copy");
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_deflate)
+{
 	/* Test that making a 7-Zip archive file with deflate compression. */
 	test_basic("deflate");
-	/* Test that making a 7-Zip archive file with bzip2 compression. */
-	test_basic("bzip2");
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_lzma1)
+{
 	/* Test that making a 7-Zip archive file with lzma1 compression. */
 	test_basic("lzma1");
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_lzma2)
+{
 	/* Test that making a 7-Zip archive file with lzma2 compression. */
 	test_basic("lzma2");
+}
+
+DEFINE_TEST(test_write_format_7zip_basic_ppmd)
+{
 	/* Test that making a 7-Zip archive file with PPMd compression. */
 	test_basic("ppmd");
-	/* Test that making a 7-Zip archive file without empty files. */
-	test_basic2(NULL);
+}
+
+DEFINE_TEST(test_write_format_7zip_empty)
+{
 	/* Test that making an empty 7-Zip archive file. */
 	test_empty_archive();
 	/* Test that write an empty file. */
@@ -915,6 +943,12 @@ DEFINE_TEST(test_write_format_7zip)
 	test_only_empty_files();
 }
 
+DEFINE_TEST(test_write_format_7zip_large_bzip2)
+{
+	/* Test that making a 7-Zip archive file with bzip2 compression. */
+	test_large("bzip2");
+}
+
 DEFINE_TEST(test_write_format_7zip_large_copy)
 {
 	/* Test that making a 7-Zip archive file without compression. */
@@ -927,12 +961,6 @@ DEFINE_TEST(test_write_format_7zip_large_deflate)
 	test_large("deflate");
 }
 
-DEFINE_TEST(test_write_format_7zip_large_bzip2)
-{
-	/* Test that making a 7-Zip archive file with bzip2 compression. */
-	test_large("bzip2");
-}
-
 DEFINE_TEST(test_write_format_7zip_large_lzma1)
 {
 	/* Test that making a 7-Zip archive file with lzma1 compression. */