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

AutoTest: Rename outputReader() into createOutputReader()

Browse Source 
Make it clear it's a factory method that creates new instances
of objects, not a simple getter.

Change-Id: I0b44506a27a0353bc524831c305f947510f59e98
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-13 12:13:45 +01:00
parent bad66c1fc2
commit c9f5098c07
14 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/boost/boosttestconfiguration.cpp
View File

@@ -16,8 +16,8 @@
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
TestOutputReader *BoostTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *BoostTestConfiguration::createOutputReader(
Utils::QtcProcess *app) const const QFutureInterface<TestResultPtr> &fi, Utils::QtcProcess *app) const
{ {
auto settings = static_cast<BoostTestSettings *>(framework()->testSettings()); auto settings = static_cast<BoostTestSettings *>(framework()->testSettings());
return new BoostTestOutputReader(fi, app, buildDirectory(), projectFile(), return new BoostTestOutputReader(fi, app, buildDirectory(), projectFile(),

2
src/plugins/autotest/boost/boosttestconfiguration.h
View File

@@ -13,7 +13,7 @@ class BoostTestConfiguration : public DebuggableTestConfiguration
public: public:
explicit BoostTestConfiguration(ITestFramework *framework) explicit BoostTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {} : DebuggableTestConfiguration(framework) {}
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const override; Utils::QtcProcess *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;

2
src/plugins/autotest/catch/catchconfiguration.cpp
View File

@@ -14,7 +14,7 @@
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
TestOutputReader *CatchConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *CatchConfiguration::createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const Utils::QtcProcess *app) const
{ {
return new CatchOutputReader(fi, app, buildDirectory(), projectFile()); return new CatchOutputReader(fi, app, buildDirectory(), projectFile());

2
src/plugins/autotest/catch/catchconfiguration.h
View File

@@ -12,7 +12,7 @@ class CatchConfiguration : public DebuggableTestConfiguration
{ {
public: public:
CatchConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {} CatchConfiguration(ITestFramework *framework) : DebuggableTestConfiguration(framework) {}
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const override; Utils::QtcProcess *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;

2
src/plugins/autotest/ctest/ctestconfiguration.cpp
View File

@@ -13,7 +13,7 @@ CTestConfiguration::CTestConfiguration(ITestBase *testBase)
setDisplayName("CTest"); setDisplayName("CTest");
} }
TestOutputReader *CTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *CTestConfiguration::createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const Utils::QtcProcess *app) const
{ {
return new CTestOutputReader(fi, app, workingDirectory()); return new CTestOutputReader(fi, app, workingDirectory());

2
src/plugins/autotest/ctest/ctestconfiguration.h
View File

@@ -13,7 +13,7 @@ class CTestConfiguration final : public Autotest::TestToolConfiguration
public: public:
explicit CTestConfiguration(ITestBase *testBase); explicit CTestConfiguration(ITestBase *testBase);
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const final; Utils::QtcProcess *app) const final;
}; };

2
src/plugins/autotest/gtest/gtestconfiguration.cpp
View File

@@ -15,7 +15,7 @@
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
TestOutputReader *GTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *GTestConfiguration::createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const Utils::QtcProcess *app) const
{ {
return new GTestOutputReader(fi, app, buildDirectory(), projectFile()); return new GTestOutputReader(fi, app, buildDirectory(), projectFile());

2
src/plugins/autotest/gtest/gtestconfiguration.h
View File

@@ -14,7 +14,7 @@ public:
explicit GTestConfiguration(ITestFramework *framework) explicit GTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {} : DebuggableTestConfiguration(framework) {}
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const override; Utils::QtcProcess *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;

2
src/plugins/autotest/qtest/qttestconfiguration.cpp
View File

@@ -26,7 +26,7 @@ static QStringList quoteIfNeeded(const QStringList &testCases, bool debugMode)
}); });
} }
TestOutputReader *QtTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *QtTestConfiguration::createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const Utils::QtcProcess *app) const
{ {
auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings()); auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings());

2
src/plugins/autotest/qtest/qttestconfiguration.h
View File

