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

Add 'Run This Test' capability to data tags

Browse Source 
Change-Id: I3eb99f0a0652053cb05a3457a37ff335bab5580b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-08-18 10:19:28 +02:00
parent e092c5b51d
commit 0d114c602d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/autotest/testnavigationwidget.cpp
View File

@@ -103,7 +103,8 @@ void TestNavigationWidget::contextMenuEvent(QContextMenuEvent *event)
int type = index.data(TypeRole).toInt(); int type = index.data(TypeRole).toInt();
const QString &unnamed = tr(Constants::UNNAMED_QUICKTESTS); const QString &unnamed = tr(Constants::UNNAMED_QUICKTESTS);
if ((type == TestTreeItem::TEST_FUNCTION && index.parent().data().toString() != unnamed) if ((type == TestTreeItem::TEST_FUNCTION && index.parent().data().toString() != unnamed)
|| (type == TestTreeItem::TEST_CLASS && index.data().toString() != unnamed)) { || (type == TestTreeItem::TEST_CLASS && index.data().toString() != unnamed)
|| (type == TestTreeItem::TEST_DATATAG)) {
runThisTest = new QAction(tr("Run This Test"), &menu); runThisTest = new QAction(tr("Run This Test"), &menu);
runThisTest->setEnabled(enabled); runThisTest->setEnabled(enabled);
connect(runThisTest, &QAction::triggered, connect(runThisTest, &QAction::triggered,
@@ -247,7 +248,8 @@ void TestNavigationWidget::onRunThisTestTriggered()
return; return;
TestTreeItem *item = static_cast<TestTreeItem *>(sourceIndex.internalPointer()); TestTreeItem *item = static_cast<TestTreeItem *>(sourceIndex.internalPointer());
if (item->type() == TestTreeItem::TEST_CLASS || item->type() == TestTreeItem::TEST_FUNCTION) { if (item->type() == TestTreeItem::TEST_CLASS || item->type() == TestTreeItem::TEST_FUNCTION
|| item->type() == TestTreeItem::TEST_DATATAG) {
if (TestConfiguration *configuration = m_model->getTestConfiguration(item)) { if (TestConfiguration *configuration = m_model->getTestConfiguration(item)) {
TestRunner *runner = TestRunner::instance(); TestRunner *runner = TestRunner::instance();
runner->setSelectedTests( {configuration} ); runner->setSelectedTests( {configuration} );

11
plugins/autotest/testtreemodel.cpp
View File

@@ -558,6 +558,17 @@ TestConfiguration *TestTreeModel::getTestConfiguration(const TestTreeItem *item)
} }
break; break;
} }
case TestTreeItem::TEST_DATATAG: {
const TestTreeItem *function = item->parent();
const TestTreeItem *parent = function ? function->parent() : 0;
if (!parent)
return 0;
const QString functionWithTag = function->name() + QLatin1Char(':') + item->name();
config = new TestConfiguration(parent->name(), QStringList() << functionWithTag);
config->setMainFilePath(parent->filePath());
config->setProject(project);
break;
}
// not supported items // not supported items
default: default:
return 0; return 0;