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

Tests: Fix Qt 5.15 deprecation warnings

Browse Source 
Change-Id: I458cced795f29479557853919bd6d317e5870f07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-06-16 16:34:28 +02:00
parent 09ac5a8fa8
commit 5ca17578d5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/filesearch/tst_filesearch.cpp
View File

@@ -86,17 +86,17 @@ void tst_FileSearch::multipleResults()
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 10, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 10, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 2, QLatin1String("search to find multiple find results"), 24, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 4, QLatin1String("here you find another result"), 9, 4, QStringList());
test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags(0)); test_helper(expectedResults, QLatin1String("find"), QTextDocument::FindFlags());
expectedResults.clear(); expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList());
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(0)); test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags());
expectedResults.clear(); expectedResults.clear();
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList() << QLatin1String("aaaa")); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 0, 4, QStringList() << QLatin1String("aaaa"));
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList() << QLatin1String("aaaa")); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 5, QLatin1String("aaaaaaaa this line has 2 results for four a in a row"), 4, 4, QStringList() << QLatin1String("aaaa"));
test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(0), RegExp); test_helper(expectedResults, QLatin1String("aaaa"), QTextDocument::FindFlags(), RegExp);
} }
void tst_FileSearch::caseSensitive() void tst_FileSearch::caseSensitive()
@@ -111,7 +111,7 @@ void tst_FileSearch::caseInSensitive()
Utils::FileSearchResultList expectedResults; Utils::FileSearchResultList expectedResults;
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 7, 13, QStringList());
expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 27, 13, QStringList()); expectedResults << Utils::FileSearchResult(QLatin1String(FILENAME), 3, QLatin1String("search CaseSensitively for casesensitive"), 27, 13, QStringList());
test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindFlags(0)); test_helper(expectedResults, QLatin1String("CaseSensitive"), QTextDocument::FindFlags());
} }
void tst_FileSearch::matchCaseReplacement() void tst_FileSearch::matchCaseReplacement()

12
tests/auto/treeviewfind/tst_treeviewfind.cpp
View File

@@ -70,7 +70,7 @@ void tst_treeviewfind::wrapping()
QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO2")); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO2"));
// forward // forward
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0)); QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
// backward // backward
@@ -115,19 +115,19 @@ void tst_treeviewfind::columns()
QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("HEADER1")); QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("HEADER1"));
// find in first column // find in first column
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0)); QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
// find in second column of node with children // find in second column of node with children
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(1)); QCOMPARE(tree->currentItem(), toplevelitems.at(1));
// again find in first column // again find in first column
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(1)->child(0)); QCOMPARE(tree->currentItem(), toplevelitems.at(1)->child(0));
// don't stay in item if multiple columns match, and find in second column // don't stay in item if multiple columns match, and find in second column
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0)); QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0));
// wrap // wrap
findSupport->findStep(QLatin1String("FOO"), 0); findSupport->findStep(QLatin1String("FOO"), Core::FindFlags());
QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0)); QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
// backwards // backwards