Skip to content

Token: removed need for test class friend declaration #8149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
firewave wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −16
Open

Token: removed need for test class friend declaration #8149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/token.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ enum class TokenDebug : std::uint8_t { None, ValueFlow, ValueType };
* The Token class also has other functions for management of token list, matching tokens, etc.
*/
class CPPCHECKLIB Token {
friend class TestToken;

public:
enum CppcheckAttributesType : std::uint8_t { LOW, HIGH };
Expand Down Expand Up @@ -916,6 +915,7 @@ class CPPCHECKLIB Token {
return tok->link();
}

protected:
/**
* Needle is build from multiple alternatives. If one of
* them is equal to haystack, return value is 1. If there
Expand Down
35 changes: 20 additions & 15 deletions test/testtoken.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ class TestToken : public TestFixture {
TestToken() : TestFixture("TestToken") {}

private:
class TokenTest final : public Token
{
friend class TestToken;
};

const TokenList list{settingsDefault, Standards::Language::C};

std::vector<std::string> arithmeticalOps;
Expand Down Expand Up @@ -165,77 +170,77 @@ class TestToken : public TestFixture {
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token one(list, std::move(tokensFrontBack));
one.str("one");
ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", 0));
ASSERT_EQUALS(1, TokenTest::multiCompare(&one, "one|two", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token two(list, std::move(tokensFrontBack));
two.str("two");
ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two", 0));
ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|two|", 0));
ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "one|two", 0));
ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "verybig|two|", 0));
}

// Test for empty string found
{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token notfound(list, std::move(tokensFrontBack));
notfound.str("notfound");
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", 0));
ASSERT_EQUALS(0, TokenTest::multiCompare(&notfound, "one|two|", 0));

// Test for not found
ASSERT_EQUALS(-1, Token::multiCompare(&notfound, "one|two", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&notfound, "one|two", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token s(list, std::move(tokensFrontBack));
s.str("s");
ASSERT_EQUALS(-1, Token::multiCompare(&s, "verybig|two", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&s, "verybig|two", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token ne(list, std::move(tokensFrontBack));
ne.str("ne");
ASSERT_EQUALS(-1, Token::multiCompare(&ne, "one|two", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&ne, "one|two", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token a(list, std::move(tokensFrontBack));
a.str("a");
ASSERT_EQUALS(-1, Token::multiCompare(&a, "abc|def", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&a, "abc|def", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token abcd(list, std::move(tokensFrontBack));
abcd.str("abcd");
ASSERT_EQUALS(-1, Token::multiCompare(&abcd, "abc|def", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&abcd, "abc|def", 0));
}

{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token def(list, std::move(tokensFrontBack));
def.str("default");
ASSERT_EQUALS(-1, Token::multiCompare(&def, "abc|def", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&def, "abc|def", 0));
}

// %op%
{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token plus(list, std::move(tokensFrontBack));
plus.str("+");
ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%", 0));
ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two", 0));
ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "one|%op%", 0));
ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "%op%|two", 0));
}
{
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token x(list, std::move(tokensFrontBack));
x.str("x");
ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%", 0));
ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "one|%op%", 0));
ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "%op%|two", 0));
}

}
Expand Down Expand Up @@ -314,7 +319,7 @@ class TestToken : public TestFixture {
auto tokensFrontBack = std::make_shared<TokensFrontBack>();
Token tok(list, std::move(tokensFrontBack));
tok.str("||");
ASSERT_EQUALS(true, Token::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
ASSERT_EQUALS(true, TokenTest::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
}

void charTypes() const {
Expand Down
Loading