Provide WARC read/write tests

diff --git a/Makefile.am b/Makefile.am
index 10822edfdcc078ec40af8dbd8ebfc838a3d415d5..f22fb303812670ff44fea63aeee0fcc90fb3ee60 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -519,6 +519,8 @@ libarchive_test_SOURCES= \
        libarchive/test/test_write_format_tar_sparse.c \
        libarchive/test/test_write_format_tar_ustar.c \
        libarchive/test/test_write_format_tar_v7tar.c \
+       libarchive/test/test_write_format_warc.c \
+       libarchive/test/test_write_format_warc_empty.c \
        libarchive/test/test_write_format_xar.c \
        libarchive/test/test_write_format_xar_empty.c \
        libarchive/test/test_write_format_zip.c \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index db36b82001bc31beb6b74c92e141023ef2125d0b..c5f10c351bb891fdb0cbb68cbf4323d6d1aa2569 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -223,6 +223,8 @@ IF(ENABLE_TEST)
     test_write_format_tar_sparse.c
     test_write_format_tar_ustar.c
     test_write_format_tar_v7tar.c
+    test_write_format_warc.c
+    test_write_format_warc_empty.c
     test_write_format_xar.c
     test_write_format_xar_empty.c
     test_write_format_zip.c

diff --git a/libarchive/test/test_write_format_warc.c b/libarchive/test/test_write_format_warc.c
new file mode 100644 (file)
index 0000000..f5250dd
--- /dev/null
+++ b/libarchive/test/test_write_format_warc.c
@@ -0,0 +1,118 @@
+/*-
+ * Copyright (C) 2014 Sebastian Freundt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+DEFINE_TEST(test_write_format_warc)
+{
+       char filedata[64];
+       struct archive *a;
+       struct archive_entry *ae;
+       const size_t bsiz = 2048U;
+       char *buff;
+       size_t used;
+
+       buff = malloc(bsiz);
+
+       /* Create a new archive in memory. */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_warc(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_write_open_memory(a, buff, bsiz, &used));
+
+       /*
+        * Write a file to it.
+        */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_pathname(ae, "test");
+       archive_entry_set_filetype(ae, AE_IFREG);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+       assertEqualIntA(a, 9, archive_write_data(a, "12345678", 9));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+       /*
+        * Read from it.
+        */
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_warc(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, 9, archive_read_data(a, filedata, 10));
+       assertEqualMem(filedata, "12345678", 9);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+
+       /* Create a new archive */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_warc(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_write_open_memory(a, buff, bsiz, &used));
+
+       /* write first file: that should succeed */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_pathname(ae, "test");
+       archive_entry_set_filetype(ae, AE_IFREG);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+       assertEqualIntA(a, 9, archive_write_data(a, "12345678", 9));
+
+       /* write second file: should succeed as well */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_pathname(ae, "test2");
+       archive_entry_set_filetype(ae, AE_IFREG);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+       assertEqualIntA(a, 9, archive_write_data(a, "12345678", 9));
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+       /* Create a new archive */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_warc(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_write_open_memory(a, buff, bsiz, &used));
+
+       /* write a directory: this should fail */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_copy_pathname(ae, "dir");
+       archive_entry_set_filetype(ae, AE_IFDIR);
+       archive_entry_set_size(ae, 512);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+       free(buff);
+}

diff --git a/libarchive/test/test_write_format_warc_empty.c b/libarchive/test/test_write_format_warc_empty.c
new file mode 100644 (file)
index 0000000..1b3206a
--- /dev/null
+++ b/libarchive/test/test_write_format_warc_empty.c
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (C) 2014 Sebastian Freundt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+DEFINE_TEST(test_write_format_warc_empty)
+{
+       struct archive *a;
+       struct archive_entry *ae;
+       char buff[256U];
+       size_t used;
+
+       /* Create a new archive in memory. */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_warc(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_write_open_memory(a, buff, sizeof(buff), &used));
+
+       /* Add "." entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, ".");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Add ".." entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, "..");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Add "/" entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, "/");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Add "../" entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, "../");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Add "../../." entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, "../../.");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Add "..//.././" entry which must be ignored. */ 
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_atime(ae, 2, 0);
+       archive_entry_set_ctime(ae, 4, 0);
+       archive_entry_set_mtime(ae, 5, 0);
+       archive_entry_copy_pathname(ae, "..//.././");
+       archive_entry_set_mode(ae, S_IFDIR | 0755);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+       archive_entry_free(ae);
+
+       /* Close out the archive without writing anything. */
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+}