mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update gtest to latest snapshot (#7950) 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openrct2.proj
View File

@ -69,9 +69,9 @@
<LibsSha1 Condition="'$(Platform)'=='Win32'">5266545ca3034f9718729c7841d0352ed866db39</LibsSha1>
<LibsUrl Condition="'$(Platform)'=='x64'">https://github.com/OpenRCT2/Dependencies/releases/download/v18/openrct2-libs-v18-x64-windows-static-winssl.zip</LibsUrl>
<LibsSha1 Condition="'$(Platform)'=='x64'">4a122221e000b26067c8a4d06d2f053f27fe3f39</LibsSha1>
<GtestVersion>1.8.0</GtestVersion>
<GtestUrl>https://github.com/google/googletest/archive/release-1.8.0.zip</GtestUrl>
<GtestSha1>667f873ab7a4d246062565fad32fb6d8e203ee73</GtestSha1>
<GtestVersion>58f3f1005cffce8a9d005d0361d3471cd9947501</GtestVersion>
<GtestUrl>https://github.com/google/googletest/archive/58f3f1005cffce8a9d005d0361d3471cd9947501.zip</GtestUrl>
<GtestSha1>06eaed284e3b709db06c9205ca4d8def8330123f</GtestSha1>
<TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip</TitleSequencesUrl>
<TitleSequencesSha1>1136ef92bfb05cd1cba9831ba6dc4a653d87a246</TitleSequencesSha1>
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.0.6/objects.zip</ObjectsUrl>
@ -137,7 +137,7 @@
CheckFile="$(DependenciesCheckFile)"
OutputDirectory="$(RootDir)lib" />
<PropertyGroup>
<GtestSrc>$(RootDir)lib\googletest-release-$(GtestVersion)</GtestSrc>
<GtestSrc>$(RootDir)lib\googletest-$(GtestVersion)</GtestSrc>
<GtestDst>$(RootDir)lib\googletest</GtestDst>
</PropertyGroup>
<Exec Command="cmd /c &quot;if exist &quot;$(GtestSrc)&quot; ( rmdir /S /Q &quot;$(GtestDst)&quot; 2> nul &amp; move &quot;$(GtestSrc)&quot; &quot;$(GtestDst)&quot; )&quot;" />

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);