Skip to content

Commit efae93f

Browse files
committed
test/cli/qml_test.py: improved asserts
1 parent 254d5b8 commit efae93f

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

test/cli/qml_test.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,28 @@
99

1010

1111
def test_unused_functions():
12-
ret, stdout, stderr = cppcheck(['--library=qt', '--enable=unusedFunction', PROJECT_DIR])
12+
ret, stdout, stderr = cppcheck(['--template=simple', '--library=qt', '--enable=unusedFunction', PROJECT_DIR])
1313
# there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
14-
assert '[unusedFunction]' in stderr
15-
assert 'fillSampleData' not in stderr
14+
assert stderr.splitlines() == [
15+
"QML-Samples-TableView/samplemodel.cpp:9:0: style: The function 'rowCount' is never used. [unusedFunction]",
16+
"QML-Samples-TableView/samplemodel.cpp:15:0: style: The function 'data' is never used. [unusedFunction]",
17+
"QML-Samples-TableView/samplemodel.cpp:38:0: style: The function 'roleNames' is never used. [unusedFunction]"
18+
]
19+
assert ret == 0, stdout
1620

1721

1822
@pytest.mark.xfail
1923
def test_unused_functions_j(tmpdir):
2024
build_dir = os.path.join(tmpdir, 'b1')
2125
os.mkdir(build_dir)
22-
ret, stdout, stderr = cppcheck(['--library=qt', '--enable=unusedFunction', '-j2', '--cppcheck-build-dir={}'.format(build_dir), PROJECT_DIR])
26+
ret, stdout, stderr = cppcheck(['--template=simple', '--library=qt', '--enable=unusedFunction', '-j2', '--cppcheck-build-dir={}'.format(build_dir), PROJECT_DIR])
2327
# there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
24-
assert '[unusedFunction]' in stderr
25-
assert 'fillSampleData' not in stderr
28+
assert stderr.splitlines() == [
29+
"QML-Samples-TableView/samplemodel.cpp:9:0: style: The function 'rowCount' is never used. [unusedFunction]",
30+
"QML-Samples-TableView/samplemodel.cpp:15:0: style: The function 'data' is never used. [unusedFunction]",
31+
"QML-Samples-TableView/samplemodel.cpp:38:0: style: The function 'roleNames' is never used. [unusedFunction]"
32+
]
33+
assert ret == 0, stdout
2634

2735
# TODO: test with project file
2836
# TODO: test with FileSettings

0 commit comments

Comments
 (0)