diff options
Diffstat (limited to 'src/tests/dice')
| -rw-r--r-- | src/tests/dice/tst_dice.cpp | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/src/tests/dice/tst_dice.cpp b/src/tests/dice/tst_dice.cpp index 77b4944..f6541d2 100644 --- a/src/tests/dice/tst_dice.cpp +++ b/src/tests/dice/tst_dice.cpp @@ -300,7 +300,8 @@ void TestDice::commandsTest() QVERIFY2(a, "parsing"); m_diceParser->start(); - QVERIFY2(m_diceParser->humanReadableError().isEmpty(), "no error"); + QVERIFY2(m_diceParser->humanReadableError().isEmpty(), + QString("Error: %1 - %2").arg(m_diceParser->humanReadableError(), cmd).toStdString().c_str()); QVERIFY2(m_diceParser->humanReadableWarning().isEmpty(), "no warning"); } @@ -321,7 +322,7 @@ void TestDice::commandsTest_data() QTest::addRow("cmd11") << "(4D6)D10"; QTest::addRow("cmd12") << "1D100a[>=95]a[>=96]a[>=97]a[>=98]a[>=99]e[>=100]"; QTest::addRow("cmd13") << "3D100"; - QTest::addRow("cmd14") << "4k3"; + // QTest::addRow("cmd14") << "4K3"; QTest::addRow("cmd15") << "10D10e[>=6]sc[>=6]"; QTest::addRow("cmd16") << "10D10e10s"; @@ -351,7 +352,7 @@ void TestDice::commandsTest_data() QTest::addRow("cmd50") << "10D10e[=1|=10]k4"; QTest::addRow("cmd51") << "1L[tete,bras droit,bras gauche,jambe droite,jambe " "gauche,ventre[6..7],buste[8..10]]"; - QTest::addRow("cmd52") << "10+10s"; + // QTest::addRow("cmd52") << "10+10s"; QTest::addRow("cmd53") << "1d6e6;1d4e4mk1"; QTest::addRow("cmd54") << "1d6e6;1d4e4mk1"; QTest::addRow("cmd55") << "400D20/400000"; @@ -494,7 +495,7 @@ void TestDice::scopeDF() m_diceParser->start(); auto results= m_diceParser->scalarResultsFromEachInstruction(); - for(auto const& result : qAsConst(results)) + for(auto const& result : std::as_const(results)) QVERIFY(result >= min && result <= max); } @@ -558,7 +559,7 @@ void TestDice::severalInstruction() results << 3; int i= 0; - for(auto const& cmd : qAsConst(commands)) + for(auto const& cmd : std::as_const(commands)) { auto test= m_diceParser->parseLine(cmd); QVERIFY2(test, cmd.toStdString().c_str()); @@ -1160,27 +1161,30 @@ void TestDice::ifCommandTest() QCOMPARE(results.size(), 1); auto result= results.first(); - auto it= std::find_if(level.begin(), level.end(), [compare, result](int level) { - if(compare == Dice::CompareOperator::GreaterOrEqual) - return result >= level; - else if(compare == Dice::CompareOperator::GreaterThan) - return result > level; - else if(compare == Dice::CompareOperator::LesserThan) - return result < level; - else if(compare == Dice::CompareOperator::LesserOrEqual) - return result <= level; - else if(compare == Dice::CompareOperator::Equal) - return qFuzzyCompare(result, level); - else // if(compare == BooleanCondition::Different) - return !qFuzzyCompare(result, level); - }); + auto it= std::find_if(level.begin(), level.end(), + [compare, result](int level) + { + if(compare == Dice::CompareOperator::GreaterOrEqual) + return result >= level; + else if(compare == Dice::CompareOperator::GreaterThan) + return result > level; + else if(compare == Dice::CompareOperator::LesserThan) + return result < level; + else if(compare == Dice::CompareOperator::LesserOrEqual) + return result <= level; + else if(compare == Dice::CompareOperator::Equal) + return qFuzzyCompare(result, level); + else // if(compare == BooleanCondition::Different) + return !qFuzzyCompare(result, level); + }); auto index= std::distance(level.begin(), it); auto strResultExpected= startExperted[index]; auto resultText= strResult; - QVERIFY2(resultText.startsWith(strResultExpected), "string result does not fit the expectation"); + QVERIFY2(resultText.startsWith(strResultExpected), + QString("string result does not fit the expectation %1").arg(cmd).toStdString().c_str()); } void TestDice::ifCommandTest_data() @@ -1260,7 +1264,7 @@ void TestDice::switchCaseTest() node1->setNextNode(node2); - node1->run(nullptr); + node1->execute(nullptr); auto result= node2->getResult(); auto stringResult= result->getStringResult(); |