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

TestRunner: Make sure no xml output is reported when running TestToken (#3015)

This commit is contained in:
Daniel Marjamäki 2012-01-06 09:03:23 +01:00
parent bd8c21fc6b
commit 73d9dc870e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/testtoken.cpp
View File

@ -97,6 +97,14 @@ private:
Tokenizer::deleteTokens(token); Tokenizer::deleteTokens(token);
} }
bool Match(const std::string &code, const std::string &pattern, unsigned int varid=0) {
const Settings settings;
Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
return Token::Match(tokenizer.tokens(), pattern.c_str(), varid);
}
void multiCompare() { void multiCompare() {
// Test for found // Test for found
ASSERT_EQUALS(1, Token::multiCompare("one|two", "one")); ASSERT_EQUALS(1, Token::multiCompare("one|two", "one"));
@ -416,7 +424,7 @@ private:
std::vector<std::string>::const_iterator test_op, test_ops_end = test_ops.end(); std::vector<std::string>::const_iterator test_op, test_ops_end = test_ops.end();
for (test_op = test_ops.begin(); test_op != test_ops_end; ++test_op) { for (test_op = test_ops.begin(); test_op != test_ops_end; ++test_op) {
ASSERT_EQUALS(true, Token::Match(givenACodeSampleToTokenize(*test_op).tokens(), "%op%")); ASSERT_EQUALS(true, Match(*test_op, "%op%"));
} }
// Negative test against other operators // Negative test against other operators
@ -426,7 +434,7 @@ private:
std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.end(); std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.end();
for (other_op = other_ops.begin(); other_op != other_ops_end; ++other_op) { for (other_op = other_ops.begin(); other_op != other_ops_end; ++other_op) {
ASSERT_EQUALS_MSG(false, Token::Match(givenACodeSampleToTokenize(*other_op).tokens(), "%op%"), "Failing other operator: " + *other_op); ASSERT_EQUALS_MSG(false, Match(*other_op, "%op%"), "Failing other operator: " + *other_op);
} }
} }