Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ad3f9b4
packing: add more unit test
Baptiste Daroussin committed 4 years ago
commit ad3f9b4902f7e7e8e70ba05e377f49bc63c9b8ae
parent b1bb805
4 files changed +156 -10
modified libpkg/packing.c
@@ -40,15 +40,7 @@
#include "pkg.h"

#include "private/event.h"

#include "private/pkg.h"
-
- 
static const char *packing_set_format(struct archive *a, pkg_formats format, int clevel);
-
- 
struct packing {
- 
	struct archive *aread;
- 
	struct archive *awrite;
- 
	struct archive_entry_linkresolver *resolver;
- 
	time_t timestamp;
- 
};
+ 
#include "private/packing.h"



int

packing_init(struct packing **pack, const char *path, pkg_formats format, int clevel,
@@ -294,7 +286,7 @@ packing_finish(struct packing *pack)
	free(pack);

}
- 
static const char *
+ 
const char *

packing_set_format(struct archive *a, pkg_formats format, int clevel)

{

	const char *notsupp_fmt = "%s is not supported, trying %s";
added libpkg/private/packing.h
@@ -0,0 +1,39 @@
+ 
/*-
+ 
 * Copyright (c) 2011-2021 Baptiste Daroussin <bapt@FreeBSD.org>
+ 
 * Copyright (c) 2011 Will Andrews <will@FreeBSD.org>
+ 
 * 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
+ 
 *    in this position and unchanged.
+ 
 * 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.
+ 
 */
+
+ 
#ifndef _PACKING_H
+ 
#define _PACKING_H
+
+ 
struct packing {
+ 
	struct archive *aread;
+ 
	struct archive *awrite;
+ 
	struct archive_entry_linkresolver *resolver;
+ 
	time_t timestamp;
+ 
};
+
+ 
const char *packing_set_format(struct archive *a, pkg_formats format, int clevel);
+ 
#endif
modified tests/Makefile.autosetup
@@ -4,6 +4,7 @@ TESTS= \
	checksum \

	deps_formula \

	merge \
+ 
	packing \

	pkg_add_dir_to_del \

	pkg_printf \

	pkg_validation \
@@ -69,8 +70,10 @@ pkg_printf_OBJS= lib/pkg_printf_test.o \
deps_formula_OBJS=	lib/deps_formula.o

pkg_add_dir_to_del_OBJS=	lib/pkg_add_dir_to_del.o

pkg_validation_OBJS=	lib/pkg_validation.o
+ 
packing_OBJS=	lib/packing.o



SRCS=	\
+ 
	$(packing_OBJS:.o=.c) \

	$(merge_OBJS:.o=.c) \

	$(plist_OBJS:.o=.c) \

	$(lua_OBJS:.o=.c) \
added tests/lib/packing.c
@@ -0,0 +1,112 @@
+ 
/*
+ 
 * Copyright (c) 2021 Baptiste Daroussin <bapt@FreeBSD.org>
+ 
 *
+ 
 * 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
+ 
 *    in this position and unchanged.
+ 
 * 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 <atf-c.h>
+ 
#include <archive.h>
+ 
#include <pkg.h>
+ 
#include <private/pkg.h>
+ 
#include <private/packing.h>
+
+ 
ATF_TC(packing_format_from_string);
+ 
ATF_TC(packing_format_to_string);
+ 
ATF_TC(packing_format_is_valid);
+ 
ATF_TC(packing_set_format);
+
+ 
ATF_TC_HEAD(packing_format_from_string, tc) { }
+ 
ATF_TC_HEAD(packing_format_to_string, tc) { }
+ 
ATF_TC_HEAD(packing_format_is_valid, tc) { }
+ 
ATF_TC_HEAD(packing_set_format, tc) {}
+
+ 
ATF_TC_BODY(packing_format_from_string, tc)
+ 
{
+ 
	ATF_REQUIRE_EQ(packing_format_from_string(NULL), DEFAULT_COMPRESSION);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("tzst"), TZS);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("txz"), TXZ);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("tbz"), TBZ);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("tgz"), TGZ);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("tar"), TAR);
+ 
	ATF_REQUIRE_EQ(packing_format_from_string("plop"), TXZ);
+ 
}
+
+ 
ATF_TC_BODY(packing_format_to_string, tc)
+ 
{
+ 
	ATF_REQUIRE_EQ(packing_format_to_string(27), NULL);
+ 
	ATF_REQUIRE_STREQ(packing_format_to_string(TZS), "tzst");
+ 
	ATF_REQUIRE_STREQ(packing_format_to_string(TXZ), "txz");
+ 
	ATF_REQUIRE_STREQ(packing_format_to_string(TBZ), "tbz");
+ 
	ATF_REQUIRE_STREQ(packing_format_to_string(TGZ), "tgz");
+ 
	ATF_REQUIRE_STREQ(packing_format_to_string(TAR), "tar");
+ 
}
+
+ 
ATF_TC_BODY(packing_format_is_valid, tc)
+ 
{
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("pkg"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("tzst"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("txz"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("tbz"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("tgz"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("tar"), true);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format("deb"), false);
+ 
	ATF_REQUIRE_EQ(packing_is_valid_format(NULL), false);
+ 
}
+
+ 
ATF_TC_BODY(packing_set_format, tc)
+ 
{
+ 
	struct archive *a = archive_write_new();
+ 
	ATF_CHECK(a != NULL);
+
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TZS, -1), "tzst");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TXZ, -1), "txz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TBZ, -1), "tbz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TGZ, -1), "tgz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TAR, -1), "tar");
+ 
	ATF_REQUIRE_EQ(packing_set_format(a, 28, -1), NULL);
+
+ 
	/* compression min */
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TZS, INT_MIN), "tzst");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TXZ, INT_MIN), "txz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TBZ, INT_MIN), "tbz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TGZ, INT_MIN), "tgz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TAR, INT_MIN), "tar");
+ 
	ATF_REQUIRE_EQ(packing_set_format(a, 28, INT_MIN), NULL);
+
+ 
	/* compression max */
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TZS, INT_MAX), "tzst");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TXZ, INT_MAX), "txz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TBZ, INT_MAX), "tbz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TGZ, INT_MAX), "tgz");
+ 
	ATF_REQUIRE_STREQ(packing_set_format(a, TAR, INT_MAX), "tar");
+ 
	ATF_REQUIRE_EQ(packing_set_format(a, 28, INT_MAX), NULL);
+ 
}
+
+ 
ATF_TP_ADD_TCS(tp)
+ 
{
+ 
	ATF_TP_ADD_TC(tp, packing_format_from_string);
+ 
	ATF_TP_ADD_TC(tp, packing_format_to_string);
+ 
	ATF_TP_ADD_TC(tp, packing_format_is_valid);
+ 
	ATF_TP_ADD_TC(tp, packing_set_format);
+
+ 
	return (atf_no_error());
+ 
}