Skip to content

Commit 759080b

Browse files
committed
TestAstUtils: changed a few isSameExpressionTest() asserts to TODO / added some TODOs about missing test coverage [skip ci]
1 parent 347b188 commit 759080b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

test/testastutils.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,13 @@ class TestAstUtils : public TestFixture {
179179
Library library;
180180
Tokenizer tokenizer(&settings, this);
181181
std::istringstream istr(code);
182-
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
182+
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line); // TODO: test with C
183183
const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), tokStr1, strlen(tokStr1));
184184
const Token * const tok2 = Token::findsimplematch(tok1->next(), tokStr2, strlen(tokStr2));
185-
return (isSameExpression)(false, false, tok1, tok2, library, false, true, nullptr);
185+
return (isSameExpression)(/*cpp*/ true, false, tok1, tok2, library, false, true, nullptr);
186186
}
187187

188+
// TODO: we used to tokenize this as C++ but check the expressions forcefully as C
188189
void isSameExpressionTest() {
189190
ASSERT_EQUALS(true, isSameExpression("x = 1 + 1;", "1", "1"));
190191
ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;", "1", "1u"));
@@ -196,11 +197,11 @@ class TestAstUtils : public TestFixture {
196197
ASSERT_EQUALS(false, isSameExpression("x < y;", "x", "y"));
197198
ASSERT_EQUALS(true, isSameExpression("(x + 1) < (x + 1);", "+", "+"));
198199
ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);", "+", "+"));
199-
ASSERT_EQUALS(true, isSameExpression("(1 + x) < (x + 1);", "+", "+"));
200+
TODO_ASSERT_EQUALS(true, false, isSameExpression("(1 + x) < (x + 1);", "+", "+"));
200201
ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);", "+", "+"));
201-
ASSERT_EQUALS(true, isSameExpression("(0.0 + x) < (x + 0x0p+0);", "+", "+"));
202+
TODO_ASSERT_EQUALS(true, false, isSameExpression("(0.0 + x) < (x + 0x0p+0);", "+", "+"));
202203
ASSERT_EQUALS(true, isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } ", "+", "+"));
203-
ASSERT_EQUALS(true, isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } ", "+", "+"));
204+
TODO_ASSERT_EQUALS(true, false, isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } ", "+", "+"));
204205
ASSERT_EQUALS(true, isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } ", "+", "+"));
205206
ASSERT_EQUALS(true, isSameExpression("A + A", "A", "A"));
206207

@@ -217,10 +218,10 @@ class TestAstUtils : public TestFixture {
217218
const Settings settings;
218219
Tokenizer tokenizer(&settings, this);
219220
std::istringstream istr(code);
220-
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
221+
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line); // TODO: test with C
221222
const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
222223
const Token * const tok2 = Token::findsimplematch(tokenizer.tokens(), endPattern, strlen(endPattern));
223-
return (isVariableChanged)(tok1, tok2, 1, false, &settings, true);
224+
return (isVariableChanged)(tok1, tok2, 1, false, &settings, /*cpp*/ true);
224225
}
225226

226227
void isVariableChangedTest() {
@@ -393,11 +394,11 @@ class TestAstUtils : public TestFixture {
393394
const Settings settings = settingsBuilder().library("std.cfg").build();
394395
Tokenizer tokenizer(&settings, this);
395396
std::istringstream istr(code);
396-
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
397+
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line); // TODO: test with C
397398
const Token* const start = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
398399
const Token* const end = Token::findsimplematch(start, endPattern, strlen(endPattern));
399400
const Token* const expr = Token::findsimplematch(tokenizer.tokens(), var, strlen(var));
400-
return (findExpressionChanged)(expr, start, end, &settings, true);
401+
return (findExpressionChanged)(expr, start, end, &settings, /*cpp*/ true);
401402
}
402403

403404
void isExpressionChangedTest()

0 commit comments

Comments
 (0)