From 0faec227b3ceb69225c59b1fc0d1da53de848ce5 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 17 Apr 2022 09:39:47 +0200 Subject: Fix submodule with Qt6 --- tests/dice/tst_dice.cpp | 90 +++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 47 deletions(-) (limited to 'tests/dice/tst_dice.cpp') diff --git a/tests/dice/tst_dice.cpp b/tests/dice/tst_dice.cpp index 9c9085a..9318341 100644 --- a/tests/dice/tst_dice.cpp +++ b/tests/dice/tst_dice.cpp @@ -22,12 +22,13 @@ #include #include -#include "dicealias.h" -#include "diceparser.h" +#include "diceparser/dicealias.h" +#include "diceparser/diceparser.h" #include "die.h" // node #include "booleancondition.h" +#include "diceparser/parsingtoolbox.h" #include "node/bind.h" #include "node/countexecutenode.h" #include "node/explodedicenode.h" @@ -46,7 +47,6 @@ #include "node/uniquenode.h" #include "node/valueslistnode.h" #include "operationcondition.h" -#include "parsingtoolbox.h" #include "result/stringresult.h" #include "testnode.h" #include "validatorlist.h" @@ -85,8 +85,8 @@ void makeResultExplode(DiceResult& result, const QVector& values) result.insertResult(die); } -ValidatorList* makeValidator(QVector number, BooleanCondition::LogicOperator op, - QVector vector= QVector()) +ValidatorList* makeValidator(QVector number, Dice::CompareOperator op, + QVector vector= QVector()) { ValidatorList* list= new ValidatorList(); QList validList; @@ -717,7 +717,7 @@ void TestDice::countTest() TestNode node; CountExecuteNode countN; - QVector vector; + QVector vector; bool first= true; for(const auto& i : condition) @@ -729,10 +729,10 @@ void TestDice::countTest() continue; } - vector.push_back(ValidatorList::OR); + vector.push_back(Dice::LogicOperation::OR); } - auto validator= makeValidator(condition, static_cast(boolOp), vector); + auto validator= makeValidator(condition, static_cast(boolOp), vector); countN.setValidatorList(validator); DiceResult result; @@ -757,10 +757,10 @@ void TestDice::countTest_data() QTest::addColumn("boolOp"); // clang-format off - QTest::addRow("cmd1") << QVector({10, 9, 2}) << QVector({3}) << 2 << QVector() << static_cast(BooleanCondition::GreaterThan); - QTest::addRow("cmd2") << QVector({1, 2, 3}) << QVector({3}) << 0 << QVector() << static_cast(BooleanCondition::GreaterThan); - QTest::addRow("cmd3") << QVector({10, 7, 4}) << QVector({7}) << 3 << QVector({10, 10, 2}) << static_cast(BooleanCondition::GreaterThan); - QTest::addRow("cmd4") << QVector({1, 1, 6}) << QVector({1,6}) << 3 << QVector() << static_cast(BooleanCondition::Equal); + QTest::addRow("cmd1") << QVector({10, 9, 2}) << QVector({3}) << 2 << QVector() << static_cast(Dice::CompareOperator::GreaterThan); + QTest::addRow("cmd2") << QVector({1, 2, 3}) << QVector({3}) << 0 << QVector() << static_cast(Dice::CompareOperator::GreaterThan); + QTest::addRow("cmd3") << QVector({10, 7, 4}) << QVector({7}) << 3 << QVector({10, 10, 2}) << static_cast(Dice::CompareOperator::GreaterThan); + QTest::addRow("cmd4") << QVector({1, 1, 6}) << QVector({1,6}) << 3 << QVector() << static_cast(Dice::CompareOperator::Equal); // clang-format on } @@ -777,7 +777,7 @@ void TestDice::rerollTest() makeResult(result, values); node.setResult(&result); - auto validator= makeValidator(QVector() << condition, BooleanCondition::GreaterThan); + auto validator= makeValidator(QVector() << condition, Dice::CompareOperator::GreaterThan); reroll.setValidatorList(validator); node.setNextNode(&reroll); @@ -821,7 +821,7 @@ void TestDice::explodeTest() makeResult(result, values); node.setResult(&result); - auto validator= makeValidator(QVector() << condition, BooleanCondition::Equal); + auto validator= makeValidator(QVector() << condition, Dice::CompareOperator::Equal); explode.setValidatorList(validator); node.setNextNode(&explode); @@ -865,7 +865,7 @@ void TestDice::rerollUntilTest() makeResult(result, values, QVector(), 0); node.setResult(&result); - auto validator= makeValidator(QVector() << condition, BooleanCondition::Equal); + auto validator= makeValidator(QVector() << condition, Dice::CompareOperator::Equal); reroll.setValidatorList(validator); node.setNextNode(&reroll); @@ -907,7 +907,7 @@ void TestDice::rerollAddTest() makeResult(result, values); node.setResult(&result); - auto validator= makeValidator(QVector() << condition, BooleanCondition::Equal); + auto validator= makeValidator(QVector() << condition, Dice::CompareOperator::Equal); reroll.setValidatorList(validator); node.setNextNode(&reroll); @@ -965,7 +965,7 @@ void TestDice::ifTest() ifNode.setInstructionTrue(&trueNode); ifNode.setInstructionFalse(&falseNode); - auto validator= makeValidator(QVector() << valCondition, BooleanCondition::Equal); + auto validator= makeValidator(QVector() << valCondition, Dice::CompareOperator::Equal); ifNode.setValidatorList(validator); node.setNextNode(&ifNode); @@ -1122,7 +1122,7 @@ void TestDice::occurenceTest() makeResult(result, values); node.setResult(&result); - auto validator= makeValidator(QVector() << condition, BooleanCondition::GreaterThan); + auto validator= makeValidator(QVector() << condition, Dice::CompareOperator::GreaterThan); count.setValidatorList(validator); node.setNextNode(&count); @@ -1145,7 +1145,7 @@ void TestDice::occurenceTest_data() void TestDice::ifCommandTest() { QFETCH(QString, cmd); - QFETCH(BooleanCondition::LogicOperator, compare); + QFETCH(Dice::CompareOperator, compare); QFETCH(QList, level); QFETCH(QStringList, startExperted); @@ -1159,15 +1159,15 @@ void TestDice::ifCommandTest() auto result= results.first(); auto it= std::find_if(level.begin(), level.end(), [compare, result](int level) { - if(compare == BooleanCondition::GreaterOrEqual) + if(compare == Dice::CompareOperator::GreaterOrEqual) return result >= level; - else if(compare == BooleanCondition::GreaterThan) + else if(compare == Dice::CompareOperator::GreaterThan) return result > level; - else if(compare == BooleanCondition::LesserThan) + else if(compare == Dice::CompareOperator::LesserThan) return result < level; - else if(compare == BooleanCondition::LesserOrEqual) + else if(compare == Dice::CompareOperator::LesserOrEqual) return result <= level; - else if(compare == BooleanCondition::Equal) + else if(compare == Dice::CompareOperator::Equal) return qFuzzyCompare(result, level); else // if(compare == BooleanCondition::Different) return !qFuzzyCompare(result, level); @@ -1184,19 +1184,19 @@ void TestDice::ifCommandTest() void TestDice::ifCommandTest_data() { QTest::addColumn("cmd"); - QTest::addColumn("compare"); + QTest::addColumn("compare"); QTest::addColumn>("level"); QTest::addColumn("startExperted"); QTest::addRow("cmd1") << "2d10i:[>=15]{\"Complete Success: %1 " "[%2]\"}{i:[>=10]{\"Success with Complications: %1 " "[%2]\"}{\"Failure: %1 [%2]\"}}" - << BooleanCondition::GreaterOrEqual << QList({15, 10, 1}) + << Dice::CompareOperator::GreaterOrEqual << QList({15, 10, 1}) << QStringList({"Complete Success:", "Success with Complications:", "Failure:"}); QTest::addRow("cmd2") << "2d10;$1i:[>=15]{\"Complete Success: %1 [%2]\"}{$1i:[>=10]{\"Success " "with Complications: %1 " "[%2]\"}{\"Failure: %1 [%2]\"}}" - << BooleanCondition::GreaterOrEqual << QList({15, 10, 1}) + << Dice::CompareOperator::GreaterOrEqual << QList({15, 10, 1}) << QStringList({"Complete Success:", "Success with Complications:", "Failure:"}); } @@ -1208,7 +1208,7 @@ void TestDice::operatoionConditionValidatorTest() validator.setValueNode(&number); BooleanCondition subValidator; - subValidator.setOperator(BooleanCondition::Equal); + subValidator.setOperator(Dice::CompareOperator::Equal); NumberNode subnumber; subnumber.setNumber(0); subValidator.setValueNode(&subnumber); @@ -1227,9 +1227,8 @@ void TestDice::operatoionConditionValidatorTest() void TestDice::switchCaseTest() { - using BC= BooleanCondition; QFETCH(int, value); - QFETCH(QList, operatorList); + QFETCH(QList, operatorList); QFETCH(QList, threshold); QFETCH(QStringList, values); QFETCH(QString, expected); @@ -1269,41 +1268,38 @@ void TestDice::switchCaseTest() void TestDice::switchCaseTest_data() { - using BC= BooleanCondition; + using BC= Dice::CompareOperator; QTest::addColumn("value"); - QTest::addColumn>("operatorList"); + QTest::addColumn>("operatorList"); QTest::addColumn>("threshold"); QTest::addColumn("values"); QTest::addColumn("expected"); QTest::addColumn("stopatfirt"); - QTest::addRow("cmd1") << 75 << QList{BC::Equal, BC::Equal} << QList{75, 1} - << QStringList{"a", "b"} << QStringLiteral("a") << false; + QTest::addRow("cmd1") << 75 << QList{BC::Equal, BC::Equal} << QList{75, 1} << QStringList{"a", "b"} + << QStringLiteral("a") << false; - QTest::addRow("cmd2") << 1 << QList{BC::Equal, BC::Equal} << QList{75, 1} - << QStringList{"a", "b"} << QStringLiteral("b") << true; + QTest::addRow("cmd2") << 1 << QList{BC::Equal, BC::Equal} << QList{75, 1} << QStringList{"a", "b"} + << QStringLiteral("b") << true; QTest::addRow("cmd3") << 7 - << QList{BC::GreaterThan, BC::GreaterThan, BC::GreaterThan, - BC::GreaterThan, BC::GreaterThan} + << QList{BC::GreaterThan, BC::GreaterThan, BC::GreaterThan, BC::GreaterThan, + BC::GreaterThan} << QList{8, 29, 99, 54, 1} << QStringList{"a", "b", "c", "d", "e"} << QStringLiteral("e") << false; - QTest::addRow("cmd4") << 75 << QList{BC::LesserThan, BC::LesserThan, BC::LesserThan} - << QList{8, 7} << QStringList{"a", "b", "c"} << QStringLiteral("c") << false; + QTest::addRow("cmd4") << 75 << QList{BC::LesserThan, BC::LesserThan, BC::LesserThan} << QList{8, 7} + << QStringList{"a", "b", "c"} << QStringLiteral("c") << false; - QTest::addRow("cmd5") << 2 << QList{BC::Different, BC::Different} << QList{1, 2} - << QStringList{"a", "b"} << QStringLiteral("a") << false; + QTest::addRow("cmd5") << 2 << QList{BC::Different, BC::Different} << QList{1, 2} << QStringList{"a", "b"} + << QStringLiteral("a") << false; QTest::addRow("cmd6") << 3 - << QList{BC::GreaterOrEqual, BC::GreaterOrEqual, BC::GreaterOrEqual, - BC::GreaterOrEqual} + << QList{BC::GreaterOrEqual, BC::GreaterOrEqual, BC::GreaterOrEqual, BC::GreaterOrEqual} << QList{1, 2, 3, 4} << QStringList{"a", "b", "c", "d"} << QStringLiteral("a,b,c") << false; - QTest::addRow("cmd7") << 3 - << QList{BC::LesserOrEqual, BC::LesserOrEqual, BC::LesserOrEqual, - BC::LesserOrEqual} + QTest::addRow("cmd7") << 3 << QList{BC::LesserOrEqual, BC::LesserOrEqual, BC::LesserOrEqual, BC::LesserOrEqual} << QList{1, 2, 3, 4} << QStringList{"a", "b", "c", "d"} << QStringLiteral("c") << true; } -- cgit v1.2.3-70-g09d2