Remove ConditionalMetadata::ParseCondition()

It's not used by LOOT.
This commit is contained in:
Oliver Hamlet
2022-02-19 12:11:56 +00:00
parent c7aafbe487
commit 855eed4731
7 changed files with 10 additions and 39 deletions
@@ -56,14 +56,6 @@ public:
*/
LOOT_API bool IsConditional() const;
/**
* Check if the condition string is syntactically valid.
*
* Throws a ``ConditionSyntaxError`` if the condition string's syntax is not
* valid.
*/
LOOT_API void ParseCondition() const;
/**
* Get the condition string.
* @return The object's condition string.
+4
View File
@@ -260,6 +260,10 @@ bool ConditionEvaluator::Evaluate(const PluginCleaningData& cleaningData,
}
void ParseCondition(const std::string& condition) {
if (condition.empty()) {
return;
}
auto logger = getLogger();
if (logger) {
logger->trace("Testing condition syntax: {}", condition);
@@ -37,10 +37,4 @@ ConditionalMetadata::ConditionalMetadata(const string& condition) :
bool ConditionalMetadata::IsConditional() const { return !condition_.empty(); }
std::string ConditionalMetadata::GetCondition() const { return condition_; }
void ConditionalMetadata::ParseCondition() const {
if (!condition_.empty()) {
loot::ParseCondition(condition_);
}
}
}
+2 -1
View File
@@ -31,6 +31,7 @@
#include <string>
#include "api/helpers/text.h"
#include "api/metadata/condition_evaluator.h"
#include "api/metadata/yaml/message_content.h"
#include "loot/metadata/file.h"
@@ -105,7 +106,7 @@ struct convert<loot::File> {
// Test condition syntax.
try {
rhs.ParseCondition();
loot::ParseCondition(rhs.GetCondition());
} catch (const std::exception& e) {
throw RepresentationException(
node.Mark(),
+2 -1
View File
@@ -32,6 +32,7 @@
#include <string>
#include <vector>
#include "api/metadata/condition_evaluator.h"
#include "loot/metadata/message.h"
namespace YAML {
@@ -128,7 +129,7 @@ struct convert<loot::Message> {
// Test condition syntax.
try {
rhs.ParseCondition();
loot::ParseCondition(rhs.GetCondition());
} catch (const std::exception& e) {
throw RepresentationException(
node.Mark(),
+2 -1
View File
@@ -30,6 +30,7 @@
#include <string>
#include "api/metadata/condition_evaluator.h"
#include "loot/metadata/tag.h"
namespace YAML {
@@ -71,7 +72,7 @@ struct convert<loot::Tag> {
// Test condition syntax.
try {
rhs.ParseCondition();
loot::ParseCondition(rhs.GetCondition());
} catch (const std::exception& e) {
throw RepresentationException(
node.Mark(),
@@ -69,28 +69,6 @@ TEST_P(ConditionalMetadataTest,
conditionalMetadata_ = ConditionalMetadata("condition");
EXPECT_TRUE(conditionalMetadata_.IsConditional());
}
TEST_P(ConditionalMetadataTest,
parseConditionShouldNotThrowForAnEmptyCondition) {
EXPECT_NO_THROW(conditionalMetadata_.ParseCondition());
}
TEST_P(ConditionalMetadataTest,
parseConditionShouldThrowForAnInvalidCondition) {
conditionalMetadata_ = ConditionalMetadata("condition");
EXPECT_THROW(conditionalMetadata_.ParseCondition(), ConditionSyntaxError);
}
TEST_P(ConditionalMetadataTest, parseConditionShouldNotThrowForATrueCondition) {
conditionalMetadata_ = ConditionalMetadata("file(\"" + blankEsm + "\")");
EXPECT_NO_THROW(conditionalMetadata_.ParseCondition());
}
TEST_P(ConditionalMetadataTest,
parseConditionShouldNotThrowForAFalseCondition) {
conditionalMetadata_ = ConditionalMetadata("file(\"" + missingEsp + "\")");
EXPECT_NO_THROW(conditionalMetadata_.ParseCondition());
}
}
}