mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-04 20:49:42 +00:00
Code Issues Releases Wiki Activity

Do not compare hash in tests

Browse source 
Different std libraries have different implementation that produce different
results for the same values.
This commit is contained in:
elsid 2021-04-08 19:38:42 +02:00
parent a16387df61
commit 7f577f5f08
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw_test_suite/esm/variant.cpp
View file

@ -420,7 +420,6 @@ namespace
Variant mVariant; Variant mVariant;
Variant::Format mFormat; Variant::Format mFormat;
std::size_t mDataSize {}; std::size_t mDataSize {};
std::size_t mDataHash {};
}; };
std::string write(const Variant& variant, const Variant::Format format) std::string write(const Variant& variant, const Variant::Format format)
@ -442,11 +441,10 @@ namespace
return result; return result;
} }
Variant writeAndRead(const Variant& variant, const Variant::Format format, std::size_t dataSize, std::size_t dataHash) Variant writeAndRead(const Variant& variant, const Variant::Format format, std::size_t dataSize)
{ {
const std::string data = write(variant, format); const std::string data = write(variant, format);
EXPECT_EQ(data.size(), dataSize); EXPECT_EQ(data.size(), dataSize);
EXPECT_EQ(std::hash<std::string>{}(data), dataHash);
return read(format, data); return read(format, data);
} }
@ -455,20 +453,20 @@ namespace
TEST_P(ESMVariantToESMTest, deserialized_is_equal_to_serialized) TEST_P(ESMVariantToESMTest, deserialized_is_equal_to_serialized)
{ {
const auto param = GetParam(); const auto param = GetParam();
const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash); const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize);
ASSERT_EQ(param.mVariant, result); ASSERT_EQ(param.mVariant, result);
} }
INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest, Values( INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMTest, Values(
WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324, 10398667754238537314ul}, WriteToESMTestCase {Variant(), Variant::Format_Gmst, 324},
WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345, 2440845426097842853ul}, WriteToESMTestCase {Variant(int{42}), Variant::Format_Global, 345},
WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345, 8428720798053904009ul}, WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Global, 345},
WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336, 11930997575130354755ul}, WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Info, 336},
WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336, 11930997575130354755ul}, WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Local, 336},
WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345, 7812065815960720679ul}, WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Global, 345},
WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334, 5017869102981712080ul}, WriteToESMTestCase {makeVariant(VT_Short, 42), Variant::Format_Local, 334},
WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336, 12560431547347287906ul}, WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Info, 336},
WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336, 12560431547347287906ul} WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Local, 336}
)); ));
struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase> {}; struct ESMVariantToESMNoneTest : TestWithParam<WriteToESMTestCase> {};
@ -476,14 +474,14 @@ namespace
TEST_P(ESMVariantToESMNoneTest, deserialized_is_none) TEST_P(ESMVariantToESMNoneTest, deserialized_is_none)
{ {
const auto param = GetParam(); const auto param = GetParam();
const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize, param.mDataHash); const auto result = writeAndRead(param.mVariant, param.mFormat, param.mDataSize);
ASSERT_EQ(Variant(), result); ASSERT_EQ(Variant(), result);
} }
INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest, Values( INSTANTIATE_TEST_SUITE_P(VariantAndData, ESMVariantToESMNoneTest, Values(
WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336, 11930997575130354755ul}, WriteToESMTestCase {Variant(float{2.7f}), Variant::Format_Gmst, 336},
WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335, 7604528240659685057ul}, WriteToESMTestCase {Variant(std::string("foo")), Variant::Format_Gmst, 335},
WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336, 12560431547347287906ul} WriteToESMTestCase {makeVariant(VT_Int, 42), Variant::Format_Gmst, 336}
)); ));
struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase> {}; struct ESMVariantWriteToESMFailTest : TestWithParam<WriteToESMTestCase> {};