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

Enable 'Run This Test' for gtest items

Browse Source 
Change-Id: Ia0fb93a4bbc225c45352f0f818262f5b6ff9d6d6
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-12-09 14:09:49 +01:00
parent a88d3df334
commit b13373e45e
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/autotest/testnavigationwidget.cpp
View File

@@ -106,7 +106,9 @@ void TestNavigationWidget::contextMenuEvent(QContextMenuEvent *event)
const QString &unnamed = tr(Constants::UNNAMED_QUICKTESTS);
if ((type == TestTreeItem::TestFunction && index.parent().data().toString() != unnamed)
|| (type == TestTreeItem::TestClass && index.data().toString() != unnamed)
|| (type == TestTreeItem::TestDataTag)) {
|| (type == TestTreeItem::TestDataTag)
|| (type == TestTreeItem::GTestCase)
|| (type == TestTreeItem::GTestName)) {
runThisTest = new QAction(tr("Run This Test"), &menu);
runThisTest->setEnabled(enabled);
connect(runThisTest, &QAction::triggered,
@@ -251,7 +253,9 @@ void TestNavigationWidget::onRunThisTestTriggered()
TestTreeItem *item = static_cast<TestTreeItem *>(sourceIndex.internalPointer());
if (item->type() == TestTreeItem::TestClass || item->type() == TestTreeItem::TestFunction
|| item->type() == TestTreeItem::TestDataTag) {
|| item->type() == TestTreeItem::TestDataTag
|| item->type() == TestTreeItem::GTestCase
|| item->type() == TestTreeItem::GTestName) {
if (TestConfiguration *configuration = m_model->getTestConfiguration(item)) {
TestRunner *runner = TestRunner::instance();
runner->setSelectedTests( {configuration} );

20
plugins/autotest/testtreemodel.cpp
View File

@@ -461,6 +461,26 @@ TestConfiguration *TestTreeModel::getTestConfiguration(const TestTreeItem *item)
config->setProject(project);
break;
}
case TestTreeItem::GTestCase: {
if (int childCount = item->childCount()) {
config = new TestConfiguration(QString(),
QStringList(item->name() + QLatin1String(".*")));
config->setTestCaseCount(childCount);
config->setProFile(item->childItem(0)->mainFile());
config->setProject(project);
config->setTestType(TestConfiguration::GTest);
}
break;
}
case TestTreeItem::GTestName: {
const TestTreeItem *parent = item->parentItem();
config = new TestConfiguration(QString(),
QStringList(parent->name() + QLatin1Char('.') + item->name()));
config->setProFile(item->mainFile());
config->setProject(project);
config->setTestType(TestConfiguration::GTest);
break;
}
// not supported items
default:
return 0;