unit test added

diff --git a/Makefile.am b/Makefile.am
index a1a77dfe0d2580bb080ac8c0be52e9527aa45729..e56fc03a23c2c76f68e59bcb8ccdaf3046f73b31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -519,6 +519,7 @@ libarchive_test_SOURCES= \
        libarchive/test/test_read_format_xar.c \
        libarchive/test/test_read_format_zip.c \
        libarchive/test/test_read_format_zip_7075_utf8_paths.c \
+       libarchive/test/test_read_format_zip_7z_lzma.c \
        libarchive/test/test_read_format_zip_comment_stored.c \
        libarchive/test/test_read_format_zip_encryption_data.c \
        libarchive/test/test_read_format_zip_encryption_partially.c \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 4be5bf4cd963f51be9997152b246d0028e628dc0..efdeb80915aff03be79b58a0c6f223e2393b18d3 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -170,6 +170,7 @@ IF(ENABLE_TEST)
     test_read_format_xar.c
     test_read_format_zip.c
     test_read_format_zip_7075_utf8_paths.c
+    test_read_format_zip_7z_lzma.c
     test_read_format_zip_comment_stored.c
     test_read_format_zip_encryption_data.c
     test_read_format_zip_encryption_header.c

diff --git a/libarchive/test/test_read_format_zip_7z_lzma.c b/libarchive/test/test_read_format_zip_7z_lzma.c
new file mode 100644 (file)
index 0000000..9b7329b
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_7z_lzma.c
@@ -0,0 +1,31 @@
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+DEFINE_TEST(test_read_format_zip_7z_lzma)
+{
+       const char *refname = "test_read_format_zip_7z_lzma.zip";
+       struct archive_entry *ae;
+       struct archive *a;
+
+       extract_reference_file(refname);
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_read_open_filename(a, refname, 10240));
+
+       while(1) {
+               int res = archive_read_next_header(a, &ae);
+               if (res == ARCHIVE_EOF)
+                       break;
+
+               assertEqualInt(ARCHIVE_OK, res);
+               if (archive_entry_filetype(ae) == AE_IFLNK)
+                       assertEqualString("../samples/abc_measurement_analysis_sample"
+                               "/src/abc_measurement_analysis_sample.py",
+                               archive_entry_symlink(ae));
+       }
+
+       assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}

