Merge remote-tracking branch 'origin/4.10'

Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728

9 files changed, 202 insertions, 102 deletions

diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index 7e57093cea..01fdd2d88d 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -263,7 +263,6 @@ if (TARGET clangTooling)
     sourcerangeextractor-test.cpp
     symbolindexing-test.cpp
     symbolscollector-test.cpp
-    symbolfinder-test.cpp
     testclangtool.cpp testclangtool.h
     usedmacrocollector-test.cpp
     builddependencycollector-test.cpp
diff --git a/tests/unit/unittest/builddependenciesstorage-test.cpp b/tests/unit/unittest/builddependenciesstorage-test.cpp
index 56f8b42ac5..b542fd3082 100644
--- a/tests/unit/unittest/builddependenciesstorage-test.cpp
+++ b/tests/unit/unittest/builddependenciesstorage-test.cpp
@@ -251,6 +251,32 @@ TEST_F(BuildDependenciesStorage, FetchPchSources)
     ASSERT_THAT(sources, result);
 }
 
+TEST_F(BuildDependenciesStorage, FetchPchSourcesCalls)
+{
+    InSequence s;
+
+    EXPECT_CALL(mockDatabase, deferredBegin());
+    EXPECT_CALL(fetchPchSourcesStatement, valuesReturnFilePathIds(_, 22));
+    EXPECT_CALL(mockDatabase, commit());
+
+    auto sources = storage.fetchPchSources(22);
+}
+
+TEST_F(BuildDependenciesStorage, FetchPchSourcesCallsIsBusy)
+{
+    InSequence s;
+
+    EXPECT_CALL(mockDatabase, deferredBegin());
+    EXPECT_CALL(fetchPchSourcesStatement, valuesReturnFilePathIds(_, 22))
+        .WillOnce(Throw(Sqlite::StatementIsBusy{""}));
+    EXPECT_CALL(mockDatabase, rollback());
+    EXPECT_CALL(mockDatabase, deferredBegin());
+    EXPECT_CALL(fetchPchSourcesStatement, valuesReturnFilePathIds(_, 22));
+    EXPECT_CALL(mockDatabase, commit());
+
+    auto sources = storage.fetchPchSources(22);
+}
+
 TEST_F(BuildDependenciesStorage, FetchSources)
 {
     ClangBackEnd::FilePathIds result{3, 5, 7};
diff --git a/tests/unit/unittest/builddependencycollector-test.cpp b/tests/unit/unittest/builddependencycollector-test.cpp
index 0d1b9650dc..352a60f1de 100644
--- a/tests/unit/unittest/builddependencycollector-test.cpp
+++ b/tests/unit/unittest/builddependencycollector-test.cpp
@@ -80,6 +80,13 @@ MATCHER_P3(HasSource,
            && entry.hasMissingIncludes == hasMissingIncludes;
 }
 
+static Utils::SmallString toNativePath(Utils::SmallStringView text)
+{
+    ClangBackEnd::FilePath path{text};
+
+    return Utils::SmallString{ClangBackEnd::NativeFilePath{path}.path()};
+}
+
 class BuildDependencyCollector : public ::testing::Test
 {
 protected:
@@ -91,11 +98,11 @@ protected:
                             id(TESTDATA_DIR "/builddependencycollector/project/main2.cpp")},
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
         collector.addUnsavedFiles(
             {{{TESTDATA_DIR, "BuildDependencyCollector/project/generated_file.h"},
@@ -184,7 +191,8 @@ protected:
         TESTDATA_DIR "/builddependencycollector/project/main2.cpp",
         TESTDATA_DIR "/builddependencycollector/project/header1.h",
         TESTDATA_DIR "/builddependencycollector/project/header2.h",
-        TESTDATA_DIR "/builddependencycollector/project/generated_file.h"};
+        TESTDATA_DIR "/builddependencycollector/project/generated_file.h",
+        TESTDATA_DIR "/builddependencycollector/project/generated/generated_file.h"};
 };
 
 TEST_F(BuildDependencyCollector, IncludesExternalHeader)
@@ -245,7 +253,14 @@ TEST_F(BuildDependencyCollector, IncludesAreSorted)
 
 TEST_F(BuildDependencyCollector, If)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/if.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/if.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -256,7 +271,14 @@ TEST_F(BuildDependencyCollector, If)
 
 TEST_F(BuildDependencyCollector, LocalPath)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -274,7 +296,14 @@ TEST_F(BuildDependencyCollector, LocalPath)
 
 TEST_F(BuildDependencyCollector, IgnoreMissingFile)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/missingfile.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/missingfile.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -299,7 +328,14 @@ TEST_F(BuildDependencyCollector, IncludesOnlyTopExternalHeader)
 
 TEST_F(BuildDependencyCollector, TopIncludeInIfMacro)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/if.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/if.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.setExcludedFilePaths({TESTDATA_DIR "/builddependencycollector/project/if.cpp"});
 
     emptyCollector.collect();
@@ -310,7 +346,14 @@ TEST_F(BuildDependencyCollector, TopIncludeInIfMacro)
 
 TEST_F(BuildDependencyCollector, TopIncludeWithLocalPath)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -323,7 +366,14 @@ TEST_F(BuildDependencyCollector, TopIncludeWithLocalPath)
 
 TEST_F(BuildDependencyCollector, TopIncludesIgnoreMissingFile)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/missingfile.cpp"),  {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/missingfile.cpp"),
