Skip to content

Commit 0979de3

Browse files
committed
Adding necessary cast to string utils tests for Android x86.
1 parent 6a3cf28 commit 0979de3

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

Release/tests/functional/utils/strings.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ TEST(utf16_to_utf8)
7575
input.push_back(0x7FF);
7676
result = utility::conversions::utf16_to_utf8(input);
7777
#if defined(__GLIBCXX__)
78-
VERIFY_ARE_EQUAL(194u, result[0]);
79-
VERIFY_ARE_EQUAL(128u, result[1]);
80-
VERIFY_ARE_EQUAL(197u, result[2]);
81-
VERIFY_ARE_EQUAL(141u, result[3]);
82-
VERIFY_ARE_EQUAL(223u, result[4]);
83-
VERIFY_ARE_EQUAL(191u, result[5]);
78+
VERIFY_ARE_EQUAL(194u, static_cast<unsigned char>(result[0]));
79+
VERIFY_ARE_EQUAL(128u, static_cast<unsigned char>(result[1]));
80+
VERIFY_ARE_EQUAL(197u, static_cast<unsigned char>(result[2]));
81+
VERIFY_ARE_EQUAL(141u, static_cast<unsigned char>(result[3]));
82+
VERIFY_ARE_EQUAL(223u, static_cast<unsigned char>(result[4]));
83+
VERIFY_ARE_EQUAL(191u, static_cast<unsigned char>(result[5]));
8484
#else
8585
VERIFY_ARE_EQUAL(conversion.to_bytes(input), result);
8686
#endif
@@ -92,15 +92,15 @@ TEST(utf16_to_utf8)
9292
input.push_back(0xFFFF);
9393
result = utility::conversions::utf16_to_utf8(input);
9494
#if defined(__GLIBCXX__)
95-
VERIFY_ARE_EQUAL(224u, result[0]);
96-
VERIFY_ARE_EQUAL(160u, result[1]);
97-
VERIFY_ARE_EQUAL(128u, result[2]);
98-
VERIFY_ARE_EQUAL(225u, result[3]);
99-
VERIFY_ARE_EQUAL(146u, result[4]);
100-
VERIFY_ARE_EQUAL(171u, result[5]);
101-
VERIFY_ARE_EQUAL(239u, result[6]);
102-
VERIFY_ARE_EQUAL(191u, result[7]);
103-
VERIFY_ARE_EQUAL(191u, result[8]);
95+
VERIFY_ARE_EQUAL(224u, static_cast<unsigned char>(result[0]));
96+
VERIFY_ARE_EQUAL(160u, static_cast<unsigned char>(result[1]));
97+
VERIFY_ARE_EQUAL(128u, static_cast<unsigned char>(result[2]));
98+
VERIFY_ARE_EQUAL(225u, static_cast<unsigned char>(result[3]));
99+
VERIFY_ARE_EQUAL(146u, static_cast<unsigned char>(result[4]));
100+
VERIFY_ARE_EQUAL(171u, static_cast<unsigned char>(result[5]));
101+
VERIFY_ARE_EQUAL(239u, static_cast<unsigned char>(result[6]));
102+
VERIFY_ARE_EQUAL(191u, static_cast<unsigned char>(result[7]));
103+
VERIFY_ARE_EQUAL(191u, static_cast<unsigned char>(result[8]));
104104
#else
105105
VERIFY_ARE_EQUAL(conversion.to_bytes(input), result);
106106
#endif
@@ -118,18 +118,18 @@ TEST(utf16_to_utf8)
118118
input.push_back(0xDFFF);
119119
result = utility::conversions::utf16_to_utf8(input);
120120
#if defined(__GLIBCXX__)
121-
VERIFY_ARE_EQUAL(240u, result[0]);
122-
VERIFY_ARE_EQUAL(144u, result[1]);
123-
VERIFY_ARE_EQUAL(128u, result[2]);
124-
VERIFY_ARE_EQUAL(128u, result[3]);
125-
VERIFY_ARE_EQUAL(240u, result[4]);
126-
VERIFY_ARE_EQUAL(144u, result[5]);
127-
VERIFY_ARE_EQUAL(164u, result[6]);
128-
VERIFY_ARE_EQUAL(169u, result[7]);
129-
VERIFY_ARE_EQUAL(242u, result[8]);
130-
VERIFY_ARE_EQUAL(159u, result[9]);
131-
VERIFY_ARE_EQUAL(191u, result[10]);
132-
VERIFY_ARE_EQUAL(191u, result[11]);
121+
VERIFY_ARE_EQUAL(240u, static_cast<unsigned char>(result[0]));
122+
VERIFY_ARE_EQUAL(144u, static_cast<unsigned char>(result[1]));
123+
VERIFY_ARE_EQUAL(128u, static_cast<unsigned char>(result[2]));
124+
VERIFY_ARE_EQUAL(128u, static_cast<unsigned char>(result[3]));
125+
VERIFY_ARE_EQUAL(240u, static_cast<unsigned char>(result[4]));
126+
VERIFY_ARE_EQUAL(144u, static_cast<unsigned char>(result[5]));
127+
VERIFY_ARE_EQUAL(164u, static_cast<unsigned char>(result[6]));
128+
VERIFY_ARE_EQUAL(169u, static_cast<unsigned char>(result[7]));
129+
VERIFY_ARE_EQUAL(242u, static_cast<unsigned char>(result[8]));
130+
VERIFY_ARE_EQUAL(159u, static_cast<unsigned char>(result[9]));
131+
VERIFY_ARE_EQUAL(191u, static_cast<unsigned char>(result[10]));
132+
VERIFY_ARE_EQUAL(191u, static_cast<unsigned char>(result[11]));
133133
#else
134134
VERIFY_ARE_EQUAL(conversion.to_bytes(input), result);
135135
#endif

0 commit comments

Comments
 (0)