Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 29aebd8
tests: get rid of utstring
Baptiste Daroussin committed 5 years ago
commit 29aebd85dab852aaaa73404d6cdb82dbec8d8414
parent d04b139
6 files changed +22 -19
modified src/alias.c
@@ -34,7 +34,6 @@
#include <sysexits.h>

#include <unistd.h>

#include <getopt.h>
- 
#include <utstring.h>



#include <pkg.h>
modified src/check.c
@@ -40,7 +40,6 @@
#include <string.h>

#include <unistd.h>

#include <utlist.h>
- 
#include <utstring.h>



#include <pkg.h>
modified src/query.c
@@ -39,7 +39,6 @@
#include <sysexits.h>

#include <unistd.h>
- 
#include <utstring.h>

#include <pkg.h>

#include "pkgcli.h"
modified src/rquery.c
@@ -33,7 +33,6 @@
#include <err.h>

#include <getopt.h>

#include <inttypes.h>
- 
#include <utstring.h>

#include <pkg.h>

#include <stdio.h>

#include <stdlib.h>
modified tests/lib/merge.c
@@ -27,7 +27,6 @@
#include <atf-c.h>

#include <sys/types.h>

#include <private/utils.h>
- 
#include <utstring.h>



ATF_TC(merge);
modified tests/lib/pkg_validation.c
@@ -29,7 +29,7 @@
#include <string.h>



#include <atf-c.h>
- 
#include <utstring.h>
+ 
#include <xstring.h>

#include <pkg.h>



#ifndef __unused
@@ -40,7 +40,7 @@
# endif

#endif
- 
UT_string *msg;
+ 
xstring *msg;



ATF_TC(valid_installed);
@@ -55,8 +55,8 @@ event_callback(void *data __unused, struct pkg_event *ev)
{

	switch (ev->type) {

	case PKG_EVENT_ERROR:
- 
		utstring_clear(msg);
- 
		utstring_printf(msg, "%s", ev->e_pkg_error.msg);
+ 
		xstring_reset(msg);
+ 
		fprintf(msg->fp, "%s", ev->e_pkg_error.msg);

		break;

	default:

		/* IGNORE */
@@ -69,43 +69,51 @@ event_callback(void *data __unused, struct pkg_event *ev)
void

check_valid(struct pkg *p)

{
- 
	utstring_new(msg);
+ 
	msg = xstring_new();



	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property origin");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property origin");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_ORIGIN, "test/bla"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property name");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property name");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_NAME, "test"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property comment");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property comment");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_COMMENT, "test comment"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property version");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property version");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_VERSION, "1.1.0"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property desc");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property desc");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_DESC, "test description"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property maintainer");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property maintainer");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_MAINTAINER, "tester"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property www");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property www");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_WWW, "test website"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(utstring_body(msg), "Invalid package: object has missing property prefix");
+ 
	fflush(msg->fp);
+ 
	ATF_REQUIRE_STREQ(msg->buf, "Invalid package: object has missing property prefix");



	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_PREFIX, "/usr/local"));

	ATF_REQUIRE_EQ(EPKG_OK, pkg_is_valid(p));
- 
	utstring_free(msg);
+ 
	xstring_free(msg);

}



ATF_TC_BODY(valid_installed, tc)