4 files changed, 141 insertions, 0 deletions
diff --git a/lib/libutil++/tests/Makefile b/lib/libutil++/tests/Makefile
new file mode 100644
index 000000000000..e7720d122f36
--- /dev/null
+++ b/lib/libutil++/tests/Makefile
@@ -0,0 +1,12 @@
+PACKAGE=	tests
+
+ATF_TESTS_CXX+=	pidfile_test
+ATF_TESTS_CXX+=	stringf_test
+ATF_TESTS_CXX+=	up_test
+
+CFLAGS+=	-I${SRCTOP}/lib/libutil++
+LIBADD+=	util++
+
+LIBADD.pidfile_test+= util
+
+.include <bsd.test.mk>
diff --git a/lib/libutil++/tests/pidfile_test.cc b/lib/libutil++/tests/pidfile_test.cc
new file mode 100644
index 000000000000..067f10e8fab8
--- /dev/null
+++ b/lib/libutil++/tests/pidfile_test.cc
@@ -0,0 +1,44 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 Chelsio Communications, Inc.
+ * Written by: John Baldwin <jhb@FreeBSD.org>
+ */
+
+#include <atf-c++.hpp>
+#include <sys/stat.h>
+#include <libutil.h>
+
+#include <libutil++.hh>
+
+ATF_TEST_CASE_WITHOUT_HEAD(basic);
+ATF_TEST_CASE_BODY(basic)
+{
+	pid_t other;
+	struct pidfh *pfh = pidfile_open("test_pidfile", 0600, &other);
+	ATF_REQUIRE(pfh != nullptr);
+	ATF_REQUIRE(pidfile_fileno(pfh) >= 0);
+
+	struct stat sb;
+	ATF_REQUIRE(fstat(pidfile_fileno(pfh), &sb) == 0);
+	ATF_REQUIRE_EQ(0, sb.st_size);
+
+	freebsd::pidfile pf(pfh);
+	ATF_REQUIRE_EQ(pidfile_fileno(pfh), pf.fileno());
+
+	ATF_REQUIRE(pf.write() == 0);
+	
+	ATF_REQUIRE(fstat(pf.fileno(), &sb) == 0);
+	ATF_REQUIRE(sb.st_size > 0);
+
+	ATF_REQUIRE(pf.close() == 0);
+	ATF_REQUIRE(pf.fileno() == -1);
+	ATF_REQUIRE_EQ(EDOOFUS, errno);
+
+	ATF_REQUIRE(unlink("test_pidfile") == 0);
+}
+
+ATF_INIT_TEST_CASES(tcs)
+{
+	ATF_ADD_TEST_CASE(tcs, basic);
+}
diff --git a/lib/libutil++/tests/stringf_test.cc b/lib/libutil++/tests/stringf_test.cc
new file mode 100644
index 000000000000..5b8ef4ad54a9
--- /dev/null
+++ b/lib/libutil++/tests/stringf_test.cc
@@ -0,0 +1,52 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 Chelsio Communications, Inc.
+ * Written by: John Baldwin <jhb@FreeBSD.org>
+ */
+
+#include <atf-c++.hpp>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <libutil++.hh>
+
+ATF_TEST_CASE_WITHOUT_HEAD(basic);
+ATF_TEST_CASE_BODY(basic)
+{
+	ATF_REQUIRE_EQ("foo", freebsd::stringf("foo"));
+	ATF_REQUIRE_EQ("bar", freebsd::stringf("%s", "bar"));
+	ATF_REQUIRE_EQ("42", freebsd::stringf("%u", 42));
+	ATF_REQUIRE_EQ("0xdeadbeef", freebsd::stringf("%#x", 0xdeadbeef));
+	ATF_REQUIRE_EQ("", freebsd::stringf(""));
+	ATF_REQUIRE_EQ("this is a test", freebsd::stringf("this %s test",
+	    "is a"));
+}
+
+static std::string
+stringv(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	std::string str = freebsd::stringf(fmt, ap);
+	va_end(ap);
+	return (str);
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(va_list);
+ATF_TEST_CASE_BODY(va_list)
+{
+	ATF_REQUIRE_EQ("foo", stringv("foo"));
+	ATF_REQUIRE_EQ("bar", stringv("%s", "bar"));
+	ATF_REQUIRE_EQ("42", stringv("%u", 42));
+	ATF_REQUIRE_EQ("0xdeadbeef", stringv("%#x", 0xdeadbeef));
+	ATF_REQUIRE_EQ("", stringv(""));
+	ATF_REQUIRE_EQ("this is a test", stringv("this %s test", "is a"));
+}
+
+ATF_INIT_TEST_CASES(tcs)
+{
+	ATF_ADD_TEST_CASE(tcs, basic);
+	ATF_ADD_TEST_CASE(tcs, va_list);
+}
diff --git a/lib/libutil++/tests/up_test.cc b/lib/libutil++/tests/up_test.cc
new file mode 100644
index 000000000000..3f344054c334
--- /dev/null
+++ b/lib/libutil++/tests/up_test.cc
@@ -0,0 +1,33 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 Chelsio Communications, Inc.
+ * Written by: John Baldwin <jhb@FreeBSD.org>
+ */
+
+#include <atf-c++.hpp>
+#include <libutil.h>
+
+#include <libutil++.hh>
+
+ATF_TEST_CASE_WITHOUT_HEAD(FILE_up);
+ATF_TEST_CASE_BODY(FILE_up)
+{
+	FILE *fp = fopen("/dev/null", "r");
+	ATF_REQUIRE(fp != NULL);
+	ATF_REQUIRE(fileno(fp) != -1);
+
+	freebsd::FILE_up f(fp);
+	ATF_REQUIRE_EQ(fileno(fp), fileno(f.get()));
+
+	f.reset();
+	ATF_REQUIRE_EQ(f.get(), nullptr);
+
+	ATF_REQUIRE_EQ(-1, fileno(fp));
+	ATF_REQUIRE_EQ(EBADF, errno);
+}
+
+ATF_INIT_TEST_CASES(tcs)
+{
+	ATF_ADD_TEST_CASE(tcs, FILE_up);
+}