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

CppTools: Fix test on Windows

Browse Source 
Another CRLF issue.

Change-Id: I172bcef5beabf1c85eb3c0b66a1839c03a870f8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-10-12 17:13:24 +02:00
parent 19f2d3a7a8
commit 2e25e2859d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cpptools/cppmodelmanager_test.cpp
View File

@@ -1117,12 +1117,12 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor()
const MyTestDataDir testDir2(_("testdata_project2")); const MyTestDataDir testDir2(_("testdata_project2"));
QFile foobar2000Header(testDir2.file("foobar2000.h")); QFile foobar2000Header(testDir2.file("foobar2000.h"));
QVERIFY(foobar2000Header.open(QFile::ReadOnly)); QVERIFY(foobar2000Header.open(QFile::ReadOnly | QFile::Text));
const auto foobar2000HeaderContents = foobar2000Header.readAll(); const auto foobar2000HeaderContents = foobar2000Header.readAll();
foobar2000Header.close(); foobar2000Header.close();
QFile renamedHeader(renamedHeaderWithNormalGuard); QFile renamedHeader(renamedHeaderWithNormalGuard);
QVERIFY(renamedHeader.open(QFile::ReadOnly)); QVERIFY(renamedHeader.open(QFile::ReadOnly | QFile::Text));
auto renamedHeaderContents = renamedHeader.readAll(); auto renamedHeaderContents = renamedHeader.readAll();
renamedHeader.close(); renamedHeader.close();
QCOMPARE(renamedHeaderContents, foobar2000HeaderContents); QCOMPARE(renamedHeaderContents, foobar2000HeaderContents);
@@ -1133,12 +1133,12 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor()
Core::HandleIncludeGuards::Yes)); Core::HandleIncludeGuards::Yes));
QFile foobar4000Header(testDir2.file("foobar4000.h")); QFile foobar4000Header(testDir2.file("foobar4000.h"));
QVERIFY(foobar4000Header.open(QFile::ReadOnly)); QVERIFY(foobar4000Header.open(QFile::ReadOnly | QFile::Text));
const auto foobar4000HeaderContents = foobar4000Header.readAll(); const auto foobar4000HeaderContents = foobar4000Header.readAll();
foobar4000Header.close(); foobar4000Header.close();
renamedHeader.setFileName(renamedHeaderWithUnderscoredGuard); renamedHeader.setFileName(renamedHeaderWithUnderscoredGuard);
QVERIFY(renamedHeader.open(QFile::ReadOnly)); QVERIFY(renamedHeader.open(QFile::ReadOnly | QFile::Text));
renamedHeaderContents = renamedHeader.readAll(); renamedHeaderContents = renamedHeader.readAll();
renamedHeader.close(); renamedHeader.close();
QCOMPARE(renamedHeaderContents, foobar4000HeaderContents); QCOMPARE(renamedHeaderContents, foobar4000HeaderContents);
@@ -1146,7 +1146,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor()
// test the renaming of a header with a malformed guard to verify we do not make // test the renaming of a header with a malformed guard to verify we do not make
// accidental refactors // accidental refactors
renamedHeader.setFileName(headerWithMalformedGuard); renamedHeader.setFileName(headerWithMalformedGuard);
QVERIFY(renamedHeader.open(QFile::ReadOnly)); QVERIFY(renamedHeader.open(QFile::ReadOnly | QFile::Text));
auto originalMalformedGuardContents = renamedHeader.readAll(); auto originalMalformedGuardContents = renamedHeader.readAll();
renamedHeader.close(); renamedHeader.close();
@@ -1154,7 +1154,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor()
Core::HandleIncludeGuards::Yes)); Core::HandleIncludeGuards::Yes));
renamedHeader.setFileName(renamedHeaderWithMalformedGuard); renamedHeader.setFileName(renamedHeaderWithMalformedGuard);
QVERIFY(renamedHeader.open(QFile::ReadOnly)); QVERIFY(renamedHeader.open(QFile::ReadOnly | QFile::Text));
renamedHeaderContents = renamedHeader.readAll(); renamedHeaderContents = renamedHeader.readAll();
renamedHeader.close(); renamedHeader.close();
QCOMPARE(renamedHeaderContents, originalMalformedGuardContents); QCOMPARE(renamedHeaderContents, originalMalformedGuardContents);