From 8f22a0a486142ca5d8b2a171db70f2d466cf15f9 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 4 Jul 2020 05:46:01 -0400 Subject: [PATCH] NegativePowersOfTen unit test: fix for ASCII --- tests/metric.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/metric.cpp b/tests/metric.cpp index 7ca20f421..0e218e788 100644 --- a/tests/metric.cpp +++ b/tests/metric.cpp @@ -106,7 +106,6 @@ TEST_CASE("Metric") { } const char suffixes[] = "\0KMGTPE"; - const wchar_t smallsuffixes[] = L"yzafpnµm"; SUBCASE("PowersOfTen") { char gold[PREFIXSTRLEN + 1]; @@ -420,6 +419,12 @@ TEST_CASE("Metric") { } SUBCASE("NegativePowersOfTen") { + const wchar_t* smallsuffixes; + if(enforce_utf8()){ + smallsuffixes = L"yzafpnµm"; + }else{ + smallsuffixes = L"yzafpnum"; + } char gold[PREFIXSTRLEN + 1]; char buf[PREFIXSTRLEN + 1]; uintmax_t goldval = 1; @@ -439,7 +444,7 @@ TEST_CASE("Metric") { } }while(++i < (wcslen(smallsuffixes) - 3) * 3); // If we ran through all our suffixes, that's a problem - CHECK(sizeof(smallsuffixes) / sizeof(*smallsuffixes) * 3 > i); + CHECK(wcslen(smallsuffixes) * 3 > i); } }