diff options
| author |   renaud guezennec <renaud@rolisteam.org> | 2019-07-12 21:00:42 +0000 |
|---|---|---|
| committer | renaud guezennec <renaud@rolisteam.org> | 2019-07-12 21:00:42 +0000 |
| commit | 5c2fbf1edc7547333739d3d643c4abee5ce6f942 (patch) | |
| tree | 6e9f4a709fd497fed1cf7f24bb2c3db421eb8711 /tests | |
| parent | 4f495aaaecb3118b835504e9bc1347f934aa49d1 (diff) | |
| parent | a3c3551815845cbc4bdf891b5f01406414abd4d2 (diff) | |
| download | OneRoll-5c2fbf1edc7547333739d3d643c4abee5ce6f942.tar.gz OneRoll-5c2fbf1edc7547333739d3d643c4abee5ce6f942.zip | |
Merge branch 'new_operator_and_fix' into 'master'
Value list node and occurence improvements
See merge request kde/rolisteam-diceparser!1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testnode.cpp | 1 | ||||
| -rw-r--r-- | tests/tst_dice.cpp | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tests/testnode.cpp b/tests/testnode.cpp index 263286b..de9fc05 100644 --- a/tests/testnode.cpp +++ b/tests/testnode.cpp @@ -10,6 +10,7 @@ TestNode::~TestNode() } void TestNode::run(ExecutionNode* previous) { + Q_UNUSED(previous) if(nullptr != m_nextNode) { m_nextNode->run(this); diff --git a/tests/tst_dice.cpp b/tests/tst_dice.cpp index 5d9efc0..81618ca 100644 --- a/tests/tst_dice.cpp +++ b/tests/tst_dice.cpp @@ -189,7 +189,6 @@ void TestDice::commandsTest() m_diceParser->start(); QVERIFY2(m_diceParser->humanReadableError().isEmpty(), "no error"); - QVERIFY2(m_diceParser->humanReadableWarning().isEmpty(), "no warning"); } @@ -261,6 +260,19 @@ void TestDice::commandsTest_data() QTest::addRow("cmd72") << "3d100g5"; QTest::addRow("cmd73") << "3d100g40"; QTest::addRow("cmd74") << "2d10k1+2d10k1+2d10k1"; + QTest::addRow("cmd75") << "2d10k1-2d10k1-2d10k1"; + QTest::addRow("cmd76") << "(2d10k1)-2d10k1-2d10k1"; + QTest::addRow("cmd77") << "2d10k1-(2d10k1)-2d10k1"; + QTest::addRow("cmd78") << "2d10k1-2d10k1-(2d10k1)"; + QTest::addRow("cmd79") << "1d6-2d6e6"; + QTest::addRow("cmd80") << "(1)-1d6e6"; + QTest::addRow("cmd81") << "(1)-(1d6e6)"; + QTest::addRow("cmd82") << "8d10o"; + QTest::addRow("cmd83") << "8d10o2,4"; + QTest::addRow("cmd84") << "8d10o2[>2]"; + QTest::addRow("cmd85") << "8d10ok2"; + QTest::addRow("cmd86") << "[100,200,300]k2"; + QTest::addRow("cmd87") << "100;200;300;[$1,$2,$3]k2"; } void TestDice::wrongCommandsTest() |