diff --git a/libarchive/test/test_read_format_zip_7z_lzma.zip.uu b/libarchive/test/test_read_format_zip_7z_lzma.zip.uu
new file mode 100644 (file)
index 0000000..8ae8df4
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_7z_lzma.zip.uu
@@ -0,0 +1,45 @@
+begin 644 test_read_format_zip_7z_lzma.zip
+M4$L#!`H#`````.$#)%$````````````````,````7VEN<W1A;&QD:7(O4$L#
+M!`H#`````,0#)%$````````````````6````7VEN<W1A;&QD:7(O86)C7W1O
+M;VQS+U!+`P0*`P````"``R11````````````````)````%]I;G-T86QL9&ER
+M+V%B8U]T;V]L<R\R,#`P+CDM8F5T83$Q+U!+`P0*`P````"%!"11````````
+M````````*````%]I;G-T86QL9&ER+V%B8U]T;V]L<R\R,#`P+CDM8F5T83$Q
+M+V)I;B]02P,$%`,```X`?00D4<2?]W$]````40```$<```!?:6YS=&%L;&1I
+M<B]A8F-?=&]O;',O,C`P,"XY+6)E=&$Q,2]B:6XO86)C7VUE87-U<F5M96YT
+M7V%N86QY<VES7W-A;7!L900]!0!=````!``78+CF838[WSK=V4<NKP&%(\A'
+MDM]PR'OV^=/9>A79\GCDS+I*=O.=!+"5(),_1O%5^1102P,$"@,`````]0,D
+M40```````````````"P```!?:6YS=&%L;&1I<B]A8F-?=&]O;',O,C`P,"XY
+M+6)E=&$Q,2]S86UP;&5S+U!+`P0*`P````!J`R11````````````````3```
+M`%]I;G-T86QL9&ER+V%B8U]T;V]L<R\R,#`P+CDM8F5T83$Q+W-A;7!L97,O
+M86)C7VUE87-U<F5M96YT7V%N86QY<VES7W-A;7!L92]02P,$"@,`````R00D
+M40```````````````%````!?:6YS=&%L;&1I<B]A8F-?=&]O;',O,C`P,"XY
+M+6)E=&$Q,2]S86UP;&5S+V%B8U]M96%S=7)E;65N=%]A;F%L>7-I<U]S86UP
+M;&4O<W)C+U!+`P04`P``#@#)!"11&O[CEV0```#Z````<@```%]I;G-T86QL
+M9&ER+V%B8U]T;V]L<R\R,#`P+CDM8F5T83$Q+W-A;7!L97,O86)C7VUE87-U
+M<F5M96YT7V%N86QY<VES7W-A;7!L92]S<F,O86)C7VUE87-U<F5M96YT7V%N
+M86QY<VES7W-A;7!L92YP>00]!0!=````!``1B$)'BB,SPW</,_U5E^VGQ_#J
+M*D,VRB^`L-1YB&E9ZQ@#)Z;.!DA4-N"JARAW#NR&V]%F']BN`WU@#,0-<1)%
+M/6DBM+7=&`\IF.F\E3\E9D*1:/'I+057:TA02P$"%`,*`P````#A`R11````
+M````````````#````````````!"`Z$$`````7VEN<W1A;&QD:7(O4$L!`A0#
+M"@,`````Q`,D40```````````````!8````````````0@.A!*@```%]I;G-T
+M86QL9&ER+V%B8U]T;V]L<R]02P$"%`,*`P````"``R11````````````````
+M)````````````!"`Z$%>````7VEN<W1A;&QD:7(O86)C7W1O;VQS+S(P,#`N
+M.2UB971A,3$O4$L!`A0#"@,`````A00D40```````````````"@`````````
+M```0@.A!H````%]I;G-T86QL9&ER+V%B8U]T;V]L<R\R,#`P+CDM8F5T83$Q
+M+V)I;B]02P$"%`,4`P``#@!]!"11Q)_W<3T```!1````1P```````````""`
+M_Z'F````7VEN<W1A;&QD:7(O86)C7W1O;VQS+S(P,#`N.2UB971A,3$O8FEN
+M+V%B8U]M96%S=7)E;65N=%]A;F%L>7-I<U]S86UP;&502P$"%`,*`P````#U
+M`R11````````````````+````````````!"`Z$&(`0``7VEN<W1A;&QD:7(O
+M86)C7W1O;VQS+S(P,#`N.2UB971A,3$O<V%M<&QE<R]02P$"%`,*`P````!J
+M`R11````````````````3````````````!"`Z$'2`0``7VEN<W1A;&QD:7(O
+M86)C7W1O;VQS+S(P,#`N.2UB971A,3$O<V%M<&QE<R]A8F-?;65A<W5R96UE
+M;G1?86YA;'ES:7-?<V%M<&QE+U!+`0(4`PH#`````,D$)%$`````````````
+M``!0````````````$(#H03P"``!?:6YS=&%L;&1I<B]A8F-?=&]O;',O,C`P
+M,"XY+6)E=&$Q,2]S86UP;&5S+V%B8U]M96%S=7)E;65N=%]A;F%L>7-I<U]S
+M86UP;&4O<W)C+U!+`0(4`Q0#```.`,D$)%$:_N.79````/H```!R````````
+M````((#H@:H"``!?:6YS=&%L;&1I<B]A8F-?=&]O;',O,C`P,"XY+6)E=&$Q
+M,2]S86UP;&5S+V%B8U]M96%S=7)E;65N=%]A;F%L>7-I<U]S86UP;&4O<W)C
+M+V%B8U]M96%S=7)E;65N=%]A;F%L>7-I<U]S86UP;&4N<'E02P4&``````D`
+,"0"-`P``G@,`````
+`
+end