diff --git a/common/tests/advio.cpp b/common/tests/advio.cpp index 9d1458973..c76c5a3bc 100644 --- a/common/tests/advio.cpp +++ b/common/tests/advio.cpp @@ -25,8 +25,11 @@ #include #include +#include #include +using namespace villas; + /** This URI points to a Sciebo share which contains some test files. * The Sciebo share is read/write accessible via WebDAV. */ #define BASE_URI "https://1Nrd46fZX8HbggT:badpass@rwth-aachen.sciebo.de/public.php/webdav/node/tests" @@ -176,7 +179,7 @@ Test(advio, upload) char buffer[64]; /* Get some random data to upload */ - len = read_random(upload, sizeof(upload)); + len = utils::read_random(upload, sizeof(upload)); cr_assert_eq(len, sizeof(upload)); /* Open file for writing */ diff --git a/common/tests/hist.cpp b/common/tests/hist.cpp index 14db2ddee..25940bfbe 100644 --- a/common/tests/hist.cpp +++ b/common/tests/hist.cpp @@ -27,9 +27,6 @@ const double test_data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; -/* Histogram of test_data with 200 buckets between -100 and 100 */ -const int hist_result[] = {}; - TestSuite(hist, .description = "Histogram"); Test(hist, simple) { @@ -46,8 +43,5 @@ Test(hist, simple) { cr_assert_float_eq(hist_var(&h), 9.1666, 1e-3,); cr_assert_float_eq(hist_stddev(&h), 3.027650, 1e-6); -// for (int i = 0; i < ARRAY_LEN(hist_result); i++) -// cr_assert_eq() - hist_destroy(&h); } diff --git a/common/tests/kernel.cpp b/common/tests/kernel.cpp index b3c1c27ba..85c469294 100644 --- a/common/tests/kernel.cpp +++ b/common/tests/kernel.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include TestSuite(kernel, .description = "Kernel features"); @@ -76,20 +76,14 @@ Test(kernel, hugepages) Test(kernel, version) { - int ret; + using villas::utils::Version; - struct version ver; - struct version ver1 = { 100, 5 }; - struct version ver2 = { 2, 6 }; + Version ver = villas::kernel::getVersion(); + Version ver1 = { 100, 5 }; + Version ver2 = { 2, 6 }; - ret = kernel_get_version(&ver); - cr_assert_eq(ret, 0); - - ret = version_cmp(&ver, &ver1); - cr_assert_lt(ret, 0); - - ret = version_cmp(&ver, &ver2); - cr_assert_gt(ret, 0); + cr_assert_lt(ver, ver1); + cr_assert_gt(ver, ver2); } Test(kernel, module, .disabled = true) diff --git a/common/tests/list.cpp b/common/tests/list.cpp index 5e430ccc0..b5c503aba 100644 --- a/common/tests/list.cpp +++ b/common/tests/list.cpp @@ -124,7 +124,7 @@ static int compare(const void *a, const void *b) { Test(list, basics) { - intptr_t i; + uintptr_t i; int ret; struct list l; l.state = STATE_DESTROYED; diff --git a/common/tests/utils.cpp b/common/tests/utils.cpp index dca95246d..2887d96cb 100644 --- a/common/tests/utils.cpp +++ b/common/tests/utils.cpp @@ -24,7 +24,12 @@ #include #include +#include +#include +#include +#include +using namespace villas::utils; TestSuite(utils, .description = "Utilities"); @@ -61,26 +66,55 @@ Test(utils, box_muller) #ifdef __linux__ Test(utils, cpuset) { - int ret; - char str[512]; + using villas::utils::CpuSet; - cpu_set_t cset1; - cpu_set_t cset2; uintmax_t int1 = 0x1234567890ABCDEFULL; - uintmax_t int2 = 0; - cpuset_from_integer(int1, &cset1); + CpuSet cset1(int1); - cpulist_create(str, sizeof(str), &cset1); + std::string cset1_str = cset1; - ret = cpulist_parse(str, &cset2, 1); - cr_assert_eq(ret, 0); + CpuSet cset2(cset1_str); - cr_assert(CPU_EQUAL(&cset1, &cset2)); + cr_assert_eq(cset1, cset2); - cpuset_to_integer(&cset2, &int2); + uintmax_t int2 = cset2; cr_assert_eq(int1, int2); + + CpuSet cset3("1-5"); + CpuSet cset4("1,2,3,4,5"); + + cr_assert_eq(cset3, cset4); + cr_assert_eq(cset3.count(), 5); + + cr_assert(cset3.isset(3)); + cr_assert_not(cset3.isset(6)); + + cr_assert(cset3[3]); + cr_assert_not(cset3[6]); + + cset4.set(6); + cr_assert(cset4[6]); + + cset4.clear(6); + cr_assert_not(cset4[6]); + + cr_assert_str_eq(static_cast(cset4).c_str(), "1-5"); + + cr_assert_any_throw(CpuSet cset5("0-")); + + CpuSet cset6; + cr_assert(cset6.empty()); + cr_assert_eq(cset6.count(), 0); + + cr_assert((~cset6).full()); + cr_assert((cset1 | ~cset1).full()); + cr_assert((cset1 ^ cset1).empty()); + cr_assert((cset1 & cset6).empty()); + + cset1.zero(); + cr_assert(cset1.empty()); } #endif /* __linux__ */ @@ -145,24 +179,24 @@ Test(utils, strf) free(buf); } -struct version_param { - const char *v1, *v2; - int result; -}; - Test(utils, version) { - struct version v1, v2, v3, v4; + using villas::utils::Version; - version_parse("1.2", &v1); - version_parse("1.3", &v2); - version_parse("55", &v3); - version_parse("66", &v4); + Version v1 = Version("1.2"); + Version v2 = Version("1.3"); + Version v3 = Version("55"); + Version v4 = Version("66"); + Version v5 = Version(66); + Version v6 = Version(1, 2, 5); + Version v7 = Version("1.2.5"); - cr_assert_lt(version_cmp(&v1, &v2), 0); - cr_assert_eq(version_cmp(&v1, &v1), 0); - cr_assert_gt(version_cmp(&v2, &v1), 0); - cr_assert_lt(version_cmp(&v3, &v4), 0); + cr_assert_lt(v1, v2); + cr_assert_eq(v1, v1); + cr_assert_gt(v2, v1); + cr_assert_lt(v3, v4); + cr_assert_eq(v4, v5); + cr_assert_eq(v6, v7); } Test(utils, sha1sum)