organicmaps/utfcpp
13
Fork 0
mirror of https://github.com/nemtrif/utfcpp.git synced 2025-04-03 20:45:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix -Wconversion warnings in tests when -funsigned-char option is used.

Browse source 
This change affects only tests.
This commit is contained in:
nemtrif 2022-12-24 14:45:04 -05:00
parent 780bd57d63
commit d736c29d38
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extern/ftest vendored

@ -1 +1 @@
Subproject commit bf75576064fce2e07f52cd63a3e410f12358728b
Subproject commit c4ad4af0946b73ce1a40cbc72205d15d196c7e06

12
tests/test_checked_api.cpp
View file

@ -44,7 +44,7 @@ TEST(CheckedAPITests, test_next)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars;
int cp = next(w, twochars + 6);
unsigned int cp = next(w, twochars + 6);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars + 3);
@ -67,7 +67,7 @@ TEST(CheckedAPITests, test_next)
TEST(CheckedAPITests, test_peek_next)
{
const char* const cw = "\xe6\x97\xa5\xd1\x88";
int cp = peek_next(cw, cw + 6);
unsigned int cp = peek_next(cw, cw + 6);
EXPECT_EQ (cp, 0x65e5);
}
@ -75,7 +75,7 @@ TEST(CheckedAPITests, test_prior)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars + 3;
int cp = prior (w, twochars);
unsigned int cp = prior (w, twochars);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars);
@ -111,13 +111,13 @@ TEST(CheckedAPITests, test_advance)
TEST(CheckedAPITests, test_distance)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
size_t dist = utf8::distance(twochars, twochars + 5);
size_t dist = static_cast<size_t>(utf8::distance(twochars, twochars + 5));
EXPECT_EQ (dist, 2);
}
TEST(CheckedAPITests, test_utf32to8)
{
int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
string utf8result;
utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 9);
@ -126,7 +126,7 @@ TEST(CheckedAPITests, test_utf32to8)
TEST(CheckedAPITests, test_utf8to32)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
vector<int> utf32result;
vector<unsigned int> utf32result;
utf8to32(twochars, twochars + 5, back_inserter(utf32result));
EXPECT_EQ (utf32result.size(), 2);
}

12
tests/test_unchecked_api.cpp
View file

@ -42,7 +42,7 @@ TEST(UnCheckedAPITests, test_next)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars;
int cp = utf8::unchecked::next(w);
unsigned int cp = utf8::unchecked::next(w);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars + 3);
@ -65,7 +65,7 @@ TEST(UnCheckedAPITests, test_next)
TEST(UnCheckedAPITests, test_peek_next)
{
const char* const cw = "\xe6\x97\xa5\xd1\x88";
int cp = peek_next(cw);
unsigned int cp = peek_next(cw);
EXPECT_EQ (cp, 0x65e5);
}
@ -73,7 +73,7 @@ TEST(UnCheckedAPITests, test_prior)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars + 3;
int cp = prior (w);
unsigned int cp = prior (w);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars);
@ -109,13 +109,13 @@ TEST(UnCheckedAPITests, test_advance)
TEST(UnCheckedAPITests, test_distance)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
size_t dist = utf8::unchecked::distance(twochars, twochars + 5);
size_t dist = static_cast<size_t>(utf8::unchecked::distance(twochars, twochars + 5));
EXPECT_EQ (dist, 2);
}
TEST(UnCheckedAPITests, test_utf32to8)
{
int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
string utf8result;
utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 9);
@ -124,7 +124,7 @@ TEST(UnCheckedAPITests, test_utf32to8)
TEST(UnCheckedAPITests, test_utf8to32)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
vector<int> utf32result;
vector<unsigned int> utf32result;
utf8to32(twochars, twochars + 5, back_inserter(utf32result));
EXPECT_EQ (utf32result.size(), 2);
}