loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improved error message for content substitution.

Browse Source 
Provide YAML and Boost details. Also test a few more
substitution-related behaviours.
This commit is contained in:
Oliver Hamlet
2015-07-21 19:04:20 +01:00
parent a788d0454b
commit 79fe2c685e
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata/message.h
+6 -1
View File
@@ -130,7 +130,12 @@ namespace YAML {
f = f % sub;
}
mc = loot::MessageContent(f.str(), mc.Language());
try {
mc = loot::MessageContent(f.str(), mc.Language());
}
catch (boost::io::format_error& e) {
throw RepresentationException(node.Mark(), std::string("bad conversion: content substitution error: ") + e.what());
}
}
}
src/tests/backend/metadata/test_message.h
+36 -3
View File
@@ -355,13 +355,14 @@ TEST_F(Message, YamlDecode) {
EXPECT_EQ(MessageContents({MessageContent("content1", Language::french)}), message.Content());
EXPECT_EQ("", message.Condition());
// Throw because no English string is given in a multilingual message.
node = YAML::Load("type: say\n"
"content:\n"
" - lang: de\n"
" str: content1\n"
" - lang: fr\n"
" str: content2");
EXPECT_ANY_THROW(message = node.as<loot::Message>());
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
node = YAML::Load("type: say\n"
"content: con%1%tent1\n"
@@ -372,11 +373,43 @@ TEST_F(Message, YamlDecode) {
EXPECT_EQ(MessageContents({MessageContent("consub1tent1", Language::english)}), message.Content());
EXPECT_EQ("", message.Condition());
// Check that subs apply to all languages of a multilingual message.
node = YAML::Load("type: say\n"
"content:\n"
" - lang: en\n"
" str: content1 %1%\n"
" - lang: de\n"
" str: content2 %1%\n"
"subs:\n"
" - sub");
message = node.as<loot::Message>();
EXPECT_EQ(loot::Message::say, message.Type());
EXPECT_EQ(MessageContents({
MessageContent("content1 sub", Language::english),
MessageContent("content2 sub", Language::german),
}), message.Content());
EXPECT_EQ("", message.Condition());
// Throw because there aren't the same number of subs as referred to in the content string.
node = YAML::Load("type: say\n"
"content: '%1% %2%'\n"
"subs:\n"
" - sub1");
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
// Don't throw because no subs are given, so none are expected in the content string.
node = YAML::Load("type: say\n"
"content: con%1%tent1\n");
message = node.as<loot::Message>();
EXPECT_EQ(loot::Message::say, message.Type());
EXPECT_EQ(MessageContents({MessageContent("con%1%tent1", Language::english)}), message.Content());
EXPECT_EQ("", message.Condition());
node = YAML::Load("scalar");
EXPECT_ANY_THROW(node.as<loot::Message>());
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
node = YAML::Load("[0, 1, 2]");
EXPECT_ANY_THROW(node.as<loot::Message>());
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
}
#endif