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

AutoTest: Use using namespace Utils more often

Browse Source 
Change-Id: I9d20cd3496c4719d58a977f8fd53253c86d55463
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-01-16 15:00:15 +01:00
parent d05c5b7d07
commit bc3ebef7ce
41 changed files with 343 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -12,25 +12,27 @@
#include <QRegularExpression>
using namespace Utils;
namespace Autotest {
namespace Internal {
GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResult> &futureInterface,
Utils::QtcProcess *testApplication,
const Utils::FilePath &buildDirectory,
const Utils::FilePath &projectFile)
QtcProcess *testApplication,
const FilePath &buildDirectory,
const FilePath &projectFile)
: TestOutputReader(futureInterface, testApplication, buildDirectory)
, m_projectFile(projectFile)
{
if (m_testApplication) {
connect(m_testApplication, &Utils::QtcProcess::done, this, [this] {
connect(m_testApplication, &QtcProcess::done, this, [this] {
const int exitCode = m_testApplication->exitCode();
if (exitCode == 1 && !m_description.isEmpty()) {
createAndReportResult(Tr::tr("Running tests failed.\n %1\nExecutable: %2")
.arg(m_description).arg(id()), ResultType::MessageFatal);
}
// on Windows abort() will result in normal termination, but exit code will be set to 3
if (Utils::HostOsInfo::isWindowsHost() && exitCode == 3)
if (HostOsInfo::isWindowsHost() && exitCode == 3)
reportCrash();
});
}
@@ -156,7 +158,7 @@ void GTestOutputReader::processOutputLine(const QByteArray &outputLine)
TestResult testResult = createDefaultResult();
testResult.setResult(type);
testResult.setLine(match.captured(3).toInt());
const Utils::FilePath file = constructSourceFilePath(m_buildDir, match.captured(2));
const FilePath file = constructSourceFilePath(m_buildDir, match.captured(2));
if (file.exists())
testResult.setFileName(file);
testResult.setDescription(match.captured(4));
@@ -219,7 +221,7 @@ void GTestOutputReader::handleDescriptionAndReportResult(const TestResult &testR
result = createDefaultResult();
result.setResult(ResultType::MessageLocation);
result.setLine(innerMatch.captured(2).toInt());
const Utils::FilePath file = constructSourceFilePath(m_buildDir, innerMatch.captured(1));
const FilePath file = constructSourceFilePath(m_buildDir, innerMatch.captured(1));
if (file.exists())
result.setFileName(file);
resultDescription << output;