summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2023-05-03 16:00:22 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2023-05-04 05:52:16 +0000
commit470c95c94be58905bc3202d3b58175add5f576fa (patch)
tree992c0eea5e7e88f4599a533d2bcbf4bfac472cd9 /tests
parente5051bbfdef896ece974a949a392de7337284bf0 (diff)
downloadqt-creator-470c95c94be58905bc3202d3b58175add5f576fa.tar.gz
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/utils/commandline/tst_commandline.cpp2
-rw-r--r--tests/auto/utils/deviceshell/tst_deviceshell.cpp4
-rw-r--r--tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp8
-rw-r--r--tests/auto/utils/qtcprocess/processtestapp/processtestapp.h4
-rw-r--r--tests/auto/utils/qtcprocess/tst_qtcprocess.cpp58
-rw-r--r--tests/manual/deviceshell/tst_deviceshell.cpp2
6 files changed, 39 insertions, 39 deletions
diff --git a/tests/auto/utils/commandline/tst_commandline.cpp b/tests/auto/utils/commandline/tst_commandline.cpp
index 6972ae6ba3..c20eb48db9 100644
--- a/tests/auto/utils/commandline/tst_commandline.cpp
+++ b/tests/auto/utils/commandline/tst_commandline.cpp
@@ -30,7 +30,7 @@ private:
QString run(const CommandLine &cmd)
{
- QtcProcess p;
+ Process p;
p.setCommand(cmd);
p.setEnvironment(testEnv);
p.runBlocking();
diff --git a/tests/auto/utils/deviceshell/tst_deviceshell.cpp b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
index 1d95bde409..f94d0dc5b4 100644
--- a/tests/auto/utils/deviceshell/tst_deviceshell.cpp
+++ b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
@@ -28,7 +28,7 @@ public:
}
private:
- void setupShellProcess(QtcProcess *shellProcess) override
+ void setupShellProcess(Process *shellProcess) override
{
shellProcess->setCommand(m_cmdLine);
}
@@ -38,7 +38,7 @@ private:
bool testDocker(const FilePath &executable)
{
- QtcProcess p;
+ Process p;
p.setCommand({executable, {"info", "--format", "{{.OSType}}"}});
p.runBlocking();
const QString platform = p.cleanedStdOut().trimmed();
diff --git a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp
index 0884ab44a7..1fa73a9475 100644
--- a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp
+++ b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.cpp
@@ -77,7 +77,7 @@ SubProcessConfig::SubProcessConfig(const char *envVar, const QString &envVal)
{
}
-void SubProcessConfig::setupSubProcess(QtcProcess *subProcess) const
+void SubProcessConfig::setupSubProcess(Process *subProcess) const
{
subProcess->setEnvironment(m_environment);
const FilePath filePath = FilePath::fromString(s_pathToProcessTestApp
@@ -148,7 +148,7 @@ int ProcessTestApp::ChannelForwarding::main()
qunsetenv(envVar());
SubProcessConfig subConfig(StandardOutputAndErrorWriter::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.setProcessChannelMode(channelMode);
@@ -206,7 +206,7 @@ int ProcessTestApp::RecursiveCrashingProcess::main()
return 1;
}
SubProcessConfig subConfig(envVar(), QString::number(currentDepth - 1));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
process.waitForFinished();
@@ -249,7 +249,7 @@ int ProcessTestApp::RecursiveBlockingProcess::main()
}
}
SubProcessConfig subConfig(envVar(), QString::number(currentDepth - 1));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.setProcessChannelMode(QProcess::ForwardedChannels);
process.start();
diff --git a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.h b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.h
index d529ac8265..721ab83ae7 100644
--- a/tests/auto/utils/qtcprocess/processtestapp/processtestapp.h
+++ b/tests/auto/utils/qtcprocess/processtestapp/processtestapp.h
@@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE
class QProcess;
QT_END_NAMESPACE
-namespace Utils { class QtcProcess; }
+namespace Utils { class Process; }
#define SUB_PROCESS(SubProcessClass)\
class SubProcessClass\
@@ -72,7 +72,7 @@ class SubProcessConfig
{
public:
SubProcessConfig(const char *envVar, const QString &envVal);
- void setupSubProcess(Utils::QtcProcess *subProcess) const;
+ void setupSubProcess(Utils::Process *subProcess) const;
void setupSubProcess(QProcess *subProcess) const;
static void setPathToProcessTestApp(const QString &path);
diff --git a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
index bd8bb58af2..1bc1778237 100644
--- a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
+++ b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
@@ -109,7 +109,7 @@ private slots:
qDebug() << "QProcess output:" << qoutput;
QCOMPARE(qproc.exitCode(), 0);
- QtcProcess qtcproc;
+ Process qtcproc;
qtcproc.setCommand({envPath, {}});
qtcproc.runBlocking();
QCOMPARE(qtcproc.exitCode(), 0);
@@ -250,7 +250,7 @@ void tst_QtcProcess::multiRead()
QSKIP("This test uses /bin/sh.");
QByteArray buffer;
- QtcProcess process;
+ Process process;
process.setCommand({"/bin/sh", {}});
process.setProcessChannelMode(QProcess::SeparateChannels);
@@ -902,7 +902,7 @@ void tst_QtcProcess::exitCode()
SubProcessConfig subConfig(ProcessTestApp::ExitCode::envVar(), QString::number(exitCode));
{
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
const bool finished = process.waitForFinished();
@@ -912,7 +912,7 @@ void tst_QtcProcess::exitCode()
QCOMPARE(process.exitCode() == 0, process.result() == ProcessResult::FinishedWithSuccess);
}
{
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.runBlocking();
@@ -949,7 +949,7 @@ void tst_QtcProcess::runBlockingStdOut()
QFETCH(ProcessResult, expectedResult);
SubProcessConfig subConfig(ProcessTestApp::RunBlockingStdOut::envVar(), withEndl ? "true" : "false");
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.setTimeoutS(timeOutS);
@@ -980,13 +980,13 @@ void tst_QtcProcess::runBlockingSignal()
QFETCH(ProcessResult, expectedResult);
SubProcessConfig subConfig(ProcessTestApp::RunBlockingStdOut::envVar(), withEndl ? "true" : "false");
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.setTimeoutS(timeOutS);
bool readLastLine = false;
process.setTextChannelMode(Channel::Output, TextChannelMode::MultiLine);
- connect(&process, &QtcProcess::textOnStandardOutput,
+ connect(&process, &Process::textOnStandardOutput,
this, [&readLastLine, &process](const QString &out) {
if (out.startsWith(s_runBlockingStdOutSubProcessMagicWord)) {
readLastLine = true;
@@ -1004,7 +1004,7 @@ void tst_QtcProcess::runBlockingSignal()
void tst_QtcProcess::lineCallback()
{
SubProcessConfig subConfig(ProcessTestApp::LineCallback::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
const QStringList lines = QString(s_lineCallbackData).split('|');
@@ -1027,13 +1027,13 @@ void tst_QtcProcess::lineCallback()
void tst_QtcProcess::lineSignal()
{
SubProcessConfig subConfig(ProcessTestApp::LineCallback::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
const QStringList lines = QString(s_lineCallbackData).split('|');
int lineNumber = 0;
process.setTextChannelMode(Channel::Error, TextChannelMode::SingleLine);
- connect(&process, &QtcProcess::textOnStandardError,
+ connect(&process, &Process::textOnStandardError,
this, [lines, &lineNumber](const QString &actual) {
QString expected = lines.at(lineNumber);
expected.replace("\r\n", "\n");
@@ -1052,12 +1052,12 @@ void tst_QtcProcess::lineSignal()
void tst_QtcProcess::waitForStartedAfterStarted()
{
SubProcessConfig subConfig(ProcessTestApp::SimpleTest::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
bool started = false;
bool waitForStartedResult = false;
- connect(&process, &QtcProcess::started, this, [&] {
+ connect(&process, &Process::started, this, [&] {
started = true;
waitForStartedResult = process.waitForStarted();
});
@@ -1093,7 +1093,7 @@ void tst_QtcProcess::waitForStartedAfterStarted2()
void tst_QtcProcess::waitForStartedAndFinished()
{
SubProcessConfig subConfig(ProcessTestApp::SimpleTest::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
@@ -1119,12 +1119,12 @@ void tst_QtcProcess::notRunningAfterStartingNonExistingProgram()
{
QFETCH(ProcessSignalType, signalType);
- QtcProcess process;
+ Process process;
process.setCommand({ FilePath::fromString(
"there_is_a_big_chance_that_executable_with_that_name_does_not_exists"), {} });
int doneCount = 0;
- QObject::connect(&process, &QtcProcess::done, [&process, &doneCount]() {
+ QObject::connect(&process, &Process::done, [&process, &doneCount]() {
++doneCount;
QCOMPARE(process.error(), QProcess::FailedToStart);
});
@@ -1186,7 +1186,7 @@ void tst_QtcProcess::channelForwarding()
SubProcessConfig subConfig(ProcessTestApp::ChannelForwarding::envVar(),
QString::number(int(channelMode)));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
@@ -1229,7 +1229,7 @@ void tst_QtcProcess::mergedChannels()
QFETCH(bool, errorOnError);
SubProcessConfig subConfig(ProcessTestApp::StandardOutputAndErrorWriter::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.setProcessChannelMode(channelMode);
@@ -1262,7 +1262,7 @@ void tst_QtcProcess::destroyBlockingProcess()
SubProcessConfig subConfig(ProcessTestApp::BlockingProcess::envVar(),
QString::number(int(blockType)));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
QVERIFY(process.waitForStarted());
@@ -1272,7 +1272,7 @@ void tst_QtcProcess::destroyBlockingProcess()
void tst_QtcProcess::flushFinishedWhileWaitingForReadyRead()
{
SubProcessConfig subConfig(ProcessTestApp::SimpleTest::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
@@ -1297,7 +1297,7 @@ void tst_QtcProcess::flushFinishedWhileWaitingForReadyRead()
void tst_QtcProcess::crash()
{
SubProcessConfig subConfig(ProcessTestApp::Crash::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
@@ -1305,7 +1305,7 @@ void tst_QtcProcess::crash()
QVERIFY(process.isRunning());
QEventLoop loop;
- connect(&process, &QtcProcess::done, &loop, &QEventLoop::quit);
+ connect(&process, &Process::done, &loop, &QEventLoop::quit);
loop.exec();
QCOMPARE(process.error(), QProcess::Crashed);
@@ -1315,7 +1315,7 @@ void tst_QtcProcess::crash()
void tst_QtcProcess::crashAfterOneSecond()
{
SubProcessConfig subConfig(ProcessTestApp::CrashAfterOneSecond::envVar(), {});
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
@@ -1335,7 +1335,7 @@ void tst_QtcProcess::recursiveCrashingProcess()
const int recursionDepth = 5; // must be at least 2
SubProcessConfig subConfig(ProcessTestApp::RecursiveCrashingProcess::envVar(),
QString::number(recursionDepth));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
QVERIFY(process.waitForStarted(1000));
@@ -1367,7 +1367,7 @@ void tst_QtcProcess::recursiveBlockingProcess()
SubProcessConfig subConfig(ProcessTestApp::RecursiveBlockingProcess::envVar(),
QString::number(recursionDepth));
{
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
process.start();
QVERIFY(process.waitForStarted(1000));
@@ -1421,10 +1421,10 @@ void tst_QtcProcess::quitBlockingProcess()
SubProcessConfig subConfig(ProcessTestApp::RecursiveBlockingProcess::envVar(),
QString::number(recursionDepth));
- QtcProcess process;
+ Process process;
subConfig.setupSubProcess(&process);
bool done = false;
- connect(&process, &QtcProcess::done, this, [&done] { done = true; });
+ connect(&process, &Process::done, this, [&done] { done = true; });
process.start();
QVERIFY(process.waitForStarted());
@@ -1472,12 +1472,12 @@ void tst_QtcProcess::tarPipe()
if (!FilePath::fromString("tar").searchInPath().isExecutableFile())
QSKIP("This test uses \"tar\" command.");
- QtcProcess sourceProcess;
- QtcProcess targetProcess;
+ Process sourceProcess;
+ Process targetProcess;
targetProcess.setProcessMode(ProcessMode::Writer);
- QObject::connect(&sourceProcess, &QtcProcess::readyReadStandardOutput,
+ QObject::connect(&sourceProcess, &Process::readyReadStandardOutput,
&targetProcess, [&sourceProcess, &targetProcess]() {
targetProcess.writeRaw(sourceProcess.readAllRawStandardOutput());
});
diff --git a/tests/manual/deviceshell/tst_deviceshell.cpp b/tests/manual/deviceshell/tst_deviceshell.cpp
index 2703e6b82d..96638763f8 100644
--- a/tests/manual/deviceshell/tst_deviceshell.cpp
+++ b/tests/manual/deviceshell/tst_deviceshell.cpp
@@ -54,7 +54,7 @@ public:
}
private:
- void setupShellProcess(QtcProcess *shellProcess) override
+ void setupShellProcess(Process *shellProcess) override
{
shellProcess->setCommand(cmdLine());
}