+                           {"cc",
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
+                            "-I",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
+                            "-isystem",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.setExcludedFilePaths({TESTDATA_DIR "/builddependencycollector/project/missingfile.cpp"});
 
     emptyCollector.collect();
@@ -338,11 +388,11 @@ TEST_F(BuildDependencyCollector, SourceFiles)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -357,11 +407,11 @@ TEST_F(BuildDependencyCollector, MainFileInSourceFiles)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
                 ElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp")));
@@ -372,11 +422,11 @@ TEST_F(BuildDependencyCollector, ResetMainFileInSourceFiles)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
                 ElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp")));
@@ -387,11 +437,11 @@ TEST_F(BuildDependencyCollector, DontDuplicateSourceFiles)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.collect();
 
     emptyCollector.collect();
@@ -407,11 +457,11 @@ TEST_F(BuildDependencyCollector, ClearSourceFiles)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.clear();
 
@@ -423,11 +473,11 @@ TEST_F(BuildDependencyCollector, ClearFileStatus)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.collect();
 
     emptyCollector.clear();
@@ -440,11 +490,11 @@ TEST_F(BuildDependencyCollector, ClearUsedMacros)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/defines.h"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.collect();
 
     emptyCollector.clear();
@@ -467,11 +517,11 @@ TEST_F(BuildDependencyCollector, DontCollectSourceFilesAfterFilesAreCleared)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -484,11 +534,11 @@ TEST_F(BuildDependencyCollector, DontCollectFileStatusAfterFilesAreCleared)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -501,11 +551,11 @@ TEST_F(BuildDependencyCollector, DontCollectUsedMacrosAfterFilesAreCleared)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -519,11 +569,11 @@ TEST_F(BuildDependencyCollector, DontCollectSourceDependenciesAfterFilesAreClear
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -552,11 +602,11 @@ TEST_F(BuildDependencyCollector, CollectUsedMacrosWithoutExternalDefine)
     emptyCollector.addFile(fileId,
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -574,11 +624,11 @@ TEST_F(BuildDependencyCollector, DontCollectHeaderGuards)
     emptyCollector.addFile(fileId,
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -592,11 +642,11 @@ TEST_F(BuildDependencyCollector, DISABLED_DontCollectDynamicLibraryExports)
     emptyCollector.addFile(fileId,
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -609,11 +659,11 @@ TEST_F(BuildDependencyCollector, CollectFileStatuses)
     emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -645,11 +695,11 @@ TEST_F(BuildDependencyCollector, MissingInclude)
     emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main5.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
 
     emptyCollector.collect();
 
@@ -690,15 +740,16 @@ TEST_F(BuildDependencyCollector, MissingInclude)
 TEST_F(BuildDependencyCollector, GeneratedFile)
 {
     generatedFiles.update(
-        {{TESTDATA_DIR "/builddependencycollector/project/generated_file.h", "#pragma once"}});
+        {{TESTDATA_DIR "/builddependencycollector/project/generated/generated_file.h",
+          "#pragma once"}});
     emptyCollector.addFile(id(TESTDATA_DIR "/builddependencycollector/project/main6.cpp"),
                            {"cc",
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/external",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
                             "-I",
-                            TESTDATA_DIR "/builddependencycollector/project",
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
                             "-isystem",
-                            TESTDATA_DIR "/builddependencycollector/system"});
+                            toNativePath(TESTDATA_DIR "/builddependencycollector/system")});
     emptyCollector.addUnsavedFiles(generatedFiles.fileContainers());
 
     emptyCollector.collect();
@@ -707,7 +758,8 @@ TEST_F(BuildDependencyCollector, GeneratedFile)
         emptyCollector.sourceEntries(),
         ElementsAre(HasSource(id(TESTDATA_DIR "/builddependencycollector/project/main6.cpp"),
                               SourceType::Source),
-                    HasSource(id(TESTDATA_DIR "/builddependencycollector/project/generated_file.h"),
+                    HasSource(id(TESTDATA_DIR
+                                 "/builddependencycollector/project/generated/generated_file.h"),
                               SourceType::UserInclude)));
 }
 
@@ -737,14 +789,14 @@ TEST_F(BuildDependencyCollector, Create)
         1,
         {},
         {},
-        {{TESTDATA_DIR "/builddependencycollector/system",
+        {{toNativePath(TESTDATA_DIR "/builddependencycollector/system"),
           1,
           ClangBackEnd::IncludeSearchPathType::System}},
         {
-            {TESTDATA_DIR "/builddependencycollector/project",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
              1,
              ClangBackEnd::IncludeSearchPathType::User},
-            {TESTDATA_DIR "/builddependencycollector/external",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
              2,
              ClangBackEnd::IncludeSearchPathType::User},
         },
@@ -899,14 +951,14 @@ TEST_F(BuildDependencyCollector, Clear)
         1,
         {},
         {},
-        {{TESTDATA_DIR "/builddependencycollector/system",
+        {{toNativePath(TESTDATA_DIR "/builddependencycollector/system"),
           1,
           ClangBackEnd::IncludeSearchPathType::System}},
         {
-            {TESTDATA_DIR "/builddependencycollector/project",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
              1,
              ClangBackEnd::IncludeSearchPathType::User},
-            {TESTDATA_DIR "/builddependencycollector/external",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
              2,
              ClangBackEnd::IncludeSearchPathType::User},
         },
@@ -925,14 +977,14 @@ TEST_F(BuildDependencyCollector, Clear)
         1,
         {},
         {},
-        {{TESTDATA_DIR "/builddependencycollector/system",
+        {{toNativePath(TESTDATA_DIR "/builddependencycollector/system"),
           1,
           ClangBackEnd::IncludeSearchPathType::System}},
         {
-            {TESTDATA_DIR "/builddependencycollector/project",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
              1,
              ClangBackEnd::IncludeSearchPathType::User},
-            {TESTDATA_DIR "/builddependencycollector/external",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
              2,
              ClangBackEnd::IncludeSearchPathType::User},
         },
@@ -960,14 +1012,14 @@ TEST_F(BuildDependencyCollector, PreIncludes)
         1,
         {},
         {},
-        {{TESTDATA_DIR "/builddependencycollector/system",
+        {{toNativePath(TESTDATA_DIR "/builddependencycollector/system"),
           1,
           ClangBackEnd::IncludeSearchPathType::System}},
         {
-            {TESTDATA_DIR "/builddependencycollector/project",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/project"),
              1,
              ClangBackEnd::IncludeSearchPathType::User},
-            {TESTDATA_DIR "/builddependencycollector/external",
+            {toNativePath(TESTDATA_DIR "/builddependencycollector/external"),
              2,
              ClangBackEnd::IncludeSearchPathType::User},
         },
diff --git a/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp b/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
index fb49a4c640..324e9b3a7e 100644
--- a/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
+++ b/tests/unit/unittest/clangcompletioncontextanalyzer-test.cpp
@@ -564,4 +564,25 @@ TEST_F(ClangCompletionContextAnalyzer, QualifiedFunctionNameStartPosition)
     ASSERT_THAT(functionNameStartPosition, 1);
 }
 
+TEST_F(ClangCompletionContextAnalyzer, SnippetsAfterOpeningBrace)
+{
+    auto analyzer = runAnalyzer("{@");
+
+    ASSERT_TRUE(analyzer.addSnippets());
+}
+
+TEST_F(ClangCompletionContextAnalyzer, NoSnippetsAfterFunctionCallLike_OpeningBrace)
+{
+    auto analyzer = runAnalyzer("foo{@");
+
+    ASSERT_FALSE(analyzer.addSnippets());
 }
+
+TEST_F(ClangCompletionContextAnalyzer, NoSnippetsAfterFunctionCallLike_OpeningParen)
+{
+    auto analyzer = runAnalyzer("foo(@");
+
+    ASSERT_FALSE(analyzer.addSnippets());
+}
+
+} // namespace
diff --git a/tests/unit/unittest/data/builddependencycollector/project/main6.cpp b/tests/unit/unittest/data/builddependencycollector/project/main6.cpp
index 9564e05426..dfb8e42a3a 100644
--- a/tests/unit/unittest/data/builddependencycollector/project/main6.cpp
+++ b/tests/unit/unittest/data/builddependencycollector/project/main6.cpp
@@ -1,3 +1,3 @@
-#include "generated_file.h"
-#include "generated_file.h"
+#include "generated/generated_file.h"
+#include "generated/generated_file.h"
 
diff --git a/tests/unit/unittest/gtest-creator-printing.cpp b/tests/unit/unittest/gtest-creator-printing.cpp
index 737120abb2..773a632142 100644
--- a/tests/unit/unittest/gtest-creator-printing.cpp
+++ b/tests/unit/unittest/gtest-creator-printing.cpp
@@ -402,7 +402,6 @@ std::ostream &operator<<(std::ostream &os, const RequestCompletionsMessage &mess
        << message.filePath << ", "
        << message.line << ", "
        << message.column << ", "
-       << message.projectPartId << ", "
        << message.ticketNumber << ", "
        << message.funcNameStartLine << ", "
        << message.funcNameStartColumn
diff --git a/tests/unit/unittest/pchmanagerclient-test.cpp b/tests/unit/unittest/pchmanagerclient-test.cpp
index 6e107b4a55..38b9757aa3 100644
--- a/tests/unit/unittest/pchmanagerclient-test.cpp
+++ b/tests/unit/unittest/pchmanagerclient-test.cpp
@@ -68,9 +68,9 @@ protected:
                                                              mockProjectPartsStorage,
                                                              settingsManager};
     ClangBackEnd::ProjectPartId projectPartId{1};
-    PrecompiledHeadersUpdatedMessage message{{projectPartId}};
+    PrecompiledHeadersUpdatedMessage message{projectPartId};
     ClangBackEnd::ProjectPartId projectPartId2{2};
-    PrecompiledHeadersUpdatedMessage message2{{projectPartId2}};
+    PrecompiledHeadersUpdatedMessage message2{projectPartId2};
 };
 
 TEST_F(PchManagerClient, NotifierAttached)
diff --git a/tests/unit/unittest/symbolindexer-test.cpp b/tests/unit/unittest/symbolindexer-test.cpp
index 3e0359cd8d..86d0072c90 100644
--- a/tests/unit/unittest/symbolindexer-test.cpp
+++ b/tests/unit/unittest/symbolindexer-test.cpp
@@ -39,9 +39,10 @@
 
 #include <filepathcaching.h>
 #include <filestatuscache.h>
+#include <processormanager.h>
 #include <projectpartcontainer.h>
 #include <refactoringdatabaseinitializer.h>
-#include <processormanager.h>
+#include <sqliteexception.h>
 #include <symbolindexer.h>
 #include <symbolindexertaskqueue.h>
 #include <taskscheduler.h>
@@ -868,29 +869,29 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsGetsNoPchPathsAndHasErrors)
 TEST_F(SymbolIndexer, UpdateProjectPartsFetchIncludedIndexingTimeStamps)
 {
     InSequence s;
-    ProjectPartContainer projectPart{1,
-                                     {"-Wno-pragma-once-outside-header"},
-                                     {{"BAR", "1", 1}, {"FOO", "1", 2}},
-                                     Utils::clone(systemIncludeSearchPaths),
-                                     Utils::clone(projectIncludeSearchPaths),
-                                     {header1PathId},
-                                     {main1PathId, main2PathId},
-                                     Utils::Language::Cxx,
-                                     Utils::LanguageVersion::CXX14,
-                                     Utils::LanguageExtension::None};
 
-    EXPECT_CALL(mockBuildDependenciesStorage, fetchIncludedIndexingTimeStamps(Eq(main1PathId)))
-        .WillOnce(Return(dependentSourceTimeStamps1));
-    EXPECT_CALL(mockModifiedTimeChecker, isUpToDate(dependentSourceTimeStamps1));
-    EXPECT_CALL(mockBuildDependenciesStorage, fetchIncludedIndexingTimeStamps(Eq(main2PathId)))
-        .WillOnce(Return(dependentSourceTimeStamps2));
-    EXPECT_CALL(mockModifiedTimeChecker, isUpToDate(dependentSourceTimeStamps2));
+    EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
     EXPECT_CALL(mockCollector, fileStatuses()).WillRepeatedly(ReturnRef(fileStatuses1));
-    EXPECT_CALL(mockBuildDependenciesStorage, insertOrUpdateIndexingTimeStamps(fileStatuses1));
-    EXPECT_CALL(mockCollector, fileStatuses()).WillRepeatedly(ReturnRef(fileStatuses2));
-    EXPECT_CALL(mockBuildDependenciesStorage, insertOrUpdateIndexingTimeStamps(fileStatuses2));
+    EXPECT_CALL(mockBuildDependenciesStorage, insertOrUpdateIndexingTimeStamps(_));
+    EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(_, _));
+    EXPECT_CALL(mockSqliteTransactionBackend, commit());
 
-    indexer.updateProjectParts({projectPart});
+    indexer.updateProjectParts({projectPart1});
+}
+
+TEST_F(SymbolIndexer, UpdateProjectPartsIsBusyInStoringData)
+{
+    InSequence s;
+
+    EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin())
+        .WillOnce(Throw(Sqlite::StatementIsBusy{""}));
+    EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
+    EXPECT_CALL(mockCollector, fileStatuses()).WillRepeatedly(ReturnRef(fileStatuses1));
+    EXPECT_CALL(mockBuildDependenciesStorage, insertOrUpdateIndexingTimeStamps(_));
+    EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(_, _));
+    EXPECT_CALL(mockSqliteTransactionBackend, commit());
+
+    indexer.updateProjectParts({projectPart1});
 }
 
 TEST_F(SymbolIndexer, DependentSourceAreNotUpToDate)
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
index 27a8ee1947..3dbd06da7e 100644
--- a/tests/unit/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -9,6 +9,8 @@ include(clang_dependency.pri)
 include(creator_dependency.pri)
 include(benchmark_dependency.pri)
 
+requires(isEmpty(QTC_CLANG_BUILDMODE_MISMATCH))
+
 OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source
 
 !msvc:force_debug_info:QMAKE_CXXFLAGS += -fno-omit-frame-pointer