From e7d6f50454ca24f573f0a4baf5bcca1fec67c29b Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:00:03 -0500 Subject: [PATCH] fix unittest --- src/Manifest.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Manifest.cc b/src/Manifest.cc index 407c543ad..d24c62a3c 100644 --- a/src/Manifest.cc +++ b/src/Manifest.cc @@ -40,9 +40,6 @@ static const fs::path GIT_SRC_DIR(GIT_DIR / "src"); static const std::unordered_set ALLOWED_CHARS = { '-', '_', '/', '.', '+' // allowed in the dependency name }; -static const std::unordered_set KEYWORDS = { -#include "Keywords.def" -}; Result Edition::tryFromString(std::string str) noexcept { @@ -550,7 +547,11 @@ validatePackageName(const std::string_view name) noexcept { std::isalnum(name[name.size() - 1]), "package name must end with a letter or digit" ); - Ensure(!KEYWORDS.contains(name), "package name must not be a C++ keyword"); + + static const std::unordered_set keywords = { +#include "Keywords.def" + }; + Ensure(!keywords.contains(name), "package name must not be a C++ keyword"); return Ok(); } @@ -1076,6 +1077,8 @@ testValidateDepName() { int main() { + cabin::setColorMode("never"); + tests::testEditionTryFromString(); tests::testEditionComparison(); tests::testPackageTryFromToml();