mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Update gtest to latest snapshot (#7950)

Browse Source 
This fixes issues when building with MSVC 15.8.
This commit is contained in:
Ted John
2018-08-30 09:10:36 +01:00
committed by Michał Janiszewski
parent 0ba47eed2a
commit 7faa4e06e0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/tests/LanguagePackTest.cpp
View File

@@ -24,7 +24,7 @@ TEST_F(LanguagePackTest, create_empty)
{
ILanguagePack* empty = LanguagePackFactory::FromText(0, "");
ASSERT_EQ(empty->GetId(), 0);
ASSERT_EQ(empty->GetCount(), 0);
ASSERT_EQ(empty->GetCount(), 0U);
delete empty;
}
@@ -32,10 +32,10 @@ TEST_F(LanguagePackTest, create_mutable_id_1)
{
ILanguagePack* lang = LanguagePackFactory::FromText(1, "STR_0000:\n");
ASSERT_EQ(lang->GetId(), 1);
ASSERT_EQ(lang->GetCount(), 1);
ASSERT_EQ(lang->GetCount(), 1U);
ASSERT_STREQ(lang->GetString(0), nullptr);
lang->SetString(0, "xx");
ASSERT_EQ(lang->GetCount(), 1);
ASSERT_EQ(lang->GetCount(), 1U);
ASSERT_STREQ(lang->GetString(0), "xx");
delete lang;
}
@@ -44,7 +44,7 @@ TEST_F(LanguagePackTest, language_pack_simple)
{
ILanguagePack* lang = LanguagePackFactory::FromText(0, LanguageEnGB);
ASSERT_EQ(lang->GetId(), 0);
ASSERT_EQ(lang->GetCount(), 4);
ASSERT_EQ(lang->GetCount(), 4U);
ASSERT_STREQ(lang->GetString(2), "Spiral Roller Coaster");
ASSERT_EQ(lang->GetScenarioOverrideStringId("Arid Heights", 0), 0x7000);
ASSERT_STREQ(lang->GetString(0x7000), "Arid Heights scenario string");
@@ -61,7 +61,7 @@ TEST_F(LanguagePackTest, language_pack_multibyte)
{
ILanguagePack* lang = LanguagePackFactory::FromText(0, (const utf8*)LanguageZhTW);
ASSERT_EQ(lang->GetId(), 0);
ASSERT_EQ(lang->GetCount(), 4);
ASSERT_EQ(lang->GetCount(), 4U);
ASSERT_STREQ(lang->GetString(2), u8"懸吊式雲霄飛車");
ASSERT_EQ(lang->GetScenarioOverrideStringId("Forest Frontiers", 0), 0x7000);
ASSERT_EQ(lang->GetScenarioOverrideStringId("Forest Frontiers", 2), 0x7002);