@@ -13,7 +13,7 @@ class QtTestConfiguration : public DebuggableTestConfiguration
public: public:
explicit QtTestConfiguration(ITestFramework *framework) explicit QtTestConfiguration(ITestFramework *framework)
: DebuggableTestConfiguration(framework) {} : DebuggableTestConfiguration(framework) {}
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const override; Utils::QtcProcess *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;

4
src/plugins/autotest/quick/quicktestconfiguration.cpp
View File

@@ -21,8 +21,8 @@ QuickTestConfiguration::QuickTestConfiguration(ITestFramework *framework)
setMixedDebugging(true); setMixedDebugging(true);
} }
TestOutputReader *QuickTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *QuickTestConfiguration::createOutputReader(
Utils::QtcProcess *app) const const QFutureInterface<TestResultPtr> &fi, Utils::QtcProcess *app) const
{ {
auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings()); auto qtSettings = static_cast<QtTestSettings *>(framework()->testSettings());
const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value() const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput.value()

2
src/plugins/autotest/quick/quicktestconfiguration.h
View File

@@ -12,7 +12,7 @@ class QuickTestConfiguration : public DebuggableTestConfiguration
{ {
public: public:
explicit QuickTestConfiguration(ITestFramework *framework); explicit QuickTestConfiguration(ITestFramework *framework);
TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const override; Utils::QtcProcess *app) const override;
QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override; QStringList argumentsForTestRunner(QStringList *omitted = nullptr) const override;
Utils::Environment filteredEnvironment(const Utils::Environment &original) const override; Utils::Environment filteredEnvironment(const Utils::Environment &original) const override;

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

@@ -41,7 +41,7 @@ public:
bool hasExecutable() const; bool hasExecutable() const;
Utils::FilePath executableFilePath() const; Utils::FilePath executableFilePath() const;
virtual TestOutputReader *outputReader(const QFutureInterface<TestResultPtr> &fi, virtual TestOutputReader *createOutputReader(const QFutureInterface<TestResultPtr> &fi,
Utils::QtcProcess *app) const = 0; Utils::QtcProcess *app) const = 0;
virtual Utils::Environment filteredEnvironment(const Utils::Environment &original) const; virtual Utils::Environment filteredEnvironment(const Utils::Environment &original) const;

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

@@ -247,7 +247,7 @@ void TestRunner::scheduleNext()
setUpProcess(); setUpProcess();
QTC_ASSERT(m_currentProcess, onProcessDone(); return); QTC_ASSERT(m_currentProcess, onProcessDone(); return);
QTC_ASSERT(!m_currentOutputReader, delete m_currentOutputReader); QTC_ASSERT(!m_currentOutputReader, delete m_currentOutputReader);
m_currentOutputReader = m_currentConfig->outputReader(*m_fakeFutureInterface, m_currentProcess); m_currentOutputReader = m_currentConfig->createOutputReader(*m_fakeFutureInterface, m_currentProcess);
QTC_ASSERT(m_currentOutputReader, onProcessDone();return); QTC_ASSERT(m_currentOutputReader, onProcessDone();return);
connect(m_currentOutputReader, &TestOutputReader::newOutputLineAvailable, connect(m_currentOutputReader, &TestOutputReader::newOutputLineAvailable,
@@ -661,7 +661,7 @@ void TestRunner::debugTests()
m_futureWatcher.setFuture(futureInterface->future()); m_futureWatcher.setFuture(futureInterface->future());
if (useOutputProcessor) { if (useOutputProcessor) {
TestOutputReader *outputreader = config->outputReader(*futureInterface, nullptr); TestOutputReader *outputreader = config->createOutputReader(*futureInterface, nullptr);
outputreader->setId(inferior.command.executable().toString()); outputreader->setId(inferior.command.executable().toString());
connect(outputreader, &TestOutputReader::newOutputLineAvailable, connect(outputreader, &TestOutputReader::newOutputLineAvailable,
TestResultsPane::instance(), &TestResultsPane::addOutputLine); TestResultsPane::instance(), &TestResultsPane::addOutputLine);