alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

test-utils: fix some clang-tidy warnings

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2025-11-19 22:28:46 +02:00
committed by Seth Ladygo
parent ad327d3acb
commit 5f7686a767
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/utils/tests/test-utils.cc
View File

@ -21,21 +21,20 @@
#include <glib.h> #include <glib.h>
#include <iostream> #include <iostream>
#include <sstream>
#include <functional> #include <functional>
#include <array> #include <array>
#include "mu-utils.hh" #include "mu-utils.hh"
#include "mu-utils-file.hh"
#include "mu-test-utils.hh" #include "mu-test-utils.hh"
#include "mu-error.hh"
using namespace Mu; using namespace Mu;
struct Case { struct Case {
const std::string expr; std::string expr;
bool is_first{}; bool is_first{};
const std::string expected; std::string expected;
}; };
using CaseVec = std::vector<Case>; using CaseVec = std::vector<Case>;
using ProcFunc = std::function<std::string(std::string, bool)>; using ProcFunc = std::function<std::string(std::string, bool)>;
@ -62,7 +61,7 @@ test_date_basic()
} }
g_setenv("TZ", hki, TRUE); g_setenv("TZ", hki, TRUE);
std::vector<std::tuple<const char*, bool/*is_first*/, ::time_t>> cases = {{ const std::vector<std::tuple<const char*, bool/*is_first*/, ::time_t>> cases = {{
{"2015-09-18T09:10:23", true, 1442556623}, {"2015-09-18T09:10:23", true, 1442556623},
{"1972-12-14T09:10:23", true, 93165023}, {"1972-12-14T09:10:23", true, 93165023},
{"1972-12-14T09:10", true, 93165000}, {"1972-12-14T09:10", true, 93165000},
@ -88,7 +87,7 @@ test_date_basic()
for (auto& test: cases) { for (auto& test: cases) {
if (g_test_verbose()) if (g_test_verbose())
g_debug("checking %s", std::get<0>(test)); mu_debug("checking {}", std::get<0>(test));
g_assert_cmpuint(parse_date_time(std::get<0>(test), g_assert_cmpuint(parse_date_time(std::get<0>(test),
std::get<1>(test)).value_or(-1),==, std::get<1>(test)).value_or(-1),==,
std::get<2>(test)); std::get<2>(test));
@ -96,7 +95,7 @@ test_date_basic()
} }
static void static void
test_date_ymwdhMs(void) test_date_ymwdhMs()
{ {
struct testcase { struct testcase {
std::string expr; std::string expr;
@ -104,7 +103,8 @@ test_date_ymwdhMs(void)
int tolerance; int tolerance;
}; };
std::array<testcase, 7> cases = {{
const std::array<testcase, 7> cases = {{
{"7s", 7, 1}, {"7s", 7, 1},
{"3M", 3 * 60, 1}, {"3M", 3 * 60, 1},
{"3h", 3 * 60 * 60, 1}, {"3h", 3 * 60 * 60, 1},
@ -154,9 +154,8 @@ test_utf8_clean()
{ {
assert_equal(utf8_clean("James Holden"), "James Holden"); assert_equal(utf8_clean("James Holden"), "James Holden");
const uint8_t invalid_bytes[] ={ 'a' , 0xff, 'c', '\0'}; const std::array<char, 3> invalid_bytes ={ 'a' , static_cast<char>(0xff), 'c'};
std::string invalid{reinterpret_cast<const char*>(invalid_bytes), std::string invalid{invalid_bytes.data(), invalid_bytes.size()};
sizeof(invalid_bytes) - 1};
g_assert_false(g_utf8_validate(invalid.c_str(), invalid.length(), nullptr)); g_assert_false(g_utf8_validate(invalid.c_str(), invalid.length(), nullptr));
@ -311,9 +310,8 @@ test_locale_workaround()
g_assert_true(locale_workaround()); g_assert_true(locale_workaround());
} }
static void static void
test_summarize(void) test_summarize()
{ {
const char *txt = const char *txt =
"Khiron was fortified and made the seat of a pargana during " "Khiron was fortified and made the seat of a pargana during "