diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
| commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
| tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /tests/unit/unittest/refactoringcompilationdatabase-test.cpp | |
| parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
| parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'tests/unit/unittest/refactoringcompilationdatabase-test.cpp')
| -rw-r--r-- | tests/unit/unittest/refactoringcompilationdatabase-test.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/unit/unittest/refactoringcompilationdatabase-test.cpp b/tests/unit/unittest/refactoringcompilationdatabase-test.cpp index 59f88f8b53..5af5325e48 100644 --- a/tests/unit/unittest/refactoringcompilationdatabase-test.cpp +++ b/tests/unit/unittest/refactoringcompilationdatabase-test.cpp @@ -61,7 +61,7 @@ protected: RefactoringCompilationDatabase() { database.addFile(ClangBackEnd::NativeFilePathView{temporarySourceFilePath}, - {"cc", toNativePath(temporaryDirectoryPath + "/data.cpp").path(), "-DNO_DEBUG"}); + {"cc", toNativePath(temporaryDirectoryPath + "/data.cpp"), "-DNO_DEBUG"}); } protected: @@ -83,13 +83,13 @@ TEST_F(RefactoringCompilationDatabase, CompileCommandForFilePath) auto compileCommands = database.getAllCompileCommands(); ASSERT_THAT(compileCommands, - Contains(IsCompileCommand( - temporaryDirectoryPath, - toNativePath(temporaryDirectoryPath + "/data.cpp").path(), - std::vector<std::string>{ - "cc", - std::string(toNativePath(temporaryDirectoryPath + "/data.cpp").path()), - "-DNO_DEBUG"}))); + Contains(IsCompileCommand(temporaryDirectoryPath, + toNativePath(temporaryDirectoryPath + "/data.cpp"), + std::vector<std::string>{"cc", + std::string(toNativePath( + temporaryDirectoryPath + + "/data.cpp")), + "-DNO_DEBUG"}))); } TEST_F(RefactoringCompilationDatabase, NoCompileCommandForFilePath) @@ -97,13 +97,13 @@ TEST_F(RefactoringCompilationDatabase, NoCompileCommandForFilePath) auto compileCommands = database.getAllCompileCommands(); ASSERT_THAT(compileCommands, - Not(Contains(IsCompileCommand( - temporaryDirectoryPath, - toNativePath(temporaryDirectoryPath + "/data.cpp2").path(), - std::vector<std::string>{ - "cc", - std::string(toNativePath(temporaryDirectoryPath + "/data.cpp").path()), - "-DNO_DEBUG"})))); + Not(Contains(IsCompileCommand(temporaryDirectoryPath, + toNativePath(temporaryDirectoryPath + "/data.cpp2"), + std::vector<std::string>{"cc", + std::string(toNativePath( + temporaryDirectoryPath + + "/data.cpp")), + "-DNO_DEBUG"})))); } TEST_F(RefactoringCompilationDatabase, FilePaths) |