tests: port remaining C unit tests to the C++ test harness

Convert acl, acl_literal, aead2022, base64, buffer, cache (legacy
reference), crypto, ipset, ipset_reference, json, netutils, ppbloom,
process, ref, ssurl and utils tests to test_helpers.hpp. ctest names are
unchanged; every assertion is kept. Build the ported sources with the
strict C++ warning set.
This commit is contained in:
Max Lv
2026-10-15 01:33:51 +08:00
parent d168986dc6
commit 678a891ef9
18 changed files with 1274 additions and 1169 deletions
+66 -79
View File
@@ -1,113 +1,100 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <assert.h>
#include <string.h>
#include <stdlib.h>
int verbose = 0;
// SPDX-License-Identifier: GPL-3.0-or-later
// String and number helpers (src/utils.cpp).
#include <climits>
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include "test_helpers.hpp"
#include "utils.h"
static void
test_ss_itoa(void)
{
char *s;
extern "C" {
int verbose = 0;
}
s = ss_itoa(0);
assert(s != NULL);
assert(strcmp(s, "0") == 0);
namespace {
void test_ss_itoa()
{
char *s = ss_itoa(0);
SS_CHECK(s != nullptr && std::strcmp(s, "0") == 0);
s = ss_itoa(42);
assert(s != NULL);
assert(strcmp(s, "42") == 0);
SS_CHECK(s != nullptr && std::strcmp(s, "42") == 0);
s = ss_itoa(-1);
assert(s != NULL);
assert(strcmp(s, "-1") == 0);
SS_CHECK(s != nullptr && std::strcmp(s, "-1") == 0);
s = ss_itoa(12345);
assert(s != NULL);
assert(strcmp(s, "12345") == 0);
(void)s;
SS_CHECK(s != nullptr && std::strcmp(s, "12345") == 0);
}
static void
test_ss_isnumeric(void)
void test_ss_isnumeric()
{
assert(ss_isnumeric("12345") == 1);
assert(ss_isnumeric("0") == 1);
assert(ss_isnumeric("") == 0);
assert(ss_isnumeric("abc") == 0);
assert(ss_isnumeric("123abc") == 0);
assert(ss_isnumeric("12.34") == 0);
SS_CHECK(ss_isnumeric("12345") == 1);
SS_CHECK(ss_isnumeric("0") == 1);
SS_CHECK(ss_isnumeric("") == 0);
SS_CHECK(ss_isnumeric("abc") == 0);
SS_CHECK(ss_isnumeric("123abc") == 0);
SS_CHECK(ss_isnumeric("12.34") == 0);
}
static void
test_ss_strndup(void)
void test_ss_strndup()
{
char *s;
s = ss_strndup("hello world", 5);
assert(s != NULL);
assert(strcmp(s, "hello") == 0);
assert(strlen(s) == 5);
free(s);
char *s = ss_strndup("hello world", 5);
SS_CHECK(s != nullptr && std::strcmp(s, "hello") == 0 && std::strlen(s) == 5);
std::free(s);
s = ss_strndup("short", 10);
assert(s != NULL);
assert(strcmp(s, "short") == 0);
free(s);
SS_CHECK(s != nullptr && std::strcmp(s, "short") == 0);
std::free(s);
s = ss_strndup("", 0);
assert(s != NULL);
assert(strcmp(s, "") == 0);
free(s);
SS_CHECK(s != nullptr && std::strcmp(s, "") == 0);
std::free(s);
char raw[3] = { 'a', 'b', 'c' };
s = ss_strndup(raw, sizeof(raw));
assert(s != NULL);
assert(strcmp(s, "abc") == 0);
free(s);
const char raw[3] = { 'a', 'b', 'c' };
s = ss_strndup(raw, sizeof(raw));
SS_CHECK(s != nullptr && std::strcmp(s, "abc") == 0);
std::free(s);
}
static void
test_ss_parse_int(void)
void test_ss_parse_int()
{
int value = -1;
int value = -1;
uint16_t port = 0;
assert(ss_parse_int("0", 0, 10, &value) == 0);
assert(value == 0);
SS_CHECK(ss_parse_int("0", 0, 10, &value) == 0);
SS_CHECK(value == 0);
assert(ss_parse_int("10", 0, 10, &value) == 0);
assert(value == 10);
SS_CHECK(ss_parse_int("10", 0, 10, &value) == 0);
SS_CHECK(value == 10);
assert(ss_parse_int("-1", 0, 10, &value) == -1);
assert(ss_parse_int("11", 0, 10, &value) == -1);
assert(ss_parse_int("12x", 0, 100, &value) == -1);
assert(ss_parse_int("", 0, 100, &value) == -1);
assert(ss_parse_int("999999999999999999999999", 0, INT_MAX, &value) == -1);
assert(ss_parse_int("1", 10, 0, &value) == -1);
assert(ss_parse_int("1", 0, 10, NULL) == -1);
SS_CHECK(ss_parse_int("-1", 0, 10, &value) == -1);
SS_CHECK(ss_parse_int("11", 0, 10, &value) == -1);
SS_CHECK(ss_parse_int("12x", 0, 100, &value) == -1);
SS_CHECK(ss_parse_int("", 0, 100, &value) == -1);
SS_CHECK(ss_parse_int("999999999999999999999999", 0, INT_MAX, &value) == -1);
SS_CHECK(ss_parse_int("1", 10, 0, &value) == -1);
SS_CHECK(ss_parse_int("1", 0, 10, nullptr) == -1);
assert(ss_parse_uint16_port("1", &port) == 0);
assert(port == 1);
assert(ss_parse_uint16_port("65535", &port) == 0);
assert(port == 65535);
assert(ss_parse_uint16_port("0", &port) == -1);
assert(ss_parse_uint16_port("65536", &port) == -1);
assert(ss_parse_uint16_port("22x", &port) == -1);
assert(ss_parse_uint16_port("22", NULL) == -1);
SS_CHECK(ss_parse_uint16_port("1", &port) == 0);
SS_CHECK(port == 1);
SS_CHECK(ss_parse_uint16_port("65535", &port) == 0);
SS_CHECK(port == 65535);
SS_CHECK(ss_parse_uint16_port("0", &port) == -1);
SS_CHECK(ss_parse_uint16_port("65536", &port) == -1);
SS_CHECK(ss_parse_uint16_port("22x", &port) == -1);
SS_CHECK(ss_parse_uint16_port("22", nullptr) == -1);
}
int
main(void)
} // namespace
int main()
{
test_ss_itoa();
test_ss_isnumeric();
test_ss_strndup();
test_ss_parse_int();
SS_RUN(test_ss_itoa);
SS_RUN(test_ss_isnumeric);
SS_RUN(test_ss_strndup);
SS_RUN(test_ss_parse_int);
return 0;
}