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

AutoTest: Sort tests case insensitive inside Tests view

Browse Source 
Change-Id: Idd4fb818e5bac8e036dd50dbaec7db843b3cfca4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-06-01 11:51:52 +02:00
parent a3b5306147
commit 018dfc533c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,9 +367,9 @@
Cleanup Functions} or \uicontrol {Show Data Functions}. Double-click a
function in the list to open its source code in the code editor.
The test cases are listed in alphabetic order. To list them in the order in
which they are defined in the source code, select \inlineimage leafsort.png
(\uicontrol {Sort Naturally}).
The test cases are listed in alphabetic, case insensitive order. To list
them in the order in which they are defined in the source code,
select \inlineimage leafsort.png (\uicontrol {Sort Naturally}).
\section2 Running and Debugging Tests from Code Editor

14
src/plugins/autotest/testtreeitem.cpp
View File

@@ -130,19 +130,23 @@ bool ITestTreeItem::lessThan(const ITestTreeItem *other, ITestTreeItem::SortMode
case Alphabetically:
if (lhs == rhs)
return index().row() > other->index().row();
return lhs > rhs;
return lhs.compare(rhs, Qt::CaseInsensitive) > 0;
case Naturally: {
if (type() == GroupNode && other->type() == GroupNode)
return filePath() > other->filePath();
if (type() == GroupNode && other->type() == GroupNode) {
return filePath().toString().compare(other->filePath().toString(),
Qt::CaseInsensitive) > 0;
}
const Utils::Link &leftLink = data(0, LinkRole).value<Utils::Link>();
const Utils::Link &rightLink = other->data(0, LinkRole).value<Utils::Link>();
if (leftLink.targetFilePath == rightLink.targetFilePath) {
const int comparison = leftLink.targetFilePath.toString().compare(
rightLink.targetFilePath.toString(), Qt::CaseInsensitive);
if (comparison == 0) {
return leftLink.targetLine == rightLink.targetLine
? leftLink.targetColumn > rightLink.targetColumn
: leftLink.targetLine > rightLink.targetLine;
}
return leftLink.targetFilePath > rightLink.targetFilePath;
return comparison > 0;
}
}
return true;