0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unit tests: Fix a few MSVC warnings

Browse source
This commit is contained in:
Celtic Minstrel 2017-04-28 18:15:10 -04:00
parent f142ed6170
commit 74df91877f
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tests/gui/test_gui2.cpp
View file

@ -339,13 +339,13 @@ void test()
{
gui2::new_widgets = false;
for(size_t i = 0; i < 2; ++i) {
// for(size_t i = 0; i < 2; ++i) {
test_resolutions<T>(get_gui_resolutions());
break; // FIXME: New widgets break
gui2::new_widgets = true;
}
// break; // FIXME: New widgets break
// gui2::new_widgets = true;
// }
}
template<class T>

11
src/tests/test_serialization.cpp
View file

@ -65,9 +65,20 @@ BOOST_AUTO_TEST_CASE( utils_unicode_test )
utf16::string water_u16 = unicode_cast<utf16::string>(water_u4);
BOOST_CHECK_EQUAL(water_u4[0], water_u16[0]);
#if defined(_WIN32) || defined(_WIN64)
// Windows complains it can't be represented in the currentl code-page.
// So instead, check directly for its UTF-8 representation.
BOOST_CHECK_EQUAL(water_u8, "\xE6\xB0\xB4");
#else
BOOST_CHECK_EQUAL(water_u8, "\u6C34");
#endif
#if defined(_WIN32) || defined(_WIN64)
// Same as above.
utf8::string nonbmp_u8("\xF0\x90\x80\x80");
#else
utf8::string nonbmp_u8("\U00010000");
#endif
ucs4::string nonbmp_u4 = unicode_cast<ucs4::string>(nonbmp_u8);
utf16::string nonbmp_u16 = unicode_cast<utf16::string>(nonbmp_u4);