@@ -22,7 +22,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array)
22
22
auto chars = std::vector<char16_t >(std::begin (tmp), std::end (tmp));
23
23
auto count = encoding.get_byte_count (chars);
24
24
25
- EXPECT_EQ (8 , count);
25
+ EXPECT_EQ (static_cast <std:: size_t >( 8 ) , count);
26
26
}
27
27
28
28
TEST_F (utf8_encoding_test, get_byte_count_from_char_array_range)
@@ -32,7 +32,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array_range)
32
32
auto chars = std::vector<char16_t >(std::begin (tmp), std::end (tmp));
33
33
auto count = encoding.get_byte_count (chars, 2 , 3 );
34
34
35
- EXPECT_EQ (6 , count);
35
+ EXPECT_EQ (static_cast <std:: size_t >( 6 ) , count);
36
36
}
37
37
38
38
TEST_F (utf8_encoding_test, get_bytes_from_char_array)
@@ -42,7 +42,8 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array)
42
42
auto chars = std::vector<char16_t >(std::begin (tmp), std::end (tmp));
43
43
auto bytes = encoding.get_bytes (chars);
44
44
45
- EXPECT_EQ ( 8 , bytes.size ());
45
+ EXPECT_EQ (static_cast <std::size_t >(8 ), bytes.size ());
46
+
46
47
EXPECT_EQ (0x7A , bytes[0 ]);
47
48
EXPECT_EQ (0x61 , bytes[1 ]);
48
49
EXPECT_EQ (0xCC , bytes[2 ]);
@@ -63,8 +64,9 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array_range)
63
64
64
65
auto byte_count = encoding.get_bytes (chars, 2 , 3 , bytes, 0 );
65
66
66
- EXPECT_EQ ( 6 , byte_count);
67
- EXPECT_EQ ( 6 , bytes.size ());
67
+ EXPECT_EQ (static_cast <std::size_t >(6 ), byte_count);
68
+ EXPECT_EQ (static_cast <std::size_t >(6 ), bytes.size ());
69
+
68
70
EXPECT_EQ (0xCC , bytes[0 ]);
69
71
EXPECT_EQ (0x86 , bytes[1 ]);
70
72
EXPECT_EQ (0xC7 , bytes[2 ]);
@@ -79,7 +81,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_string)
79
81
auto s = u" za\u0306\u01FD\u03B2 " ;
80
82
auto count = encoding.get_byte_count (s);
81
83
82
- EXPECT_EQ (8 , count);
84
+ EXPECT_EQ (static_cast <std:: size_t >( 8 ) , count);
83
85
}
84
86
85
87
TEST_F (utf8_encoding_test, get_bytes_from_string)
@@ -88,7 +90,8 @@ TEST_F(utf8_encoding_test, get_bytes_from_string)
88
90
auto s = u" za\u0306\u01FD\u03B2 " ;
89
91
auto bytes = encoding.get_bytes (s);
90
92
91
- EXPECT_EQ ( 8 , bytes.size ());
93
+ EXPECT_EQ (static_cast <std::size_t >(8 ), bytes.size ());
94
+
92
95
EXPECT_EQ (0x7A , bytes[0 ]);
93
96
EXPECT_EQ (0x61 , bytes[1 ]);
94
97
EXPECT_EQ (0xCC , bytes[2 ]);
@@ -108,8 +111,9 @@ TEST_F(utf8_encoding_test, get_bytes_from_string_range)
108
111
auto bytes = std::vector<std::uint8_t >(bcount, 0 );
109
112
auto byte_count = encoding.get_bytes (s, 2 , 3 , bytes, 0 );
110
113
111
- EXPECT_EQ ( 6 , bytes.size ());
112
- EXPECT_EQ ( 6 , byte_count);
114
+ EXPECT_EQ (static_cast <std::size_t >(6 ), bytes.size ());
115
+ EXPECT_EQ (static_cast <std::size_t >(6 ), byte_count);
116
+
113
117
EXPECT_EQ (0xCC , bytes[0 ]);
114
118
EXPECT_EQ (0x86 , bytes[1 ]);
115
119
EXPECT_EQ (0xC7 , bytes[2 ]);
@@ -124,7 +128,7 @@ TEST_F(utf8_encoding_test, get_byte_count_from_char_array_pointer)
124
128
char16_t chars[] = { u' z' , u' a' , u' \u0306 ' , u' \u01FD ' , u' \u03B2 ' };
125
129
auto count = encoding.get_byte_count (&chars[0 ], 5 );
126
130
127
- EXPECT_EQ (8 , count);
131
+ EXPECT_EQ (static_cast <std:: size_t >( 8 ) , count);
128
132
}
129
133
130
134
TEST_F (utf8_encoding_test, get_bytes_from_char_array_pointer)
@@ -135,9 +139,10 @@ TEST_F(utf8_encoding_test, get_bytes_from_char_array_pointer)
135
139
auto bytes = std::vector<std::uint8_t >(bcount, 0 );
136
140
auto byte_count = encoding.get_bytes (&chars[0 ], 5 , bytes.data (), bcount);
137
141
138
- EXPECT_EQ ( 8 , bcount);
139
- EXPECT_EQ ( 8 , byte_count);
140
- EXPECT_EQ ( 8 , bytes.size ());
142
+ EXPECT_EQ (static_cast <std::size_t >(8 ), bcount);
143
+ EXPECT_EQ (static_cast <std::size_t >(8 ), byte_count);
144
+ EXPECT_EQ (static_cast <std::size_t >(8 ), bytes.size ());
145
+
141
146
EXPECT_EQ (0x7A , bytes[0 ]);
142
147
EXPECT_EQ (0x61 , bytes[1 ]);
143
148
EXPECT_EQ (0xCC , bytes[2 ]);
@@ -155,8 +160,8 @@ TEST_F(utf8_encoding_test, get_char_count_from_byte_array)
155
160
auto bytes = encoding.get_bytes (s);
156
161
auto count = encoding.get_char_count (bytes);
157
162
158
- EXPECT_EQ (5 , count);
159
- EXPECT_EQ (s.size (), count);
163
+ EXPECT_EQ (static_cast <std:: size_t >( 5 ) , count);
164
+ EXPECT_EQ (s.size () , count);
160
165
}
161
166
162
167
TEST_F (utf8_encoding_test, get_char_count_from_byte_array_pointer)
@@ -166,8 +171,8 @@ TEST_F(utf8_encoding_test, get_char_count_from_byte_array_pointer)
166
171
auto bytes = encoding.get_bytes (s);
167
172
auto count = encoding.get_char_count (&bytes[0 ], bytes.size ());
168
173
169
- EXPECT_EQ (5 , count);
170
- EXPECT_EQ (s.size (), count);
174
+ EXPECT_EQ (static_cast <std:: size_t >( 5 ) , count);
175
+ EXPECT_EQ (s.size () , count);
171
176
}
172
177
173
178
// ---------------------------------------------------------------------------------------------------
@@ -184,7 +189,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_non_null_char)
184
189
185
190
auto byte_count = utf8.get_byte_count (chars, 1 , 2 );
186
191
187
- EXPECT_EQ (3 , byte_count);
192
+ EXPECT_EQ (static_cast <std:: size_t >( 3 ) , byte_count);
188
193
}
189
194
190
195
// PosTest2: Verify method get_byte_count(std::vector<char16_t>,Int32,Int32) with null std::vector<char16_t>
@@ -195,7 +200,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_null_char)
195
200
196
201
auto byte_count = utf8.get_byte_count (chars, 0 , 0 );
197
202
198
- EXPECT_EQ (0 , byte_count);
203
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ) , byte_count);
199
204
}
200
205
201
206
// NegTest1: ArgumentNullException is not thrown when chars is a null reference
@@ -253,7 +258,7 @@ TEST_F(utf8_encoding_test, get_byte_count_with_empty_string)
253
258
254
259
auto byte_count = utf8.get_byte_count (chars);
255
260
256
- EXPECT_EQ (0 , byte_count);
261
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ) , byte_count);
257
262
}
258
263
259
264
// ---------------------------------------------------------------------------------------------------
@@ -273,11 +278,12 @@ TEST_F(utf8_encoding_test, get_bytes_withnon_null_chars)
273
278
274
279
bytes.resize (byte_count, 0 );
275
280
276
- EXPECT_EQ (3 , byte_count);
281
+ EXPECT_EQ (static_cast <std:: size_t >( 3 ) , byte_count);
277
282
278
283
auto bytes_encoded_count = utf8.get_bytes (chars, 1 , 2 , bytes, 0 );
279
284
280
- EXPECT_EQ ( 3 , bytes_encoded_count);
285
+ EXPECT_EQ (static_cast <std::size_t >(3 ), bytes_encoded_count);
286
+
281
287
EXPECT_EQ ( 37 , bytes[0 ]);
282
288
EXPECT_EQ (206 , bytes[1 ]);
283
289
EXPECT_EQ (160 , bytes[2 ]);
@@ -296,7 +302,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_null_chars)
296
302
297
303
auto bytes_encoded_count = utf8.get_bytes (chars, 0 , 0 , bytes, 0 );
298
304
299
- EXPECT_EQ (0 , bytes_encoded_count);
305
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ) , bytes_encoded_count);
300
306
}
301
307
302
308
// NegTest1: ArgumentNullException is not thrown when chars is a null reference
@@ -364,7 +370,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_non_null_string)
364
370
365
371
auto bytes_encoded_count = utf8.get_bytes (chars, 1 , 2 , bytes, 0 );
366
372
367
- EXPECT_EQ (2 , bytes_encoded_count);
373
+ EXPECT_EQ (static_cast <std:: size_t >( 2 ) , bytes_encoded_count);
368
374
}
369
375
370
376
// PosTest2: Verify method GetBytes(String,Int32,Int32,Byte[],Int32) with null chars
@@ -380,7 +386,7 @@ TEST_F(utf8_encoding_test, get_bytes_with_empty_string)
380
386
381
387
auto bytes_encoded_count = utf8.get_bytes (chars, 0 , byte_count, bytes, 0 );
382
388
383
- EXPECT_EQ (0 , bytes_encoded_count);
389
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ) , bytes_encoded_count);
384
390
}
385
391
386
392
// NegTest3: ArgumentOutOfRangeException is not thrown when charIndex is less than zero
@@ -513,7 +519,7 @@ TEST_F(utf8_encoding_test, get_char_count_with_non_null_buffer)
513
519
514
520
auto char_count = utf8.get_char_count (bytes, 2 , 8 );
515
521
516
- ASSERT_TRUE ( 8 == char_count);
522
+ EXPECT_EQ ( static_cast <std:: size_t >( 8 ), char_count);
517
523
}
518
524
519
525
// PosTest2: Verify method get_char_count with a empty buffer
@@ -522,9 +528,9 @@ TEST_F(utf8_encoding_test, get_char_count_with_empty_buffer)
522
528
utf8_encoding utf8;
523
529
std::vector<std::uint8_t > bytes = { };
524
530
525
- int char_count = utf8.get_char_count (bytes, 0 , 0 );
531
+ auto char_count = utf8.get_char_count (bytes, 0 , 0 );
526
532
527
- EXPECT_EQ (0 , char_count);
533
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ) , char_count);
528
534
}
529
535
530
536
// NegTest2: ArgumentOutOfRangeException is not thrown when index is less than zero
@@ -573,15 +579,16 @@ TEST_F(utf8_encoding_test, get_chars_with_non_null_chars)
573
579
std::vector<std::uint8_t > bytes = { 35 , 37 , 206 , 160 , 206 , 163 };
574
580
std::vector<char16_t > chars;
575
581
576
- int char_count = utf8.get_char_count (bytes, 2 , 2 );
582
+ auto char_count = utf8.get_char_count (bytes, 2 , 2 );
577
583
578
- EXPECT_TRUE ( 1 == char_count);
584
+ EXPECT_EQ ( static_cast <std:: size_t >( 1 ), char_count);
579
585
580
586
chars.resize (char_count);
581
587
582
- int charsEncodedCount = utf8.get_chars (bytes, 2 , 2 , chars, 0 );
588
+ auto chars_encoded_count = utf8.get_chars (bytes, 2 , 2 , chars, 0 );
589
+
590
+ EXPECT_EQ (static_cast <std::size_t >(1 ), chars_encoded_count);
583
591
584
- EXPECT_EQ (1 , charsEncodedCount);
585
592
EXPECT_EQ (u' \u03a0 ' , chars[0 ]);
586
593
}
587
594
@@ -592,13 +599,13 @@ TEST_F(utf8_encoding_test, get_chars_with_empty_chars)
592
599
std::vector<std::uint8_t > bytes = { 35 , 37 , 206 , 160 , 206 , 163 };
593
600
std::vector<char16_t > chars;
594
601
595
- int char_count = utf8.get_char_count (bytes, 2 , 2 );
602
+ auto char_count = utf8.get_char_count (bytes, 2 , 2 );
596
603
597
- EXPECT_EQ (1 , char_count);
604
+ EXPECT_EQ (static_cast <std:: size_t >( 1 ) , char_count);
598
605
599
- int charsEncodedCount = utf8.get_chars (bytes, 0 , 0 , chars, 0 );
606
+ auto chars_encoded_count = utf8.get_chars (bytes, 0 , 0 , chars, 0 );
600
607
601
- EXPECT_EQ (0 , charsEncodedCount );
608
+ EXPECT_EQ (static_cast <std:: size_t >( 0 ), chars_encoded_count );
602
609
}
603
610
604
611
// NegTest3: ArgumentOutOfRangeException is not thrown when byteIndex is less than zero
@@ -609,7 +616,7 @@ TEST_F(utf8_encoding_test, get_chars_when_byte_index_is_less_than_zero)
609
616
std::vector<char16_t > chars;
610
617
auto char_count = utf8.get_char_count (bytes, 2 , 2 );
611
618
612
- EXPECT_EQ (1 , char_count);
619
+ EXPECT_EQ (static_cast <std:: size_t >( 1 ) , char_count);
613
620
EXPECT_ANY_THROW ({ utf8.get_chars (bytes, -1 , 2 , chars, 0 ); });
614
621
}
615
622
@@ -621,7 +628,8 @@ TEST_F(utf8_encoding_test, get_chars_when_byte_count_is_less_than_zero)
621
628
std::vector<char16_t > chars;
622
629
auto char_count = utf8.get_char_count (bytes, 2 , 2 );
623
630
624
- EXPECT_EQ (1 , char_count);
631
+ EXPECT_EQ (static_cast <std::size_t >(1 ), char_count);
632
+
625
633
EXPECT_ANY_THROW ({ utf8.get_chars (bytes, 1 , -2 , chars, 0 ); });
626
634
}
627
635
@@ -633,7 +641,7 @@ TEST_F(utf8_encoding_test, get_chars_when_char_index_is_less_than_zero)
633
641
std::vector<char16_t > chars;
634
642
auto char_count = utf8.get_char_count (bytes, 2 , 2 );
635
643
636
- EXPECT_EQ (1 , char_count);
644
+ EXPECT_EQ (static_cast <std:: size_t >( 1 ) , char_count);
637
645
EXPECT_ANY_THROW ({ utf8.get_chars (bytes, 2 , 2 , chars, -1 ); });
638
646
}
639
647
@@ -645,7 +653,7 @@ TEST_F(utf8_encoding_test, get_chars_with_invalid_range_in_chars)
645
653
std::vector<char16_t > chars;
646
654
auto char_count = utf8.get_char_count (bytes, 2 , 2 );
647
655
648
- EXPECT_EQ (1 , char_count);
656
+ EXPECT_EQ (static_cast <std:: size_t >( 1 ) , char_count);
649
657
EXPECT_ANY_THROW ({ utf8.get_chars (bytes, 2 , 2 , chars, 1 ); });
650
658
}
651
659
@@ -658,7 +666,7 @@ TEST_F(utf8_encoding_test, get_chars_with_not_enough_space_in_chars)
658
666
std::vector<char16_t > chars;
659
667
auto char_count = utf8.get_char_count (bytes, 2 , 2 );
660
668
661
- EXPECT_EQ (1 , char_count);
669
+ EXPECT_EQ (static_cast <std:: size_t >( 1 ) , char_count);
662
670
EXPECT_ANY_THROW ({ utf8.get_chars (bytes, 2 , 2 , chars, chars.size ()); });
663
671
}
664
672
0 commit comments