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

Utils: Make errors from CommandLine test better readable

Browse Source 
Change-Id: Ibea4bbe7c1f7e502849f0ef6985cbf107fc236f0
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2022-11-23 14:57:12 +01:00
parent 85340d9508
commit 587bafc771
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/utils/commandline/tst_commandline.cpp
View File

@@ -23,7 +23,10 @@ private slots:
cmd.addCommandLineWithAnd(cmd2); cmd.addCommandLineWithAnd(cmd2);
QCOMPARE(cmd.toUserOutput(), QString("echo foo && echo bar blizz")); const QString actual = cmd.toUserOutput();
const QString wanted = "echo foo && echo bar blizz";
QCOMPARE(actual, wanted);
} }
void testAndComplex() void testAndComplex()
@@ -33,9 +36,12 @@ private slots:
cmd.addCommandLineWithAnd(cmd2); cmd.addCommandLineWithAnd(cmd2);
QCOMPARE(cmd.toUserOutput(), const QString actual = cmd.toUserOutput();
QString("/tmp/space path/\"echo foo 'long with space' && '/tmp/space \"path/echo' " const QString wanted =
"'bar\"' 'blizz is '\\''great'")); "/tmp/space path/\"echo foo 'long with space' && '/tmp/space \"path/echo' "
"'bar\"' 'blizz is '\\''great'";
QCOMPARE(actual, wanted);
} }
void testAndAdd() void testAndAdd()
@@ -47,10 +53,13 @@ private slots:
CommandLine shell("bash", {"-c"}); CommandLine shell("bash", {"-c"});
shell.addCommandLineAsSingleArg(cmd); shell.addCommandLineAsSingleArg(cmd);
QCOMPARE(shell.toUserOutput(), const QString actual = shell.toUserOutput();
const QString wanted =
"bash -c ''\\''/tmp/space path/\"echo'\\'' foo '\\''long with space'\\'' && " "bash -c ''\\''/tmp/space path/\"echo'\\'' foo '\\''long with space'\\'' && "
"'\\''/tmp/space \"path/echo'\\'' '\\''bar\"'\\'' '\\''blizz is " "'\\''/tmp/space \"path/echo'\\'' '\\''bar\"'\\'' '\\''blizz is "
"'\\''\\'\\'''\\''great'\\'''"); "'\\''\\'\\'''\\''great'\\'''";
QCOMPARE(actual, wanted);
} }
}; };