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

AutoTest: Rename internally used struct

Browse Source 
Change-Id: Ibf6d1f11c8d4cf77b44aded3aae212b84b492bcb
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-05-21 10:14:55 +02:00
parent 6189745a3b
commit d1e00284a8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/autotest/gtest/gtesttreeitem.cpp
View File

@@ -191,7 +191,7 @@ TestConfiguration *GTestTreeItem::debugConfiguration() const
return config; return config;
} }
struct TestCases struct GTestCases
{ {
QStringList filters; QStringList filters;
int testSetCount = 0; int testSetCount = 0;
@@ -199,7 +199,7 @@ struct TestCases
}; };
static void collectTestInfo(const GTestTreeItem *item, static void collectTestInfo(const GTestTreeItem *item,
QHash<QString, TestCases> &testCasesForProFile, QHash<QString, GTestCases> &testCasesForProFile,
bool ignoreCheckState) bool ignoreCheckState)
{ {
QTC_ASSERT(item, return); QTC_ASSERT(item, return);
@@ -239,7 +239,7 @@ QList<TestConfiguration *> GTestTreeItem::getTestConfigurations(bool ignoreCheck
if (!project || type() != Root) if (!project || type() != Root)
return result; return result;
QHash<QString, TestCases> testCasesForProFile; QHash<QString, GTestCases> testCasesForProFile;
for (int row = 0, count = childCount(); row < count; ++row) { for (int row = 0, count = childCount(); row < count; ++row) {
auto child = static_cast<const GTestTreeItem *>(childAt(row)); auto child = static_cast<const GTestTreeItem *>(childAt(row));
collectTestInfo(child, testCasesForProFile, ignoreCheckState); collectTestInfo(child, testCasesForProFile, ignoreCheckState);
@@ -278,14 +278,14 @@ QList<TestConfiguration *> GTestTreeItem::getTestConfigurationsForFile(const Uti
if (!project || type() != Root) if (!project || type() != Root)
return result; return result;
QHash<QString, TestCases> testCases; QHash<QString, GTestCases> testCases;
const QString &file = fileName.toString(); const QString &file = fileName.toString();
forAllChildren([&testCases, &file](TestTreeItem *node) { forAllChildren([&testCases, &file](TestTreeItem *node) {
if (node->type() == Type::TestCase && node->filePath() == file) { if (node->type() == Type::TestCase && node->filePath() == file) {
QTC_ASSERT(node->parentItem(), return); QTC_ASSERT(node->parentItem(), return);
const GTestTreeItem *testCase = static_cast<GTestTreeItem *>(node->parentItem()); const GTestTreeItem *testCase = static_cast<GTestTreeItem *>(node->parentItem());
QTC_ASSERT(testCase->type() == Type::TestSuite, return); QTC_ASSERT(testCase->type() == Type::TestSuite, return);
TestCases &cases = testCases[testCase->proFile()]; GTestCases &cases = testCases[testCase->proFile()];
cases.filters.append( cases.filters.append(
gtestFilter(testCase->state()).arg(testCase->name(), node->name())); gtestFilter(testCase->state()).arg(testCase->name(), node->name()));
cases.internalTargets.unite(node->internalTargets()); cases.internalTargets.unite(node->internalTargets());