Add condition field to SimpleMessage

The LOOT application uses a SimpleMessage with a condition just as often as without it, so this simplifies that usage.
This commit is contained in:
Oliver Hamlet
2017-10-29 14:39:45 +00:00
parent 7b589262eb
commit 5d69f01bf7
3 changed files with 6 additions and 1 deletions
+3
View File
@@ -40,6 +40,9 @@ struct SimpleMessage {
* [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown).
*/
std::string text;
/** @brief The message's condition string. */
std::string condition;
};
}
+1
View File
@@ -80,6 +80,7 @@ SimpleMessage Message::ToSimpleMessage(const std::string& language) const {
simpleMessage.type = GetType();
simpleMessage.language = content.GetLanguage();
simpleMessage.text = content.GetText();
simpleMessage.condition = GetCondition();
return simpleMessage;
}
@@ -143,13 +143,14 @@ TEST_P(MessageTest, toSimpleMessageShouldSelectTextAndLanguageUsingGetContent) {
MessageContent("content1", german),
MessageContent("content2"),
MessageContent("content3", french),
}));
}), "condition1");
SimpleMessage simpleMessage = message.ToSimpleMessage(french);
EXPECT_EQ(MessageType::warn, simpleMessage.type);
EXPECT_EQ("content3", simpleMessage.text);
EXPECT_EQ(french, simpleMessage.language);
EXPECT_EQ("condition1", simpleMessage.condition);
}
TEST_P(MessageTest, emittingAsYamlShouldOutputNoteMessageTypeCorrectly) {