feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++ Unit test: Fix diagnostics export test on Windows

Browse Source 
The file offsets are different because of CRLF line endings.

Change-Id: Ice859f3b279651b61d147bdd963f62897b090e47
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-09-18 16:41:49 +02:00
parent 485c3c25ac
commit e162775bde
5 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/unittest/data/clangtools/clang-analyzer.dividezero_win.yaml Normal file
View File

@@ -0,0 +1,23 @@
---
MainSourceFile: 'FILE_PATH'
Diagnostics:
- DiagnosticName: clang-analyzer-core.DivideZero
DiagnosticMessage:
Message: Division by zero
FilePath: 'FILE_PATH'
FileOffset: 183
Replacements: []
Notes:
- Message: 'Assuming ''z'' is equal to 0'
FilePath: 'FILE_PATH'
FileOffset: 160
Replacements: []
- Message: Taking true branch
FilePath: 'FILE_PATH'
FileOffset: 156
Replacements: []
- Message: Division by zero
FilePath: 'FILE_PATH'
FileOffset: 183
Replacements: []
...

10
tests/unit/unittest/data/clangtools/clang.unused-parameter_win.yaml Normal file
View File

@@ -0,0 +1,10 @@
---
MainSourceFile: 'FILE_PATH'
Diagnostics:
- DiagnosticName: clang-diagnostic-unused-parameter
DiagnosticMessage:
Message: 'unused parameter ''g'''
FilePath: 'FILE_PATH'
FileOffset: 156
Replacements: []
...

17
tests/unit/unittest/data/clangtools/clazy.qgetenv_win.yaml Normal file
View File

@@ -0,0 +1,17 @@
---
MainSourceFile: 'FILE_PATH'
Diagnostics:
- DiagnosticName: clazy-qgetenv
Message: 'qgetenv().isEmpty() allocates. Use qEnvironmentVariableIsEmpty() instead'
FileOffset: 156
FilePath: 'FILE_PATH'
Replacements:
- FilePath: 'FILE_PATH'
Offset: 156
Length: 7
ReplacementText: qEnvironmentVariableIsEmpty
- FilePath: 'FILE_PATH'
Offset: 169
Length: 11
ReplacementText: ')'
...

14
tests/unit/unittest/data/clangtools/tidy.modernize-use-nullptr_win.yaml Normal file
View File

@@ -0,0 +1,14 @@
---
MainSourceFile: 'FILE_PATH'
Diagnostics:
- DiagnosticName: modernize-use-nullptr
DiagnosticMessage:
Message: use nullptr
FilePath: 'FILE_PATH'
FileOffset: 151
Replacements:
- FilePath: 'FILE_PATH'
Offset: 151
Length: 1
ReplacementText: nullptr
...

20
tests/unit/unittest/readexporteddiagnostics-test.cpp
View File

@@ -101,10 +101,18 @@ TEST_F(ReadExportedDiagnostics, UnexpectedFileContents)
ASSERT_THAT(diags, IsEmpty());
}
static QString appendYamlSuffix(const char *filePathFragment)
{
const QString yamlSuffix = QLatin1String(Utils::HostOsInfo::isWindowsHost()
? "_win.yaml" : ".yaml");
return filePathFragment + yamlSuffix;
}
TEST_F(ReadExportedDiagnostics, Tidy)
{
const QString sourceFile = TESTDATA "tidy.modernize-use-nullptr.cpp";
const QString exportedFile = createFile(TESTDATA "tidy.modernize-use-nullptr.yaml", sourceFile);
const QString exportedFile = createFile(appendYamlSuffix(TESTDATA "tidy.modernize-use-nullptr"),
sourceFile);
Diagnostic expectedDiag;
expectedDiag.name = "modernize-use-nullptr";
expectedDiag.location = {sourceFile, 2, 25};
@@ -142,7 +150,10 @@ TEST_F(ReadExportedDiagnostics, AcceptDiagsFromFilePaths_None)
TEST_F(ReadExportedDiagnostics, Tidy_Clang)
{
const QString sourceFile = TESTDATA "clang.unused-parameter.cpp";
const QString exportedFile = createFile(TESTDATA "clang.unused-parameter.yaml", sourceFile);
const QString yamlSuffix
= QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "_win.yaml" : ".yaml");
const QString exportedFile = createFile(appendYamlSuffix(TESTDATA "clang.unused-parameter"),
sourceFile);
Diagnostic expectedDiag;
expectedDiag.name = "clang-diagnostic-unused-parameter";
expectedDiag.location = {sourceFile, 4, 12};
@@ -162,7 +173,8 @@ TEST_F(ReadExportedDiagnostics, Tidy_Clang)
TEST_F(ReadExportedDiagnostics, Tidy_ClangAnalyzer)
{
const QString sourceFile = TESTDATA "clang-analyzer.dividezero.cpp";
const QString exportedFile = createFile(TESTDATA "clang-analyzer.dividezero.yaml", sourceFile);
const QString exportedFile = createFile(appendYamlSuffix(TESTDATA "clang-analyzer.dividezero"),
sourceFile);
Diagnostic expectedDiag;
expectedDiag.name = "clang-analyzer-core.DivideZero";
expectedDiag.location = {sourceFile, 4, 15};
@@ -198,7 +210,7 @@ TEST_F(ReadExportedDiagnostics, Tidy_ClangAnalyzer)
TEST_F(ReadExportedDiagnostics, Clazy)
{
const QString sourceFile = TESTDATA "clazy.qgetenv.cpp";
const QString exportedFile = createFile(TESTDATA "clazy.qgetenv.yaml", sourceFile);
const QString exportedFile = createFile(appendYamlSuffix(TESTDATA "clazy.qgetenv"), sourceFile);
Diagnostic expectedDiag;
expectedDiag.name = "clazy-qgetenv";
expectedDiag.location = {sourceFile, 7, 5};