Skip to content

TestTokenList: small cleanup #7514

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

Merged
firewave merged 1 commit into from
May 9, 2025
Merged

TestTokenList: small cleanup #7514

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
14 changes: 5 additions & 9 deletions test/testtokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,10 @@

class TestTokenList : public TestFixture {
public:
TestTokenList() : TestFixture("TestTokenList") {
settings.enforcedLang = Standards::Language::C;
}
TestTokenList() : TestFixture("TestTokenList")
{}

private:
/*const*/ Settings settings;

void run() override {
TEST_CASE(testaddtoken1);
TEST_CASE(testaddtoken2);
Expand All @@ -55,15 +52,14 @@ class TestTokenList : public TestFixture {
// inspired by #5895
void testaddtoken1() const {
const std::string code = "0x89504e470d0a1a0a";
TokenList tokenlist(settings, Standards::Language::CPP);
TokenList tokenlist(settingsDefault, Standards::Language::CPP);
tokenlist.addtoken(code, 1, 1, false);
ASSERT_EQUALS("0x89504e470d0a1a0a", tokenlist.front()->str());
}

void testaddtoken2() const {
const std::string code = "0xF0000000";
/*const*/ Settings settings1 = settings;
settings1.platform.int_bit = 32;
const Settings settings1 = dinit(Settings, $.platform.int_bit = 32);
TokenList tokenlist(settings1, Standards::Language::CPP);
tokenlist.addtoken(code, 1, 1, false);
ASSERT_EQUALS("0xF0000000", tokenlist.front()->str());
Expand Down Expand Up @@ -174,7 +170,7 @@ class TestTokenList : public TestFixture {
void ast1() const {
const std::string s = "('Release|x64' == 'Release|x64');";

TokenList tokenlist(settings, Standards::Language::C);
TokenList tokenlist(settingsDefault, Standards::Language::C);
std::istringstream istr(s);
ASSERT(tokenlist.createTokens(istr));
// TODO: put this logic in TokenList
Expand Down
Loading