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

Clang: Tests on MSVC2013: Fix string literal concatenation

Browse Source 
Change-Id: I1b1cefbace16cf0161bfe522d2ac37704e374713
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-11-24 11:07:51 +01:00
parent 3ed40074ff
commit 6687b60a99
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/unittest/clangfixitoperationtest.cpp
View File

@@ -82,11 +82,11 @@ protected:
FixItContainer semicolonFixItContainer{Utf8StringLiteral(";"), FixItContainer semicolonFixItContainer{Utf8StringLiteral(";"),
{{filePath, 3u, 29u}, {{filePath, 3u, 29u},
{filePath, 3u, 29u}}}; {filePath, 3u, 29u}}};
QString semicolonErrorFile{QStringLiteral(TESTDATA_DIR"/diagnostic_semicolon_fixit.cpp")}; QString semicolonErrorFile{QString::fromUtf8(TESTDATA_DIR "/diagnostic_semicolon_fixit.cpp")};
QString semicolonExpectedFile{QStringLiteral(TESTDATA_DIR"/diagnostic_semicolon_fixit_expected.cpp")}; QString semicolonExpectedFile{QString::fromUtf8(TESTDATA_DIR"/diagnostic_semicolon_fixit_expected.cpp")};
QString compareWarningFile{QStringLiteral(TESTDATA_DIR"/diagnostic_comparison_fixit.cpp")}; QString compareWarningFile{QString::fromUtf8(TESTDATA_DIR"/diagnostic_comparison_fixit.cpp")};
QString compareExpected1File{QStringLiteral(TESTDATA_DIR"/diagnostic_comparison_fixit_expected1.cpp")}; QString compareExpected1File{QString::fromUtf8(TESTDATA_DIR"/diagnostic_comparison_fixit_expected1.cpp")};
QString compareExpected2File{QStringLiteral(TESTDATA_DIR"/diagnostic_comparison_fixit_expected2.cpp")}; QString compareExpected2File{QString::fromUtf8(TESTDATA_DIR"/diagnostic_comparison_fixit_expected2.cpp")};
FixItContainer compareFixItContainer{Utf8StringLiteral("=="), FixItContainer compareFixItContainer{Utf8StringLiteral("=="),
{{filePath, 4u, 43u}, {{filePath, 4u, 43u},
{filePath, 4u, 44u}}}; {filePath, 4u, 44u}}};

4
tests/unit/unittest/codecompletiontest.cpp
View File

@@ -118,7 +118,7 @@ Utf8String CodeCompleter::readFileContent(const QString &fileName)
void CodeCompleter::copyTargetHeaderToTemporaryIncludeDirecory() void CodeCompleter::copyTargetHeaderToTemporaryIncludeDirecory()
{ {
QFile::remove(targetHeaderPath); QFile::remove(targetHeaderPath);
bool hasCopied = QFile::copy(QStringLiteral(TESTDATA_DIR "/complete_target_header.h"), bool hasCopied = QFile::copy(QString::fromUtf8(TESTDATA_DIR "/complete_target_header.h"),
targetHeaderPath); targetHeaderPath);
EXPECT_TRUE(hasCopied); EXPECT_TRUE(hasCopied);
} }
@@ -126,7 +126,7 @@ void CodeCompleter::copyTargetHeaderToTemporaryIncludeDirecory()
void CodeCompleter::copyChangedTargetHeaderToTemporaryIncludeDirecory() void CodeCompleter::copyChangedTargetHeaderToTemporaryIncludeDirecory()
{ {
QFile::remove(targetHeaderPath); QFile::remove(targetHeaderPath);
bool hasCopied = QFile::copy(QStringLiteral(TESTDATA_DIR "/complete_target_header_changed.h"), bool hasCopied = QFile::copy(QString::fromUtf8(TESTDATA_DIR "/complete_target_header_changed.h"),
targetHeaderPath); targetHeaderPath);
EXPECT_TRUE(hasCopied); EXPECT_TRUE(hasCopied);
} }