Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UnitTest: Switch to Assert::IsTrue for primitive datatypes

Browse Source 
Visual Studio 2019 has issues compiling Assert::AreEqual<stdex::langid>.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2025-03-28 15:30:05 +01:00
parent 51d472d8b2
commit 5fc35751a3
8 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
UnitTests/parser.cpp
View File

@@ -36,55 +36,55 @@ namespace UnitTests
{
wnoop p;
Assert::IsTrue(p.match(text));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)0, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 0);
}
{
wcu p(L't');
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)1, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 1);
}
{
wspace_cu p;
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 4));
Assert::AreEqual((size_t)4, p.interval.start);
Assert::AreEqual((size_t)5, p.interval.end);
Assert::IsTrue(p.interval.start == 4);
Assert::IsTrue(p.interval.end == 5);
}
{
wpunct_cu p;
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 14));
Assert::AreEqual((size_t)14, p.interval.start);
Assert::AreEqual((size_t)15, p.interval.end);
Assert::IsTrue(p.interval.start == 14);
Assert::IsTrue(p.interval.end == 15);
}
{
wspace_or_punct_cu p;
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 4));
Assert::AreEqual((size_t)4, p.interval.start);
Assert::AreEqual((size_t)5, p.interval.end);
Assert::IsTrue(p.interval.start == 4);
Assert::IsTrue(p.interval.end == 5);
Assert::IsTrue(p.match(text, 14));
Assert::AreEqual((size_t)14, p.interval.start);
Assert::AreEqual((size_t)15, p.interval.end);
Assert::IsTrue(p.interval.start == 14);
Assert::IsTrue(p.interval.end == 15);
}
{
wbol p;
Assert::IsTrue(p.match(text));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)0, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 0);
Assert::IsFalse(p.match(text, 1));
Assert::IsFalse(p.match(text, 15));
Assert::IsTrue(p.match(text, 16));
Assert::AreEqual((size_t)16, p.interval.start);
Assert::AreEqual((size_t)16, p.interval.end);
Assert::IsTrue(p.interval.start == 16);
Assert::IsTrue(p.interval.end == 16);
}
{
@@ -92,8 +92,8 @@ namespace UnitTests
Assert::IsFalse(p.match(text));
Assert::IsFalse(p.match(text, 1));
Assert::IsTrue(p.match(text, 15));
Assert::AreEqual((size_t)15, p.interval.start);
Assert::AreEqual((size_t)15, p.interval.end);
Assert::IsTrue(p.interval.start == 15);
Assert::IsTrue(p.interval.end == 15);
Assert::IsFalse(p.match(text, 16));
}
@@ -101,38 +101,38 @@ namespace UnitTests
wcu_set p(L"abcD");
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 8));
Assert::AreEqual((size_t)8, p.interval.start);
Assert::AreEqual((size_t)9, p.interval.end);
Assert::AreEqual((size_t)0, p.hit_offset);
Assert::IsTrue(p.interval.start == 8);
Assert::IsTrue(p.interval.end == 9);
Assert::IsTrue(p.hit_offset == 0);
Assert::IsFalse(p.match(text, 21));
Assert::IsTrue(p.match(text, 21, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)21, p.interval.start);
Assert::AreEqual((size_t)22, p.interval.end);
Assert::AreEqual((size_t)3, p.hit_offset);
Assert::IsTrue(p.interval.start == 21);
Assert::IsTrue(p.interval.end == 22);
Assert::IsTrue(p.hit_offset == 3);
}
{
stdex::parser::wstring p(L"this");
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, sizeof(text), match_case_insensitive));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)4, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 4);
}
{
wany_cu chr;
witerations p(make_shared_no_delete(&chr), 1, 5);
Assert::IsTrue(p.match(text));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)5, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 5);
}
{
wspace_cu nospace(true);
witerations p(make_shared_no_delete(&nospace), 1);
Assert::IsTrue(p.match(text));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)4, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 4);
}
{
@@ -146,8 +146,8 @@ namespace UnitTests
make_shared_no_delete(&space) });
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)5, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 5);
}
{
@@ -160,18 +160,18 @@ namespace UnitTests
make_shared_no_delete(&space) });
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)2, p.hit_offset);
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)4, p.interval.end);
Assert::IsTrue(p.hit_offset == 2);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 4);
}
{
wstring_branch p(L"apple", L"orange", L"this", nullptr);
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)2, p.hit_offset);
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)4, p.interval.end);
Assert::IsTrue(p.hit_offset == 2);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 4);
}
{
@@ -183,8 +183,8 @@ namespace UnitTests
make_shared_no_delete(&chr_t) });
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)4, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 4);
}
{
@@ -300,44 +300,44 @@ namespace UnitTests
{
sgml_noop p;
Assert::IsTrue(p.match(text));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)0, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 0);
}
{
sgml_cp p("v");
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 0, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)1, p.interval.end);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 1);
}
{
sgml_cp p("&Zcaron;", SIZE_MAX, false, locale_slSI);
Assert::IsFalse(p.match(text, 4));
Assert::IsTrue(p.match(text, 4, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)4, p.interval.start);
Assert::AreEqual((size_t)12, p.interval.end);
Assert::IsTrue(p.interval.start == 4);
Assert::IsTrue(p.interval.end == 12);
}
{
sgml_space_cp p(false, locale_slSI);
Assert::IsFalse(p.match(text));
Assert::IsTrue(p.match(text, 1));
Assert::AreEqual((size_t)1, p.interval.start);
Assert::AreEqual((size_t)2, p.interval.end);
Assert::IsTrue(p.interval.start == 1);
Assert::IsTrue(p.interval.end == 2);
Assert::IsTrue(p.match(text, 79));
Assert::AreEqual((size_t)79, p.interval.start);
Assert::AreEqual((size_t)85, p.interval.end);
Assert::IsTrue(p.interval.start == 79);
Assert::IsTrue(p.interval.end == 85);
}
{
sgml_string_branch p(locale_slSI, "apple", "orange", "Ko&Zcaron;u&Scaron;&ccaron;Ku", nullptr);
Assert::IsFalse(p.match(text, 2));
Assert::IsTrue(p.match(text, 2, _countof(text), match_case_insensitive));
Assert::AreEqual((size_t)2, p.hit_offset);
Assert::AreEqual((size_t)2, p.interval.start);
Assert::AreEqual((size_t)31, p.interval.end);
Assert::IsTrue(p.hit_offset == 2);
Assert::IsTrue(p.interval.start == 2);
Assert::IsTrue(p.interval.end == 31);
}
{
@@ -432,15 +432,15 @@ namespace UnitTests
{
http_request p(locale);
Assert::IsTrue(p.match(request));
Assert::AreEqual((size_t)0, p.interval.start);
Assert::AreEqual((size_t)14, p.interval.end);
Assert::AreEqual((size_t)0, p.verb.start);
Assert::AreEqual((size_t)3, p.verb.end);
Assert::AreEqual((size_t)4, p.url.interval.start);
Assert::AreEqual((size_t)5, p.url.interval.end);
Assert::AreEqual((size_t)6, p.protocol.interval.start);
Assert::AreEqual((size_t)12, p.protocol.interval.end);
Assert::AreEqual((uint16_t)0x200, p.protocol.version);
Assert::IsTrue(p.interval.start == 0);
Assert::IsTrue(p.interval.end == 14);
Assert::IsTrue(p.verb.start == 0);
Assert::IsTrue(p.verb.end == 3);
Assert::IsTrue(p.url.interval.start == 4);
Assert::IsTrue(p.url.interval.end == 5);
Assert::IsTrue(p.protocol.interval.start == 6);
Assert::IsTrue(p.protocol.interval.end == 12);
Assert::IsTrue(p.protocol.version == 0x200);
}
{
@@ -455,7 +455,7 @@ namespace UnitTests
else
break;
}
Assert::AreEqual((size_t)15, hdrs.size());
Assert::IsTrue(hdrs.size() == 15);
http_weighted_collection<http_weighted_value<http_language>> langs;
for (const auto& h : hdrs)
if (strnicmp(request + h.name.start, h.name.size(), "Accept-Language", SIZE_MAX, locale) == 0)