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

AutoTest: Small refactoring

Browse Source 
Rename function and parameter to better reflect what it is
and remove code that has been superseded some time ago.

Change-Id: Id7af2e916217b4da6c96f75bbe036fdc4b8d9ddc
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-08-08 12:34:19 +02:00
parent f36f04deba
commit 0ab5402d4c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/autotest/testrunner.cpp
View File

@@ -328,17 +328,14 @@ void TestRunner::prepareToRunTests(TestRunMode mode)
} }
} }
static QString firstTestCaseTarget(const TestConfiguration *config) static QString firstNonEmptyTestCaseTarget(const TestConfiguration *config)
{ {
for (const QString &internalTarget : config->internalTargets()) { return Utils::findOrDefault(config->internalTargets(), [](const QString &internalTarget) {
const QString buildTarget = internalTarget.split('|').first(); return !internalTarget.isEmpty();
if (!buildTarget.isEmpty()) });
return buildTarget;
}
return QString();
} }
static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &dialogDetail) static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &buildTargetKey)
{ {
using namespace ProjectExplorer; using namespace ProjectExplorer;
const Project *project = SessionManager::startupProject(); const Project *project = SessionManager::startupProject();
@@ -356,7 +353,7 @@ static ProjectExplorer::RunConfiguration *getRunConfiguration(const QString &dia
if (runConfigurations.size() == 1) if (runConfigurations.size() == 1)
return runConfigurations.first(); return runConfigurations.first();
RunConfigurationSelectionDialog dialog(dialogDetail, Core::ICore::dialogParent()); RunConfigurationSelectionDialog dialog(buildTargetKey, Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) { if (dialog.exec() == QDialog::Accepted) {
const QString dName = dialog.displayName(); const QString dName = dialog.displayName();
if (dName.isEmpty()) if (dName.isEmpty())
@@ -408,7 +405,7 @@ void TestRunner::runTests()
projectChanged = true; projectChanged = true;
toBeRemoved.append(config); toBeRemoved.append(config);
} else if (!config->hasExecutable()) { } else if (!config->hasExecutable()) {
if (auto rc = getRunConfiguration(firstTestCaseTarget(config))) if (auto rc = getRunConfiguration(firstNonEmptyTestCaseTarget(config)))
config->setOriginalRunConfiguration(rc); config->setOriginalRunConfiguration(rc);
else else
toBeRemoved.append(config); toBeRemoved.append(config);
@@ -482,7 +479,7 @@ void TestRunner::debugTests()
return; return;
} }
if (!config->hasExecutable()) { if (!config->hasExecutable()) {
if (auto *rc = getRunConfiguration(firstTestCaseTarget(config))) if (auto *rc = getRunConfiguration(firstNonEmptyTestCaseTarget(config)))
config->completeTestInformation(rc, TestRunMode::Debug); config->completeTestInformation(rc, TestRunMode::Debug);
} }
@@ -626,7 +623,7 @@ void TestRunner::onFinished()
/*************************************************************************************************/ /*************************************************************************************************/
RunConfigurationSelectionDialog::RunConfigurationSelectionDialog(const QString &testsInfo, RunConfigurationSelectionDialog::RunConfigurationSelectionDialog(const QString &buildTargetKey,
QWidget *parent) QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
@@ -634,8 +631,8 @@ RunConfigurationSelectionDialog::RunConfigurationSelectionDialog(const QString &
setWindowTitle(tr("Select Run Configuration")); setWindowTitle(tr("Select Run Configuration"));
QString details = tr("Could not determine which run configuration to choose for running tests"); QString details = tr("Could not determine which run configuration to choose for running tests");
if (!testsInfo.isEmpty()) if (!buildTargetKey.isEmpty())
details.append(QString(" (%1)").arg(testsInfo)); details.append(QString(" (%1)").arg(buildTargetKey));
m_details = new QLabel(details, this); m_details = new QLabel(details, this);
m_rcCombo = new QComboBox(this); m_rcCombo = new QComboBox(this);
m_executable = new QLabel(this); m_executable = new QLabel(this);

2
src/plugins/autotest/testrunner.h
View File

@@ -108,7 +108,7 @@ class RunConfigurationSelectionDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit RunConfigurationSelectionDialog(const QString &testsInfo, QWidget *parent = nullptr); explicit RunConfigurationSelectionDialog(const QString &buildTargetKey, QWidget *parent = nullptr);
QString displayName() const; QString displayName() const;
QString executable() const; QString executable() const;
private: private: