Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7a7336e
Fix pkg_validations tests
Baptiste Daroussin committed 11 years ago
commit 7a7336ebd67b6e541744e924bbbcf4fa194c1470
parent a7320ab
1 file changed +29 -108
modified tests/lib/pkg_validation.c
@@ -56,50 +56,45 @@ event_callback(void *data, struct pkg_event *ev)
	return (0);

}
- 
ATF_TC_BODY(valid_installed, tc)
+ 
void
+ 
check_valid(struct pkg *p)

{
- 
	struct pkg *p = NULL;

	msg = sbuf_new_auto();
- 
	pkg_event_register(event_callback, NULL);
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_new(&p, PKG_INSTALLED));
- 
	ATF_REQUIRE(p != NULL);
- 


	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: origin");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "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(sbuf_data(msg), "package field incomplete: name");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "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(sbuf_data(msg), "package field incomplete: version");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "Invalid package: object has missing property comment");
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_VERSION, "1.1.0"));
+ 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_COMMENT, "test comment"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: comment");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "Invalid package: object has missing property version");
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_COMMENT, "test comment"));
+ 
	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(sbuf_data(msg), "package field incomplete: description");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "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(sbuf_data(msg), "package field incomplete: architecture");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "Invalid package: object has missing property maintainer");
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_ARCH, "freebsd:N"));
+ 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_MAINTAINER, "tester"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: maintainer");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "Invalid package: object has missing property arch");
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_MAINTAINER, "tester"));
+ 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_ARCH, "freebsd:N"));

	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: www");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "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(sbuf_data(msg), "package field incomplete: prefix");
+ 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "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));
@@ -107,6 +102,18 @@ ATF_TC_BODY(valid_installed, tc)
	sbuf_delete(msg);

}
+ 
ATF_TC_BODY(valid_installed, tc)
+ 
{
+ 
	struct pkg *p = NULL;
+
+ 
	pkg_event_register(event_callback, NULL);
+
+ 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_new(&p, PKG_INSTALLED));
+ 
	ATF_REQUIRE(p != NULL);
+
+ 
	check_valid(p);
+ 
}
+ 


ATF_TC(valid_file);



ATF_TC_HEAD(valid_file, tc)
@@ -118,52 +125,13 @@ ATF_TC_HEAD(valid_file, tc)
ATF_TC_BODY(valid_file, tc)

{

	struct pkg *p = NULL;
- 
	msg = sbuf_new_auto();



	pkg_event_register(event_callback, NULL);



	ATF_REQUIRE_EQ(EPKG_OK, pkg_new(&p, PKG_FILE));

	ATF_REQUIRE(p != NULL);
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: name");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_NAME, "test"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: description");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_DESC, "test description"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: architecture");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_ARCH, "freebsd:N"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: maintainer");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_MAINTAINER, "tester"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: prefix");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_PREFIX, "/usr/local"));
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_is_valid(p));
-
- 
	sbuf_delete(msg);
+ 
	check_valid(p);

}



ATF_TC(valid_remote);
@@ -177,60 +145,13 @@ ATF_TC_HEAD(valid_remote, tc)
ATF_TC_BODY(valid_remote, tc)

{

	struct pkg *p = NULL;
- 
	msg = sbuf_new_auto();



	pkg_event_register(event_callback, NULL);



	ATF_REQUIRE_EQ(EPKG_OK, pkg_new(&p, PKG_REMOTE));

	ATF_REQUIRE(p != NULL);
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: name");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_NAME, "test"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: description");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_DESC, "test description"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: architecture");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_ARCH, "freebsd:N"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: maintainer");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_MAINTAINER, "tester"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: 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(sbuf_data(msg), "package field incomplete: prefix");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_PREFIX, "/usr/local"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: repopath");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_REPOPATH, "/here"));
- 
	ATF_REQUIRE_EQ(EPKG_FATAL, pkg_is_valid(p));
- 
	ATF_REQUIRE_STREQ(sbuf_data(msg), "package field incomplete: checksum");
-
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_set(p, PKG_CKSUM, "mysum"));
- 
	ATF_REQUIRE_EQ(EPKG_OK, pkg_is_valid(p));
-
- 
	sbuf_delete(msg);
+ 
	check_valid(p);

}



ATF_TP_ADD_TCS(tp)