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

AutoTest: Replace some scary wording

Browse Source 
Change-Id: If8c45824c80ed6dd2da5874af56e61ab7abb3305
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-09-21 09:10:54 +02:00
parent d3d47dd521
commit f350c4d1d4
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/howto/creator-only/creator-autotest.qdoc
View File

@@ -391,7 +391,7 @@
\uicontrol {Limit result output} check box. To disable automatic scrolling,
deselect the \uicontrol {Automatically scroll results} check box.
Internal messages and run configuration warnings for guessed configurations
Internal messages and run configuration warnings for deduced configurations
are omitted by default. To view them, deselect the \uicontrol {Omit internal
messages} and \uicontrol {Omit run configuration warnings} check boxes.
*/

12
src/plugins/autotest/testconfiguration.cpp
View File

@@ -151,11 +151,11 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
if (targetInfo.targetFilePath.isEmpty()) {
qCDebug(LOG) << "BuildTargetInfos";
const QList<BuildTargetInfo> buildTargets = target->applicationTargets().list;
// if there is only one build target just use it (but be honest that we're guessing)
// if there is only one build target just use it (but be honest that we're deducing)
if (buildTargets.size() == 1) {
targetInfo = buildTargets.first();
m_guessedConfiguration = true;
m_guessedFrom = targetInfo.buildKey;
m_deducedConfiguration = true;
m_deducedFrom = targetInfo.buildKey;
}
}
@@ -223,8 +223,8 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
if (isLocal(rc)) { // FIXME for now only Desktop support
const Runnable runnable = rc->runnable();
m_runnable.environment = runnable.environment;
m_guessedConfiguration = true;
m_guessedFrom = rc->displayName();
m_deducedConfiguration = true;
m_deducedFrom = rc->displayName();
if (runMode == TestRunMode::Debug)
m_runConfig = new TestRunConfiguration(rc->target(), this);
} else {
@@ -234,7 +234,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
}
}
if (m_displayName.isEmpty()) // happens e.g. when guessing the TestConfiguration or error
if (m_displayName.isEmpty()) // happens e.g. when deducing the TestConfiguration or error
m_displayName = (*buildSystemTargets.begin());
}

8
src/plugins/autotest/testconfiguration.h
View File

@@ -84,8 +84,8 @@ public:
ProjectExplorer::RunConfiguration *originalRunConfiguration() const { return m_origRunConfig; }
TestRunConfiguration *runConfiguration() const { return m_runConfig; }
bool hasExecutable() const;
bool isGuessed() const { return m_guessedConfiguration; }
QString runConfigDisplayName() const { return m_guessedConfiguration ? m_guessedFrom
bool isDeduced() const { return m_deducedConfiguration; }
QString runConfigDisplayName() const { return m_deducedConfiguration ? m_deducedFrom
: m_displayName; }
ProjectExplorer::Runnable runnable() const { return m_runnable; }
@@ -99,9 +99,9 @@ private:
QString m_projectFile;
QString m_buildDir;
QString m_displayName;
QString m_guessedFrom;
QString m_deducedFrom;
QPointer<ProjectExplorer::Project> m_project;
bool m_guessedConfiguration = false;
bool m_deducedConfiguration = false;
TestRunConfiguration *m_runConfig = nullptr;
QSet<QString> m_buildTargets;
ProjectExplorer::RunConfiguration *m_origRunConfig = nullptr;

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

@@ -138,8 +138,8 @@ static QString processInformation(const QProcess *proc)
static QString rcInfo(const TestConfiguration * const config)
{
QString info = '\n' + TestRunner::tr("Run configuration:") + ' ';
if (config->isGuessed())
info += TestRunner::tr("guessed from");
if (config->isDeduced())
info += TestRunner::tr("deduced from");
return info + " \"" + config->runConfigDisplayName() + '"';
}
@@ -406,11 +406,11 @@ int TestRunner::precheckTestConfigurations()
config->completeTestInformation(TestRunMode::Run);
if (config->project()) {
testCaseCount += config->testCaseCount();
if (!omitWarnings && config->isGuessed()) {
if (!omitWarnings && config->isDeduced()) {
QString message = tr(
"Project's run configuration was guessed for \"%1\".\n"
"Project's run configuration was deduced for \"%1\".\n"
"This might cause trouble during execution.\n"
"(guessed from \"%2\")");
"(deduced from \"%2\")");
message = message.arg(config->displayName()).arg(config->runConfigDisplayName());
emit testResultReady(
TestResultPtr(new FaultyTestResult(Result::MessageWarn, message)));

2
src/plugins/autotest/testsettingspage.ui
View File

@@ -40,7 +40,7 @@
<item>
<widget class="QCheckBox" name="omitRunConfigWarnCB">
<property name="toolTip">
<string>Hides warnings related to a guessed run configuration.</string>
<string>Hides warnings related to a deduced run configuration.</string>
</property>
<property name="text">
<string>Omit run configuration warnings</string>