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

AutoTest: Support multiple test cases for Qt

Browse Source 
Multiple testcases inside a single executable are not
supported officially, but widely used.
Detect them and handle them as appropriate as possible.
Single test functions or data tags are not selectable
as they cannot get addressed correctly and rely
strongly on the implementation of the test main.

Fixes: QTCREATORBUG-18347
Change-Id: I0f0f42579709d8896e034a6df356cb560291d2ba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-04-23 13:40:46 +02:00
parent 0147fdfc8c
commit 615b37193b
8 changed files with 146 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/autotest/qtest/qttestparser.h
View File

@@ -27,6 +27,7 @@
#include "../itestparser.h"
#include "qttest_utils.h"
#include "qttesttreeitem.h"
#include <utils/optional.h>
@@ -42,9 +43,12 @@ public:
explicit QtTestParseResult(ITestFramework *framework) : TestParseResult(framework) {}
void setInherited(bool inherited) { m_inherited = inherited; }
bool inherited() const { return m_inherited; }
void setRunsMultipleTestcases(bool multi) { m_multiTest = multi; }
bool runsMultipleTestcases() const { return m_multiTest; }
TestTreeItem *createTestTreeItem() const override;
private:
bool m_inherited = false;
bool m_multiTest = false;
};
class QtTestParser : public CppParser
@@ -58,8 +62,8 @@ public:
const Utils::FilePath &fileName) override;
private:
QString testClass(const CppTools::CppModelManager *modelManager,
const Utils::FilePath &fileName) const;
TestCases testCases(const CppTools::CppModelManager *modelManager,
const Utils::FilePath &fileName) const;
QHash<QString, QtTestCodeLocationList> checkForDataTags(const QString &fileName) const;
struct TestCaseData {
Utils::FilePath fileName;
@@ -67,6 +71,7 @@ private:
int column = 0;
QMap<QString, QtTestCodeLocationAndType> testFunctions;
QHash<QString, QtTestCodeLocationList> dataTags;
bool multipleTestCases = false;
bool valid = false;
};
@@ -75,7 +80,7 @@ private:
TestCaseData &data) const;
QtTestParseResult *createParseResult(const QString &testCaseName, const TestCaseData &data,
const QString &projectFile) const;
QHash<Utils::FilePath, QString> m_testCaseNames;
QHash<Utils::FilePath, TestCases> m_testCases;
QMultiHash<Utils::FilePath, Utils::FilePath> m_alternativeFiles;
};