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

Merge branch 'better-condition-regex-parsing' into dev

Browse Source
This commit is contained in:
Oliver Hamlet
2015-07-23 12:12:45 +01:00
parent 3b07cefced ff2b62fab2
commit 62ae615328
16 changed files with 213 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/masterlist.cpp
-10
View File
@@ -368,16 +368,6 @@ namespace loot {
try {
this->Load(path);
for (auto &plugin : plugins) {
plugin.ParseAllConditions();
}
for (auto &plugin : regexPlugins) {
plugin.ParseAllConditions();
}
for (auto &message : messages) {
message.ParseCondition();
}
parsingFailed = false;
}
catch (std::exception& e) {
src/backend/metadata/condition_grammar.h
+47 -45
View File
@@ -64,10 +64,8 @@ namespace loot {
template<typename Iterator, typename Skipper>
class ConditionGrammar : public qi::grammar < Iterator, bool(), Skipper > {
public:
ConditionGrammar(Game * game, bool parseOnly) : ConditionGrammar::base_type(expression, "condition grammar"), _game(game), _parseOnly(parseOnly) {
if (!_parseOnly && _game == nullptr)
throw error(error::invalid_args, "A valid game pointer was not passed during a condition evaluation.");
ConditionGrammar() : ConditionGrammar(nullptr) {}
ConditionGrammar(Game * game) : ConditionGrammar::base_type(expression, "condition grammar"), _game(game) {
expression =
qi::eps >
compound[qi::labels::_val = qi::labels::_1]
@@ -142,13 +140,9 @@ namespace loot {
qi::rule<Iterator, char()> invalidPathChars;
Game * _game;
bool _parseOnly;
//Eval's exact paths. Check for files and ghosted plugins.
void CheckFile(bool& result, const std::string& file) const {
if (_parseOnly)
return;
BOOST_LOG_TRIVIAL(trace) << "Checking to see if the file \"" << file << "\" exists.";
if (file == "LOOT") {
@@ -161,6 +155,9 @@ namespace loot {
throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid file path:").str() + " " + file);
}
if (_game == nullptr)
return;
if (boost::iends_with(file, ".esp") || boost::iends_with(file, ".esm"))
result = boost::filesystem::exists(_game->DataPath() / file) || boost::filesystem::exists(_game->DataPath() / (file + ".ghost"));
else
@@ -184,27 +181,27 @@ namespace loot {
In C++ string literals, the backslash must be escaped once more to give "\\\\".
Split the regex with another regex! */
std::regex sepReg("/|(\\\\\\\\)", std::regex::ECMAScript | std::regex::icase);
std::vector<std::string> components;
std::sregex_token_iterator it(regex.begin(), regex.end(), sepReg, -1);
std::sregex_token_iterator itend;
for (; it != itend; ++it) {
components.push_back(*it);
try {
std::regex(regex, std::regex::ECMAScript | std::regex::icase);
}
catch (std::regex_error& e) {
throw loot::error(loot::error::invalid_args, (boost::format(boost::locale::translate("Invalid regex string \"%1%\": %2%")) % regex % e.what()).str());
}
std::regex sepReg("/|(\\\\\\\\)", std::regex::ECMAScript);
std::sregex_token_iterator it(regex.begin(), regex.end(), sepReg, -1);
std::vector<std::string> components(it, std::sregex_token_iterator());
std::string filename = components.back();
components.pop_back();
boost::filesystem::path parent;
for (std::vector<std::string>::const_iterator it = components.begin(), endIt = components.end()--; it != endIt; ++it) {
if (*it == ".")
continue;
parent += *it;
for (const auto& component : components) {
parent /= component;
}
if (!IsSafePath(parent.string())) {
if (!IsSafePath(parent)) {
BOOST_LOG_TRIVIAL(error) << "Invalid folder path: " << parent;
throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid folder path:").str() + " " + parent.string());
}
@@ -213,23 +210,24 @@ namespace loot {
try {
reg = std::regex(filename, std::regex::ECMAScript | std::regex::icase);
}
catch (std::exception& /*e*/) {
catch (std::regex_error& e) {
BOOST_LOG_TRIVIAL(error) << "Invalid regex string:" << filename;
throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid regex string:").str() + " " + filename);
throw loot::error(loot::error::invalid_args, (boost::format(boost::locale::translate("Invalid regex string \"%1%\": %2%")) % filename % e.what()).str());
}
return std::pair<boost::filesystem::path, std::regex>(parent, reg);
}
void CheckRegex(bool& result, const std::string& regexStr) const {
if (_parseOnly)
return;
result = false;
BOOST_LOG_TRIVIAL(trace) << "Checking to see if any files matching the regex \"" << regexStr << "\" exist.";
std::pair<boost::filesystem::path, std::regex> pathRegex = SplitRegex(regexStr);
if (_game == nullptr)
return;
//Now we have a valid parent path and a regex filename. Check that
//the parent path exists and is a directory.
@@ -249,14 +247,15 @@ namespace loot {
}
void CheckMany(bool& result, const std::string& regexStr) const {
if (_parseOnly)
return;
result = false;
BOOST_LOG_TRIVIAL(trace) << "Checking to see if more than one file matching the regex \"" << regexStr << "\" exist.";
std::pair<boost::filesystem::path, std::regex> pathRegex = SplitRegex(regexStr);
if (_game == nullptr)
return;
//Now we have a valid parent path and a regex filename. Check that
//the parent path exists and is a directory.
@@ -278,9 +277,6 @@ namespace loot {
}
void CheckSum(bool& result, const std::string& file, const uint32_t checksum) {
if (_parseOnly)
return;
BOOST_LOG_TRIVIAL(trace) << "Checking the CRC of the file \"" << file << "\".";
if (!IsSafePath(file)) {
@@ -288,6 +284,9 @@ namespace loot {
throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid file path:").str() + " " + file);
}
if (_game == nullptr)
return;
uint32_t crc;
std::unordered_map<std::string, uint32_t>::iterator it = _game->crcCache.find(boost::locale::to_lower(file));
@@ -312,12 +311,13 @@ namespace loot {
}
void CheckVersion(bool& result, const std::string& file, const std::string& version, const std::string& comparator) const {
if (_parseOnly)
return;
BOOST_LOG_TRIVIAL(trace) << "Checking version of file \"" << file << "\".";
CheckFile(result, file);
if (_game == nullptr)
return;
if (!result) {
if (comparator == "!=" || comparator == "<" || comparator == "<=")
result = true;
@@ -350,14 +350,14 @@ namespace loot {
}
void CheckActive(bool& result, const std::string& file) const {
if (_parseOnly)
return;
if (!IsSafePath(file)) {
BOOST_LOG_TRIVIAL(error) << "Invalid file path: " << file;
throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid file path:").str() + " " + file);
}
if (_game == nullptr)
return;
if (file == "LOOT")
result = false;
else
@@ -376,19 +376,21 @@ namespace loot {
}
//Checks that the path (not regex) doesn't go outside any game folders.
bool IsSafePath(const std::string& path) const {
bool IsSafePath(const boost::filesystem::path& path) const {
BOOST_LOG_TRIVIAL(trace) << "Checking to see if the path \"" << path << "\" is safe.";
std::vector<std::string> components;
boost::split(components, path, boost::is_any_of("/\\"));
components.pop_back();
std::string parent_path;
for (auto it = components.cbegin(), endIt = components.cend()--; it != endIt; ++it) {
if (*it == ".")
boost::filesystem::path temp;
for (const auto& component : path) {
if (component == ".")
continue;
parent_path += *it + '/';
if (component == ".." && temp.filename() == "..")
return false;
temp /= component;
}
return !boost::contains(parent_path, "../../");
return true;
}
};
}
src/backend/metadata/conditional_metadata.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ namespace loot {
if (it != game.conditionCache.end())
return it->second;
ConditionGrammar<std::string::const_iterator, boost::spirit::qi::space_type> grammar(&game, false);
ConditionGrammar<std::string::const_iterator, boost::spirit::qi::space_type> grammar(&game);
boost::spirit::qi::space_type skipper;
std::string::const_iterator begin, end;
bool eval;
@@ -88,7 +88,7 @@ namespace loot {
BOOST_LOG_TRIVIAL(trace) << "Testing condition syntax: " << _condition;
ConditionGrammar<std::string::const_iterator, boost::spirit::qi::space_type> grammar(nullptr, true);
ConditionGrammar<std::string::const_iterator, boost::spirit::qi::space_type> grammar(nullptr);
boost::spirit::qi::space_type skipper;
std::string::const_iterator begin, end;
src/backend/metadata/file.h
+8
View File
@@ -83,6 +83,14 @@ namespace YAML {
else
rhs = loot::File(node.as<std::string>());
// Test condition syntax.
try {
rhs.ParseCondition();
}
catch (std::exception& e) {
throw RepresentationException(node.Mark(), std::string("bad conversion: invalid condition syntax: ") + e.what());
}
return true;
}
};
src/backend/metadata/message.h
+9
View File
@@ -144,6 +144,15 @@ namespace YAML {
condition = node["condition"].as<std::string>();
rhs = loot::Message(typeNo, content, condition);
// Test condition syntax.
try {
rhs.ParseCondition();
}
catch (std::exception& e) {
throw RepresentationException(node.Mark(), std::string("bad conversion: invalid condition syntax: ") + e.what());
}
return true;
}
};
src/backend/metadata/plugin_metadata.cpp
-18
View File
@@ -332,24 +332,6 @@ namespace loot {
return *this;
}
void PluginMetadata::ParseAllConditions() const {
for (const File& file : loadAfter) {
file.ParseCondition();
}
for (const File& file : requirements) {
file.ParseCondition();
}
for (const File& file : incompatibilities) {
file.ParseCondition();
}
for (const Message& message : messages) {
message.ParseCondition();
}
for (const Tag& tag : tags) {
tag.ParseCondition();
}
}
bool PluginMetadata::HasNameOnly() const {
return !IsPriorityExplicit() && loadAfter.empty() && requirements.empty() && incompatibilities.empty() && messages.empty() && tags.empty() && _dirtyInfo.empty() && _locations.empty();
}
src/backend/metadata/plugin_metadata.h
+11 -1
View File
@@ -37,6 +37,7 @@
#include <vector>
#include <list>
#include <set>
#include <regex>
#include <boost/locale.hpp>
@@ -89,7 +90,6 @@ namespace loot {
void Locations(const std::set<Location>& locations);
PluginMetadata& EvalAllConditions(Game& game, const unsigned int language);
void ParseAllConditions() const;
bool HasNameOnly() const;
bool IsRegexPlugin() const;
bool IsPriorityExplicit() const;
@@ -160,6 +160,16 @@ namespace YAML {
rhs = loot::PluginMetadata(node["name"].as<std::string>());
// Test for valid regex.
if (rhs.IsRegexPlugin()) {
try {
std::regex(rhs.Name(), std::regex::ECMAScript | std::regex::icase);
}
catch (std::regex_error& e) {
throw RepresentationException(node.Mark(), std::string("bad conversion: invalid regex in 'name' key: ") + e.what());
}
}
if (node["enabled"])
rhs.Enabled(node["enabled"].as<bool>());
src/backend/metadata/tag.h
+8
View File
@@ -82,6 +82,14 @@ namespace YAML {
else
rhs = loot::Tag(tag, true, condition);
// Test condition syntax.
try {
rhs.ParseCondition();
}
catch (std::exception& e) {
throw RepresentationException(node.Mark(), std::string("bad conversion: invalid condition syntax: ") + e.what());
}
return true;
}
};
src/tests/backend/metadata/test_condition_grammar.h
+53 -37
View File
@@ -34,14 +34,12 @@ class ConditionGrammar : public SkyrimTest {};
typedef loot::ConditionGrammar<std::string::const_iterator, boost::spirit::qi::space_type> Grammar;
TEST_F(ConditionGrammar, Constructor) {
EXPECT_NO_THROW(Grammar cg(nullptr, true));
EXPECT_THROW(Grammar cg(nullptr, false), loot::error);
EXPECT_NO_THROW(Grammar cg(nullptr));
loot::Game game(loot::Game::tes5);
game.SetGamePath(dataPath.parent_path());
EXPECT_NO_THROW(Grammar cg(&game, true));
EXPECT_NO_THROW(Grammar cg(&game, false));
EXPECT_NO_THROW(Grammar cg(&game));
}
TEST_F(ConditionGrammar, InvalidSyntax) {
@@ -51,7 +49,7 @@ TEST_F(ConditionGrammar, InvalidSyntax) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(foo)");
std::string::const_iterator begin = condition.begin();
@@ -67,7 +65,7 @@ TEST_F(ConditionGrammar, EmptyCondition) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("");
std::string::const_iterator begin = condition.begin();
@@ -83,13 +81,13 @@ TEST_F(ConditionGrammar, FileConditionTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.esm\")");
std::string::const_iterator begin = condition.begin();
std::string::const_iterator end = condition.end();
EXPECT_NO_THROW(r = boost::spirit::qi::phrase_parse(begin, end, cg, skipper, eval));
r = boost::spirit::qi::phrase_parse(begin, end, cg, skipper, eval);
EXPECT_TRUE(r);
EXPECT_TRUE(eval);
}
@@ -101,7 +99,7 @@ TEST_F(ConditionGrammar, FileConditionFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.missing.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -119,7 +117,7 @@ TEST_F(ConditionGrammar, UnsafePath) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"../../Blank.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -135,7 +133,7 @@ TEST_F(ConditionGrammar, RegexConditionTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("regex(\"Blank.+\\.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -153,7 +151,7 @@ TEST_F(ConditionGrammar, RegexConditionFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("regex(\"Blank\\.m.+\\.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -164,6 +162,24 @@ TEST_F(ConditionGrammar, RegexConditionFalse) {
EXPECT_FALSE(eval);
}
TEST_F(ConditionGrammar, RegexCondition_Subfolder) {
loot::Game game(loot::Game::tes5);
game.SetGamePath(dataPath.parent_path());
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game);
std::string condition("regex(\"resource\\\\detail\\\\resource\\.txt\")");
std::string::const_iterator begin = condition.begin();
std::string::const_iterator end = condition.end();
EXPECT_NO_THROW(r = boost::spirit::qi::phrase_parse(begin, end, cg, skipper, eval));
EXPECT_TRUE(r);
EXPECT_TRUE(eval);
}
TEST_F(ConditionGrammar, ManyConditionTrue) {
loot::Game game(loot::Game::tes5);
game.SetGamePath(dataPath.parent_path());
@@ -171,7 +187,7 @@ TEST_F(ConditionGrammar, ManyConditionTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("many(\"Blank.+\\.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -189,7 +205,7 @@ TEST_F(ConditionGrammar, ManyConditionFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("many(\"Blank\\.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -208,7 +224,7 @@ TEST_F(ConditionGrammar, ChecksumConditionTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("checksum(\"Blank.esp\", E12EFAAA)");
std::string::const_iterator begin = condition.begin();
@@ -227,7 +243,7 @@ TEST_F(ConditionGrammar, ChecksumConditionFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("checksum(\"Blank.esp\", DEADBEEF)");
std::string::const_iterator begin = condition.begin();
@@ -247,7 +263,7 @@ TEST_F(ConditionGrammar, VersionConditionEqualTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", ==)");
std::string::const_iterator begin = condition.begin();
@@ -267,7 +283,7 @@ TEST_F(ConditionGrammar, VersionConditionEqualFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"6.0\", ==)");
std::string::const_iterator begin = condition.begin();
@@ -287,7 +303,7 @@ TEST_F(ConditionGrammar, VersionConditionNotEqualTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"6.0\", !=)");
std::string::const_iterator begin = condition.begin();
@@ -307,7 +323,7 @@ TEST_F(ConditionGrammar, VersionConditionNotEqualFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", !=)");
std::string::const_iterator begin = condition.begin();
@@ -327,7 +343,7 @@ TEST_F(ConditionGrammar, VersionConditionLessThanTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"6.0\", <)");
std::string::const_iterator begin = condition.begin();
@@ -347,7 +363,7 @@ TEST_F(ConditionGrammar, VersionConditionLessThanFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", <)");
std::string::const_iterator begin = condition.begin();
@@ -367,7 +383,7 @@ TEST_F(ConditionGrammar, VersionConditionGreaterThanTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"4.0\", >)");
std::string::const_iterator begin = condition.begin();
@@ -387,7 +403,7 @@ TEST_F(ConditionGrammar, VersionConditionGreaterThanFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", >)");
std::string::const_iterator begin = condition.begin();
@@ -407,7 +423,7 @@ TEST_F(ConditionGrammar, VersionConditionLETrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", <=)");
std::string::const_iterator begin = condition.begin();
@@ -427,7 +443,7 @@ TEST_F(ConditionGrammar, VersionConditionLEFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"4.0\", <=)");
std::string::const_iterator begin = condition.begin();
@@ -447,7 +463,7 @@ TEST_F(ConditionGrammar, VersionConditionGETrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"5.0\", >=)");
std::string::const_iterator begin = condition.begin();
@@ -466,7 +482,7 @@ TEST_F(ConditionGrammar, VersionConditionGEFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("version(\"Blank.esm\", \"6.0\", >=)");
std::string::const_iterator begin = condition.begin();
@@ -485,7 +501,7 @@ TEST_F(ConditionGrammar, ActiveConditionTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("active(\"Blank.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -504,7 +520,7 @@ TEST_F(ConditionGrammar, ActiveConditionFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("active(\"Blank.esp\")");
std::string::const_iterator begin = condition.begin();
@@ -522,7 +538,7 @@ TEST_F(ConditionGrammar, NegatorTrue) {
boost::spirit::qi::space_type skipper;
bool eval = false;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("not file(\"Blank.missing.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -540,7 +556,7 @@ TEST_F(ConditionGrammar, NegatorFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("not file(\"Blank.esm\")");
std::string::const_iterator begin = condition.begin();
@@ -558,7 +574,7 @@ TEST_F(ConditionGrammar, CompoundAndTrue) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.esm\") and file(\"Blank.esp\")");
std::string::const_iterator begin = condition.begin();
@@ -576,7 +592,7 @@ TEST_F(ConditionGrammar, CompoundAndFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.esm\") and file(\"Blank.missing.esp\")");
std::string::const_iterator begin = condition.begin();
@@ -594,7 +610,7 @@ TEST_F(ConditionGrammar, CompoundOrTrue) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.missing.esm\") or file(\"Blank.esp\")");
std::string::const_iterator begin = condition.begin();
@@ -612,7 +628,7 @@ TEST_F(ConditionGrammar, CompoundOrFalse) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.missing.esm\") or file(\"Blank.missing.esp\")");
std::string::const_iterator begin = condition.begin();
@@ -630,7 +646,7 @@ TEST_F(ConditionGrammar, OrderOfEvaluation) {
boost::spirit::qi::space_type skipper;
bool eval = true;
bool r = false;
Grammar cg(&game, false);
Grammar cg(&game);
std::string condition("file(\"Blank.esm\") and ( not file(\"Blank.esm\") or file(\"Blank.esp\") ) or file(\"Blank.missing.esp\")");
std::string::const_iterator begin = condition.begin();
src/tests/backend/metadata/test_conditional_metadata.h
+4
View File
@@ -72,6 +72,10 @@ TEST_F(ConditionalMetadata, ParseCondition) {
cm = loot::ConditionalMetadata("condition");
EXPECT_THROW(cm.ParseCondition(), loot::error);
// Check that invalid regex also throws.
cm = loot::ConditionalMetadata("regex(\"RagnvaldBook(Farengar(+Ragnvald)?)?\\.esp\")");
EXPECT_THROW(cm.ParseCondition(), loot::error);
cm = loot::ConditionalMetadata("file(\"Blank.esm\")");
EXPECT_NO_THROW(cm.ParseCondition());
src/tests/backend/metadata/test_file.h
+7 -4
View File
@@ -144,11 +144,11 @@ TEST(File, YamlEncode) {
}
TEST(File, YamlDecode) {
YAML::Node node = YAML::Load("{name: name1, display: display1, condition: condition1}");
YAML::Node node = YAML::Load("{name: name1, display: display1, condition: 'file(\"Foo.esp\")'}");
File file = node.as<File>();
EXPECT_EQ("name1", file.Name());
EXPECT_EQ("display1", file.DisplayName());
EXPECT_EQ("condition1", file.Condition());
EXPECT_EQ("file(\"Foo.esp\")", file.Condition());
node = YAML::Load("name1");
file = node.as<File>();
@@ -162,11 +162,14 @@ TEST(File, YamlDecode) {
EXPECT_EQ("display1", file.DisplayName());
EXPECT_EQ("", file.Condition());
node = YAML::Load("{name: name1, condition: condition1}");
node = YAML::Load("{name: name1, condition: 'file(\"Foo.esp\")'}");
file = node.as<File>();
EXPECT_EQ("name1", file.Name());
EXPECT_EQ("name1", file.DisplayName());
EXPECT_EQ("condition1", file.Condition());
EXPECT_EQ("file(\"Foo.esp\")", file.Condition());
node = YAML::Load("{name: name1, condition: invalid}");
EXPECT_THROW(node.as<File>(), YAML::RepresentationException);
node = YAML::Load("[0, 1, 2]");
EXPECT_ANY_THROW(node.as<File>());
src/tests/backend/metadata/test_message.h
+7 -2
View File
@@ -326,11 +326,11 @@ TEST_F(Message, YamlDecode) {
node = YAML::Load("type: say\n"
"content: content1\n"
"condition: condition1");
"condition: 'file(\"Foo.esp\")'");
message = node.as<loot::Message>();
EXPECT_EQ(loot::Message::say, message.Type());
EXPECT_EQ(MessageContents({MessageContent("content1", Language::english)}), message.Content());
EXPECT_EQ("condition1", message.Condition());
EXPECT_EQ("file(\"Foo.esp\")", message.Condition());
node = YAML::Load("type: say\n"
"content:\n"
@@ -405,6 +405,11 @@ TEST_F(Message, YamlDecode) {
EXPECT_EQ(MessageContents({MessageContent("con%1%tent1", Language::english)}), message.Content());
EXPECT_EQ("", message.Condition());
node = YAML::Load("type: say\n"
"content: content1\n"
"condition: invalid");
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
node = YAML::Load("scalar");
EXPECT_THROW(node.as<loot::Message>(), YAML::RepresentationException);
src/tests/backend/metadata/test_plugin_metadata.h
+34 -36
View File
@@ -502,7 +502,6 @@ TEST_F(PluginMetadata, EvalAllConditions) {
"msg:\n"
" - type: say\n"
" content: 'content'\n"
" condition: 'condition'\n"
"tag:\n"
" - name: Relev\n"
" condition: 'file(\"Blank.missing.esm\")'\n"
@@ -517,8 +516,6 @@ TEST_F(PluginMetadata, EvalAllConditions) {
" nav: 2"
).as<loot::PluginMetadata>());
EXPECT_ANY_THROW(pm.EvalAllConditions(game, loot::Language::english));
pm.Messages({loot::Message(loot::Message::say, "content")});
EXPECT_NO_THROW(pm.EvalAllConditions(game, loot::Language::english));
EXPECT_EQ(std::set<loot::File>({
@@ -537,33 +534,6 @@ TEST_F(PluginMetadata, EvalAllConditions) {
}), pm.DirtyInfo());
}
TEST_F(PluginMetadata, ParseAllConditions) {
loot::PluginMetadata pm(YAML::Load(
"name: 'Blank.esp'\n"
"after:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.esm\")'\n"
"req:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.missing.esm\")'\n"
"inc:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.esm\")'\n"
"msg:\n"
" - type: say\n"
" content: 'content'\n"
" condition: 'condition'\n"
"tag:\n"
" - name: Relev\n"
" condition: 'file(\"Blank.missing.esm\")'"
).as<loot::PluginMetadata>());
EXPECT_ANY_THROW(pm.ParseAllConditions());
pm.Messages({loot::Message(loot::Message::say, "content")});
EXPECT_NO_THROW(pm.ParseAllConditions());
}
TEST_F(PluginMetadata, HasNameOnly) {
loot::PluginMetadata pm;
EXPECT_TRUE(pm.HasNameOnly());
@@ -823,9 +793,6 @@ TEST_F(PluginMetadata, YamlDecode) {
YAML::Node node;
loot::PluginMetadata pm;
node = YAML::Load("Blank.esp");
EXPECT_ANY_THROW(node.as<loot::PluginMetadata>());
node = YAML::Load("name: Blank.esp");
pm = node.as<loot::PluginMetadata>();
EXPECT_EQ("Blank.esp", pm.Name());
@@ -887,13 +854,44 @@ TEST_F(PluginMetadata, YamlDecode) {
" util: 'utility'\n"
" udr: 1\n"
" nav: 2");
EXPECT_ANY_THROW(node.as<loot::PluginMetadata>());
EXPECT_THROW(node.as<loot::PluginMetadata>(), YAML::RepresentationException);
// Don't allow invalid regex.
node = YAML::Load("name: 'RagnvaldBook(Farengar(+Ragnvald)?)?\\.esp'\n"
"dirty:\n"
" - crc: 0x5\n"
" util: 'utility'\n"
" udr: 1\n"
" nav: 2");
EXPECT_THROW(node.as<loot::PluginMetadata>(), YAML::RepresentationException);
// Catch condition syntax errors.
node = YAML::Load(
"name: 'Blank.esp'\n"
"after:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.esm\")'\n"
"req:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.missing.esm\")'\n"
"inc:\n"
" - name: 'Blank.esm'\n"
" condition: 'file(\"Blank.esm\")'\n"
"msg:\n"
" - type: say\n"
" content: 'content'\n"
" condition: 'condition'\n"
"tag:\n"
" - name: Relev\n"
" condition: 'file(\"Blank.missing.esm\")'"
);
EXPECT_THROW(node.as<loot::PluginMetadata>(), YAML::RepresentationException);
node = YAML::Load("scalar");
EXPECT_ANY_THROW(node.as<loot::PluginMetadata>());
EXPECT_THROW(node.as<loot::PluginMetadata>(), YAML::RepresentationException);
node = YAML::Load("[0, 1, 2]");
EXPECT_ANY_THROW(node.as<loot::PluginMetadata>());
EXPECT_THROW(node.as<loot::PluginMetadata>(), YAML::RepresentationException);
}
#endif
src/tests/backend/metadata/test_tag.h
+6 -3
View File
@@ -164,14 +164,17 @@ TEST(Tag, YamlDecode) {
EXPECT_FALSE(tag.IsAddition());
EXPECT_EQ("", tag.Condition());
node = YAML::Load("{name: name1, condition: condition1}");
node = YAML::Load("{name: name1, condition: 'file(\"Foo.esp\")'}");
tag = node.as<Tag>();
EXPECT_EQ("name1", tag.Name());
EXPECT_TRUE(tag.IsAddition());
EXPECT_EQ("condition1", tag.Condition());
EXPECT_EQ("file(\"Foo.esp\")", tag.Condition());
node = YAML::Load("{name: name1, condition: invalid}");
EXPECT_THROW(node.as<Tag>(), YAML::RepresentationException);
node = YAML::Load("[0, 1, 2]");
EXPECT_ANY_THROW(node.as<Tag>());
EXPECT_THROW(node.as<Tag>(), YAML::RepresentationException);
}
#endif
src/tests/fixtures.h
+17 -1
View File
@@ -35,7 +35,13 @@ along with LOOT. If not, see
class GameTest : public ::testing::Test {
protected:
GameTest(const boost::filesystem::path& gameDataPath, const boost::filesystem::path& gameLocalPath)
: dataPath(gameDataPath), localPath(gameLocalPath), missingPath("./missing"), masterlistPath(localPath / "masterlist.yaml"), userlistPath(localPath / "userlist.yaml"), db(nullptr) {}
: dataPath(gameDataPath),
localPath(gameLocalPath),
missingPath("./missing"),
masterlistPath(localPath / "masterlist.yaml"),
userlistPath(localPath / "userlist.yaml"),
resourcePath(dataPath / "resource" / "detail" / "resource.txt"),
db(nullptr) {}
inline virtual void SetUp() {
ASSERT_NO_THROW(boost::filesystem::create_directories(localPath));
@@ -70,6 +76,12 @@ protected:
out.close();
ASSERT_TRUE(boost::filesystem::exists(dataPath / "EmptyFile.esm"));
// Write out an empty resource file.
ASSERT_NO_THROW(boost::filesystem::create_directories(resourcePath.parent_path()));
out.open(resourcePath);
out.close();
ASSERT_TRUE(boost::filesystem::exists(resourcePath));
// Write out an non-empty, non-plugin file.
out.open(dataPath / "NotAPlugin.esm");
out << "This isn't a valid plugin file.";
@@ -85,8 +97,10 @@ protected:
// Delete generated files.
ASSERT_NO_THROW(boost::filesystem::remove(dataPath / "EmptyFile.esm"));
ASSERT_NO_THROW(boost::filesystem::remove(resourcePath));
ASSERT_NO_THROW(boost::filesystem::remove(dataPath / "NotAPlugin.esm"));
ASSERT_FALSE(boost::filesystem::exists(dataPath / "EmptyFile.esm"));
ASSERT_FALSE(boost::filesystem::exists(resourcePath));
ASSERT_FALSE(boost::filesystem::exists(dataPath / "NotAPlugin.esm"));
// Masterlist & userlist may have been created during test, so delete them.
@@ -106,6 +120,8 @@ protected:
const boost::filesystem::path masterlistPath;
const boost::filesystem::path userlistPath;
const boost::filesystem::path resourcePath;
loot_db db;
};
src/validator/main.cpp
-8
View File
@@ -65,14 +65,6 @@ int main(int argc, char **argv) {
// Test YAML parsing.
loot::MetadataList metadata;
metadata.Load(argv[1]);
// Test condition parsing.
for (auto &plugin : metadata.Plugins()) {
plugin.ParseAllConditions();
}
for (auto &message : metadata.messages) {
message.ParseCondition();
}
}
catch (std::exception& e) {
std::cout << "ERROR: " << e.what() << std::endl << std::endl;