walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

improved testing of calculations in valueflow

This commit is contained in:
Daniel Marjamäki 2015-07-26 12:00:42 +02:00
parent 8d3b5bb95e
commit f3b5857b96
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/testmathlib.cpp
View File

@ -569,8 +569,8 @@ private:
ASSERT_EQUALS(false, MathLib::isFloatHex("+0x"));
ASSERT_EQUALS(false, MathLib::isFloatHex("-0x"));
ASSERT_EQUALS(false, MathLib::isFloatHex("0x"));
ASSERT_EQUALS(false, MathLib::isFloatHex("0x."));
ASSERT_EQUALS(false, MathLib::isFloatHex("0XP"));
ASSERT_EQUALS(false, MathLib::isFloatHex("0x."));
ASSERT_EQUALS(false, MathLib::isFloatHex("0XP"));
ASSERT_EQUALS(false, MathLib::isFloatHex("0xx"));
}

14
test/testvalueflow.cpp
View File

@ -221,6 +221,20 @@ private:
void valueFlowCalculations() {
const char *code;
// Different operators
ASSERT_EQUALS(5, valueOfTok("3 + (a ? b : 2);", "+").intvalue);
ASSERT_EQUALS(1, valueOfTok("3 - (a ? b : 2);", "-").intvalue);
ASSERT_EQUALS(6, valueOfTok("3 * (a ? b : 2);", "*").intvalue);
ASSERT_EQUALS(6, valueOfTok("13 / (a ? b : 2);", "/").intvalue);
ASSERT_EQUALS(1, valueOfTok("13 % (a ? b : 2);", "%").intvalue);
ASSERT_EQUALS(0, valueOfTok("3 == (a ? b : 2);", "==").intvalue);
ASSERT_EQUALS(1, valueOfTok("3 != (a ? b : 2);", "!=").intvalue);
ASSERT_EQUALS(1, valueOfTok("3 > (a ? b : 2);", ">").intvalue);
ASSERT_EQUALS(1, valueOfTok("3 >= (a ? b : 2);", ">=").intvalue);
ASSERT_EQUALS(0, valueOfTok("3 < (a ? b : 2);", "<").intvalue);
ASSERT_EQUALS(0, valueOfTok("3 <= (a ? b : 2);", "<=").intvalue);
// calculation using 1,2 variables/values
code = "void f(int x) {\n"
" a = x+456;\n"
" if (x==123) {}"