archive_read: group option setter tests
The read option setter checks used several tiny source files with the same basic shape. Keep the same DEFINE_TEST cases. Put the read-side option setter checks in test_archive_read_set_options.c. Remove the extra source files from the build lists.
This commit is contained in:
datauwu committed
1 parent
d6e1e7bc3d
commit
25533dd722
6 files changed
+130
-214
No files matched your search
@@ -408,9 +408,6 @@ libarchive_test_SOURCES= \
|
||||
libarchive/test/test_archive_read_next_header_empty.c \
|
||||
libarchive/test/test_archive_read_next_header_raw.c \
|
||||
libarchive/test/test_archive_read_open2.c \
|
||||
libarchive/test/test_archive_read_set_filter_option.c \
|
||||
libarchive/test/test_archive_read_set_format_option.c \
|
||||
libarchive/test/test_archive_read_set_option.c \
|
||||
libarchive/test/test_archive_read_set_options.c \
|
||||
libarchive/test/test_archive_read_support.c \
|
||||
libarchive/test/test_archive_set_error.c \
|
||||
|
||||
@@ -37,9 +37,6 @@ IF(ENABLE_TEST)
|
||||
test_archive_read_next_header_empty.c
|
||||
test_archive_read_next_header_raw.c
|
||||
test_archive_read_open2.c
|
||||
test_archive_read_set_filter_option.c
|
||||
test_archive_read_set_format_option.c
|
||||
test_archive_read_set_option.c
|
||||
test_archive_read_set_options.c
|
||||
test_archive_read_support.c
|
||||
test_archive_set_error.c
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
/*-
|
||||
* Copyright (c) 2011 Tim Kientzle
|
||||
* 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"
|
||||
|
||||
#define should(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_filter_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
|
||||
if (!pristine)
|
||||
archive_read_support_filter_all(a);
|
||||
|
||||
should(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
should(a, ARCHIVE_FAILED, NULL, "fubar", NULL);
|
||||
should(a, ARCHIVE_FAILED, NULL, "fubar", "snafu");
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_filter_option)
|
||||
{
|
||||
test(1);
|
||||
test(0);
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
/*-
|
||||
* Copyright (c) 2011 Tim Kientzle
|
||||
* 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"
|
||||
|
||||
#define should(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_format_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
|
||||
|
||||
if (!pristine)
|
||||
archive_read_support_format_all(a);
|
||||
|
||||
/* NULL and "" denote `no option', so they're ok no matter
|
||||
* what, if any, formats are registered */
|
||||
should(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, NULL, "snafu", NULL);
|
||||
should(a, ARCHIVE_FAILED, NULL, "snafu", "betcha");
|
||||
|
||||
/* ARCHIVE_OK with iso9660 loaded, ARCHIVE_WARN otherwise */
|
||||
should(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should(a, known_option_rv, NULL, "joliet", NULL);
|
||||
should(a, known_option_rv, NULL, "joliet", NULL);
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_format_option)
|
||||
{
|
||||
test(1);
|
||||
test(0);
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
/*-
|
||||
* Copyright (c) 2011 Tim Kientzle
|
||||
* 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"
|
||||
|
||||
#define should(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
|
||||
|
||||
if (!pristine) {
|
||||
archive_read_support_filter_all(a);
|
||||
archive_read_support_format_all(a);
|
||||
}
|
||||
|
||||
/* NULL and "" denote `no option', so they're ok no matter
|
||||
* what, if any, formats are registered */
|
||||
should(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, NULL, "snafu", NULL);
|
||||
should(a, ARCHIVE_FAILED, NULL, "snafu", "betcha");
|
||||
|
||||
/* ARCHIVE_OK with iso9660 loaded, ARCHIVE_WARN otherwise */
|
||||
should(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should(a, known_option_rv, NULL, "joliet", NULL);
|
||||
should(a, known_option_rv, NULL, "joliet", NULL);
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_option)
|
||||
{
|
||||
test(1);
|
||||
test(0);
|
||||
}
|
||||
@@ -25,11 +25,121 @@
|
||||
|
||||
#include "test.h"
|
||||
|
||||
#define should(__a, __code, __opts) \
|
||||
#define should_read_set_filter_option(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_filter_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
read_set_filter_option_test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
|
||||
if (!pristine)
|
||||
archive_read_support_filter_all(a);
|
||||
|
||||
should_read_set_filter_option(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should_read_set_filter_option(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
should_read_set_filter_option(a, ARCHIVE_FAILED, NULL, "fubar", NULL);
|
||||
should_read_set_filter_option(a, ARCHIVE_FAILED, NULL, "fubar", "snafu");
|
||||
should_read_set_filter_option(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should_read_set_filter_option(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_filter_option)
|
||||
{
|
||||
read_set_filter_option_test(1);
|
||||
read_set_filter_option_test(0);
|
||||
}
|
||||
|
||||
#define should_read_set_format_option(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_format_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
read_set_format_option_test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
|
||||
|
||||
if (!pristine)
|
||||
archive_read_support_format_all(a);
|
||||
|
||||
/* NULL and "" denote `no option', so they're ok no matter
|
||||
* what, if any, formats are registered */
|
||||
should_read_set_format_option(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should_read_set_format_option(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
/* unknown modules and options */
|
||||
should_read_set_format_option(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should_read_set_format_option(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
/* unknown modules and options */
|
||||
should_read_set_format_option(a, ARCHIVE_FAILED, NULL, "snafu", NULL);
|
||||
should_read_set_format_option(a, ARCHIVE_FAILED, NULL, "snafu", "betcha");
|
||||
|
||||
/* ARCHIVE_OK with iso9660 loaded, ARCHIVE_WARN otherwise */
|
||||
should_read_set_format_option(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should_read_set_format_option(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should_read_set_format_option(a, known_option_rv, NULL, "joliet", NULL);
|
||||
should_read_set_format_option(a, known_option_rv, NULL, "joliet", NULL);
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_format_option)
|
||||
{
|
||||
read_set_format_option_test(1);
|
||||
read_set_format_option_test(0);
|
||||
}
|
||||
|
||||
#define should_read_set_option(__a, __code, __m, __o, __v) \
|
||||
assertEqualInt(__code, archive_read_set_option(__a, __m, __o, __v))
|
||||
|
||||
static void
|
||||
read_set_option_test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
|
||||
|
||||
if (!pristine) {
|
||||
archive_read_support_filter_all(a);
|
||||
archive_read_support_format_all(a);
|
||||
}
|
||||
|
||||
/* NULL and "" denote `no option', so they're ok no matter
|
||||
* what, if any, formats are registered */
|
||||
should_read_set_option(a, ARCHIVE_OK, NULL, NULL, NULL);
|
||||
should_read_set_option(a, ARCHIVE_OK, "", "", "");
|
||||
|
||||
/* unknown modules and options */
|
||||
should_read_set_option(a, ARCHIVE_FAILED, "fubar", "snafu", NULL);
|
||||
should_read_set_option(a, ARCHIVE_FAILED, "fubar", "snafu", "betcha");
|
||||
|
||||
/* unknown modules and options */
|
||||
should_read_set_option(a, ARCHIVE_FAILED, NULL, "snafu", NULL);
|
||||
should_read_set_option(a, ARCHIVE_FAILED, NULL, "snafu", "betcha");
|
||||
|
||||
/* ARCHIVE_OK with iso9660 loaded, ARCHIVE_WARN otherwise */
|
||||
should_read_set_option(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should_read_set_option(a, known_option_rv, "iso9660", "joliet", NULL);
|
||||
should_read_set_option(a, known_option_rv, NULL, "joliet", NULL);
|
||||
should_read_set_option(a, known_option_rv, NULL, "joliet", NULL);
|
||||
|
||||
archive_read_free(a);
|
||||
}
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_option)
|
||||
{
|
||||
read_set_option_test(1);
|
||||
read_set_option_test(0);
|
||||
}
|
||||
|
||||
#define should_read_set_options(__a, __code, __opts) \
|
||||
assertEqualInt(__code, archive_read_set_options(__a, __opts))
|
||||
|
||||
static void
|
||||
test(int pristine)
|
||||
read_set_options_test(int pristine)
|
||||
{
|
||||
struct archive* a = archive_read_new();
|
||||
int halfempty_options_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
|
||||
@@ -42,62 +152,62 @@ test(int pristine)
|
||||
|
||||
/* NULL and "" denote `no option', so they're ok no matter
|
||||
* what, if any, formats are registered */
|
||||
should(a, ARCHIVE_OK, NULL);
|
||||
should(a, ARCHIVE_OK, "");
|
||||
should_read_set_options(a, ARCHIVE_OK, NULL);
|
||||
should_read_set_options(a, ARCHIVE_OK, "");
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, "fubar:snafu");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "fubar:snafu");
|
||||
assertEqualString("Unknown module name: `fubar'",
|
||||
archive_error_string(a));
|
||||
should(a, ARCHIVE_FAILED, "fubar:snafu=betcha");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "fubar:snafu=betcha");
|
||||
assertEqualString("Unknown module name: `fubar'",
|
||||
archive_error_string(a));
|
||||
|
||||
/* unknown modules and options */
|
||||
should(a, ARCHIVE_FAILED, "snafu");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "snafu");
|
||||
assertEqualString("Undefined option: `snafu'",
|
||||
archive_error_string(a));
|
||||
should(a, ARCHIVE_FAILED, "snafu=betcha");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "snafu=betcha");
|
||||
assertEqualString("Undefined option: `snafu'",
|
||||
archive_error_string(a));
|
||||
|
||||
/* ARCHIVE_OK with iso9660 loaded, ARCHIVE_FAILED otherwise */
|
||||
should(a, known_option_rv, "iso9660:joliet");
|
||||
should_read_set_options(a, known_option_rv, "iso9660:joliet");
|
||||
if (pristine) {
|
||||
assertEqualString("Unknown module name: `iso9660'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
should(a, known_option_rv, "iso9660:joliet");
|
||||
should_read_set_options(a, known_option_rv, "iso9660:joliet");
|
||||
if (pristine) {
|
||||
assertEqualString("Unknown module name: `iso9660'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
should(a, known_option_rv, "joliet");
|
||||
should_read_set_options(a, known_option_rv, "joliet");
|
||||
if (pristine) {
|
||||
assertEqualString("Undefined option: `joliet'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
should(a, known_option_rv, "!joliet");
|
||||
should_read_set_options(a, known_option_rv, "!joliet");
|
||||
if (pristine) {
|
||||
assertEqualString("Undefined option: `joliet'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
|
||||
should(a, ARCHIVE_OK, ",");
|
||||
should(a, ARCHIVE_OK, ",,");
|
||||
should_read_set_options(a, ARCHIVE_OK, ",");
|
||||
should_read_set_options(a, ARCHIVE_OK, ",,");
|
||||
|
||||
should(a, halfempty_options_rv, ",joliet");
|
||||
should_read_set_options(a, halfempty_options_rv, ",joliet");
|
||||
if (pristine) {
|
||||
assertEqualString("Undefined option: `joliet'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
should(a, halfempty_options_rv, "joliet,");
|
||||
should_read_set_options(a, halfempty_options_rv, "joliet,");
|
||||
if (pristine) {
|
||||
assertEqualString("Undefined option: `joliet'",
|
||||
archive_error_string(a));
|
||||
}
|
||||
|
||||
should(a, ARCHIVE_FAILED, "joliet,snafu");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "joliet,snafu");
|
||||
if (pristine) {
|
||||
assertEqualString("Undefined option: `joliet'",
|
||||
archive_error_string(a));
|
||||
@@ -106,7 +216,7 @@ test(int pristine)
|
||||
archive_error_string(a));
|
||||
}
|
||||
|
||||
should(a, ARCHIVE_FAILED, "iso9660:snafu");
|
||||
should_read_set_options(a, ARCHIVE_FAILED, "iso9660:snafu");
|
||||
if (pristine) {
|
||||
assertEqualString("Unknown module name: `iso9660'",
|
||||
archive_error_string(a));
|
||||
@@ -120,6 +230,6 @@ test(int pristine)
|
||||
|
||||
DEFINE_TEST(test_archive_read_set_options)
|
||||
{
|
||||
test(1);
|
||||
test(0);
|
||||
read_set_options_test(1);
|
||||
read_set_options_test(0);
|
||||
}
|
||||
Reference in new issue
Block a user