Skip to content

Commit 4b68aff

Browse files
committed
testrunner: added missing TokenList::createTokens() checks
1 parent e917529 commit 4b68aff

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

test/testlibrary.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class TestLibrary : public TestFixture {
162162

163163
TokenList tokenList(&settings);
164164
std::istringstream istr("foo();"); // <- too few arguments, not library function
165-
tokenList.createTokens(istr, Standards::Language::CPP);
165+
ASSERT(tokenList.createTokens(istr, Standards::Language::CPP));
166166
Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
167167
tokenList.createAst();
168168

@@ -186,7 +186,7 @@ class TestLibrary : public TestFixture {
186186
{
187187
TokenList tokenList(&settings);
188188
std::istringstream istr("foo();"); // <- too few arguments, not library function
189-
tokenList.createTokens(istr, Standards::Language::CPP);
189+
ASSERT(tokenList.createTokens(istr, Standards::Language::CPP));
190190
Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
191191
tokenList.createAst();
192192

@@ -195,7 +195,7 @@ class TestLibrary : public TestFixture {
195195
{
196196
TokenList tokenList(&settings);
197197
std::istringstream istr("foo(a);"); // <- library function
198-
tokenList.createTokens(istr, Standards::Language::CPP);
198+
ASSERT(tokenList.createTokens(istr, Standards::Language::CPP));
199199
Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
200200
tokenList.createAst();
201201

@@ -204,7 +204,7 @@ class TestLibrary : public TestFixture {
204204
{
205205
TokenList tokenList(&settings);
206206
std::istringstream istr("foo(a, b);"); // <- library function
207-
tokenList.createTokens(istr, Standards::Language::CPP);
207+
ASSERT(tokenList.createTokens(istr, Standards::Language::CPP));
208208
Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
209209
tokenList.createAst();
210210

@@ -213,7 +213,7 @@ class TestLibrary : public TestFixture {
213213
{
214214
TokenList tokenList(&settings);
215215
std::istringstream istr("foo(a, b, c);"); // <- too much arguments, not library function
216-
tokenList.createTokens(istr, Standards::Language::CPP);
216+
ASSERT(tokenList.createTokens(istr, Standards::Language::CPP));
217217
Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
218218
tokenList.createAst();
219219

test/testsimplifytemplate.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5290,7 +5290,8 @@ class TestSimplifyTemplate : public TestFixture {
52905290
Tokenizer tokenizer(settings, this);
52915291

52925292
std::istringstream istr(code);
5293-
tokenizer.list.createTokens(istr, "test.cpp");
5293+
if (!tokenizer.list.createTokens(istr, "test.cpp"))
5294+
return false;
52945295
tokenizer.createLinks();
52955296
tokenizer.splitTemplateRightAngleBrackets(false);
52965297

@@ -5357,7 +5358,8 @@ class TestSimplifyTemplate : public TestFixture {
53575358
Tokenizer tokenizer(settings, this);
53585359

53595360
std::istringstream istr(code);
5360-
tokenizer.list.createTokens(istr, "test.cpp");
5361+
if (!tokenizer.list.createTokens(istr, "test.cpp"))
5362+
return false;
53615363
tokenizer.createLinks();
53625364
tokenizer.splitTemplateRightAngleBrackets(false);
53635365

@@ -5427,7 +5429,8 @@ class TestSimplifyTemplate : public TestFixture {
54275429
Tokenizer tokenizer(settings, this);
54285430

54295431
std::istringstream istr(code);
5430-
tokenizer.list.createTokens(istr, "test.cpp");
5432+
if (!tokenizer.list.createTokens(istr, "test.cpp"))
5433+
return false;
54315434
tokenizer.createLinks();
54325435
tokenizer.splitTemplateRightAngleBrackets(false);
54335436

@@ -5456,7 +5459,8 @@ class TestSimplifyTemplate : public TestFixture {
54565459
Tokenizer tokenizer(settings, this);
54575460

54585461
std::istringstream istr(code);
5459-
tokenizer.list.createTokens(istr, "test.cpp");
5462+
if (!tokenizer.list.createTokens(istr, "test.cpp"))
5463+
return false;
54605464
tokenizer.createLinks();
54615465
tokenizer.splitTemplateRightAngleBrackets(false);
54625466

test/testsimplifytypedef.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ class TestSimplifyTypedef : public TestFixture {
255255
Tokenizer tokenizer(settings1, this);
256256

257257
std::istringstream istr(code);
258-
tokenizer.list.createTokens(istr, Standards::Language::CPP);
258+
if (!tokenizer.list.createTokens(istr, Standards::Language::CPP))
259+
return "";
259260
tokenizer.createLinks();
260261
tokenizer.simplifyTypedef();
261262

@@ -296,7 +297,8 @@ class TestSimplifyTypedef : public TestFixture {
296297
Tokenizer tokenizer(settings1, this);
297298

298299
std::istringstream istr(code);
299-
tokenizer.list.createTokens(istr, "file.c");
300+
if (!tokenizer.list.createTokens(istr, "file.c"))
301+
return "";
300302
tokenizer.createLinks();
301303
tokenizer.simplifyTypedef();
302304
try {
@@ -4157,7 +4159,7 @@ class TestSimplifyTypedef : public TestFixture {
41574159

41584160
Tokenizer tokenizer(settings1, this);
41594161
std::istringstream istr(code);
4160-
tokenizer.list.createTokens(istr, "file.c");
4162+
ASSERT(tokenizer.list.createTokens(istr, "file.c"));
41614163
tokenizer.createLinks();
41624164
tokenizer.simplifyTypedef();
41634165

test/testtokenlist.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class TestTokenList : public TestFixture {
121121
const Settings s = settingsBuilder().c(Standards::C89).build();
122122
TokenList tokenlist(&s);
123123
std::istringstream istr(code2);
124-
tokenlist.createTokens(istr, "a.c");
124+
ASSERT(tokenlist.createTokens(istr, "a.c"));
125125
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
126126
}
127127

@@ -142,7 +142,7 @@ class TestTokenList : public TestFixture {
142142
const Settings s = settingsBuilder().cpp(Standards::CPP03).build();
143143
TokenList tokenlist(&s);
144144
std::istringstream istr(code2);
145-
tokenlist.createTokens(istr, "a.cpp");
145+
ASSERT(tokenlist.createTokens(istr, "a.cpp"));
146146
ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
147147
}
148148
}

0 commit comments

Comments
 (0)