1 files changed, 23 insertions, 196 deletions
diff --git a/tests/unit/unittest/symbolscollector-test.cpp b/tests/unit/unittest/symbolscollector-test.cpp
index 48e4420dc1..f0080a5d2c 100644
--- a/tests/unit/unittest/symbolscollector-test.cpp
+++ b/tests/unit/unittest/symbolscollector-test.cpp
@@ -271,56 +271,6 @@ TEST_F(SymbolsCollector, DISABLED_ON_WINDOWS(CollectInUnsavedFile))
                 Contains(HasSymbolName("function")));
 }
 
-TEST_F(SymbolsCollector, SourceFiles)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
-}
-
-TEST_F(SymbolsCollector, MainFileInSourceFiles)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
-}
-
-TEST_F(SymbolsCollector, ResetMainFileInSourceFiles)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
-}
-
-TEST_F(SymbolsCollector, DontDuplicateSourceFiles)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-    collector.collectSymbols();
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
-}
-
-TEST_F(SymbolsCollector, ClearSourceFiles)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    collector.clear();
-
-    ASSERT_THAT(collector.sourceFiles(), IsEmpty());
-}
-
 TEST_F(SymbolsCollector, ClearSymbols)
 {
     collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
@@ -351,27 +301,6 @@ TEST_F(SymbolsCollector, ClearFileStatus)
     ASSERT_THAT(collector.fileStatuses(), IsEmpty());
 }
 
-TEST_F(SymbolsCollector, ClearUsedMacros)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/defines.h"), {"cc"});
-    collector.collectSymbols();
-
-    collector.clear();
-
-    ASSERT_THAT(collector.usedMacros(), IsEmpty());
-}
-
-TEST_F(SymbolsCollector, ClearSourceDependencies)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp"),
-                      {"cc", "-I" TESTDATA_DIR});
-    collector.collectSymbols();
-
-    collector.clear();
-
-    ASSERT_THAT(collector.sourceDependencies(), IsEmpty());
-}
-
 TEST_F(SymbolsCollector, DontCollectSymbolsAfterFilesAreCleared)
 {
     collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
@@ -382,16 +311,6 @@ TEST_F(SymbolsCollector, DontCollectSymbolsAfterFilesAreCleared)
     ASSERT_THAT(collector.symbols(), IsEmpty());
 }
 
-TEST_F(SymbolsCollector, DontCollectSourceFilesAfterFilesAreCleared)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    collector.clear();
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.sourceFiles(), IsEmpty());
-}
-
 TEST_F(SymbolsCollector, DontCollectFileStatusAfterFilesAreCleared)
 {
     collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
@@ -402,82 +321,6 @@ TEST_F(SymbolsCollector, DontCollectFileStatusAfterFilesAreCleared)
     ASSERT_THAT(collector.fileStatuses(), IsEmpty());
 }
 
-TEST_F(SymbolsCollector, DontCollectUsedMacrosAfterFilesAreCleared)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    collector.clear();
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.usedMacros(), IsEmpty());
-}
-
-TEST_F(SymbolsCollector, DontCollectSourceDependenciesAfterFilesAreCleared)
-{
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
-
-    collector.clear();
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.sourceDependencies(), IsEmpty());
-}
-
-TEST_F(SymbolsCollector, CollectUsedMacrosWithExternalDefine)
-{
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
-    collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.usedMacros(),
-                ElementsAre(Eq(UsedMacro{"DEFINED", fileId}),
-                            Eq(UsedMacro{"IF_DEFINE", fileId}),
-                            Eq(UsedMacro{"__clang__", fileId}),
-                            Eq(UsedMacro{"CLASS_EXPORT", fileId}),
-                            Eq(UsedMacro{"IF_NOT_DEFINE", fileId}),
-                            Eq(UsedMacro{"MACRO_EXPANSION", fileId}),
-                            Eq(UsedMacro{"COMPILER_ARGUMENT", fileId})));
-}
-
-TEST_F(SymbolsCollector, CollectUsedMacrosWithoutExternalDefine)
-{
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
-    collector.setFile(fileId, {"cc"});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.usedMacros(),
-                ElementsAre(Eq(UsedMacro{"DEFINED", fileId}),
-                            Eq(UsedMacro{"IF_DEFINE", fileId}),
-                            Eq(UsedMacro{"__clang__", fileId}),
-                            Eq(UsedMacro{"CLASS_EXPORT", fileId}),
-                            Eq(UsedMacro{"IF_NOT_DEFINE", fileId}),
-                            Eq(UsedMacro{"MACRO_EXPANSION", fileId}),
-                            Eq(UsedMacro{"COMPILER_ARGUMENT", fileId})));
-}
-
-TEST_F(SymbolsCollector, DontCollectHeaderGuards)
-{
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
-    collector.setFile(fileId, {"cc"});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.usedMacros(),
-                Not(Contains(Eq(UsedMacro{"SYMBOLSCOLLECTOR_DEFINES_H", fileId}))));
-}
-
-TEST_F(SymbolsCollector, DISABLED_DontCollectDynamicLibraryExports)
-{
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
-    collector.setFile(fileId, {"cc"});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.usedMacros(),
-                Not(Contains(Eq(UsedMacro{"CLASS_EXPORT", fileId}))));
-}
-
 TEST_F(SymbolsCollector, CollectMacroDefinitionSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
@@ -489,7 +332,7 @@ TEST_F(SymbolsCollector, CollectMacroDefinitionSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("IF_NOT_DEFINE"), fileId, 4, 9, SourceLocationKind::MacroDefinition)));
 }
 
-TEST_F(SymbolsCollector, CollectMacroUsageInIfNotDefSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroUsageInIfNotDefSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -500,7 +343,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageInIfNotDefSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("IF_NOT_DEFINE"), fileId, 6, 9, SourceLocationKind::MacroUsage)));
 }
 
-TEST_F(SymbolsCollector, CollectSecondMacroUsageInIfNotDefSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectSecondMacroUsageInIfNotDefSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -511,7 +354,7 @@ TEST_F(SymbolsCollector, CollectSecondMacroUsageInIfNotDefSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("IF_NOT_DEFINE"), fileId, 9, 9, SourceLocationKind::MacroUsage)));
 }
 
-TEST_F(SymbolsCollector, CollectMacroUsageCompilerArgumentSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroUsageCompilerArgumentSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -522,7 +365,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageCompilerArgumentSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("COMPILER_ARGUMENT"), fileId, 12, 9, SourceLocationKind::MacroUsage)));
 }
 
-TEST_F(SymbolsCollector, CollectMacroUsageInIfDefSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroUsageInIfDefSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -533,7 +376,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageInIfDefSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("IF_DEFINE"), fileId, 17, 8, SourceLocationKind::MacroUsage)));
 }
 
-TEST_F(SymbolsCollector, CollectMacroUsageInDefinedSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroUsageInDefinedSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -566,7 +409,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageUndefSourceLocation)
                 Contains(IsSourceLocationEntry(symbolId("UN_DEFINE"), fileId, 34, 8, SourceLocationKind::MacroUndefinition)));
 }
 
-TEST_F(SymbolsCollector, CollectMacroUsageBuiltInSourceLocation)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroUsageBuiltInSourceLocation)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -588,7 +431,7 @@ TEST_F(SymbolsCollector, CollectMacroDefinitionSymbols)
                 Contains(AllOf(HasSymbolName("IF_NOT_DEFINE"), HasSymbolKind(SymbolKind::Macro))));
 }
 
-TEST_F(SymbolsCollector, CollectMacroBuiltInSymbols)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroBuiltInSymbols)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
@@ -599,7 +442,7 @@ TEST_F(SymbolsCollector, CollectMacroBuiltInSymbols)
                 Contains(AllOf(HasSymbolName("__clang__"), HasSymbolKind(SymbolKind::Macro))));
 }
 
-TEST_F(SymbolsCollector, CollectMacroCompilerArgumentSymbols)
+TEST_F(SymbolsCollector, DISABLED_CollectMacroCompilerArgumentSymbols)
 {
     auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
@@ -623,23 +466,6 @@ TEST_F(SymbolsCollector, CollectFileStatuses)
                             fileStatus(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
-TEST_F(SymbolsCollector, CollectSourceDependencies)
-{
-    auto mainFileId = filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp");
-    auto header1FileId = filePathId(TESTDATA_DIR "/symbolscollector/header1.h");
-    auto header2FileId = filePathId(TESTDATA_DIR "/symbolscollector/header2.h");
-    auto header3FileId = filePathId(TESTDATA_DIR "/symbolscollector/header3.h");
-    collector.setFile(mainFileId, {"cc", "-I" TESTDATA_DIR});
-
-    collector.collectSymbols();
-
-    ASSERT_THAT(collector.sourceDependencies(),
-                UnorderedElementsAre(SourceDependency(mainFileId, header1FileId),
-                                     SourceDependency(mainFileId, header3FileId),
-                                     SourceDependency(header3FileId, header2FileId),
-                                     SourceDependency(header1FileId, header2FileId)));
-}
-
 TEST_F(SymbolsCollector, IsClassSymbol)
 {
     collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
@@ -770,13 +596,13 @@ TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtSecondRun)
     collector.collectSymbols();
 
     ASSERT_THAT(collector.symbols(),
-                AllOf(
-                    Contains(HasSymbolName("HeaderFunctionReferenceInMainFile")),
-                    Not(Contains(HasSymbolName("MemberReference"))),
-                    Not(Contains(HasSymbolName("HeaderFunctionReference"))),
-                    Not(Contains(HasSymbolName("HeaderFunction"))),
-                    Not(Contains(HasSymbolName("Class"))),
-                    Not(Contains(HasSymbolName("Member")))));
+                AllOf(Contains(HasSymbolName("HeaderFunctionReferenceInMainFile")),
+                      Not(Contains(HasSymbolName("MemberReference"))),
+                      Not(Contains(HasSymbolName("HeaderFunctionReference"))),
+                      Not(Contains(HasSymbolName("HeaderFunction"))),
+                      Not(Contains(HasSymbolName("Class"))),
+                      Not(Contains(HasSymbolName("Member"))),
+                      Not(Contains(HasSymbolName("HEADER_DEFINE")))));
 }
 
 TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtTouchHeader)
@@ -792,13 +618,14 @@ TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtTouchHeader)
     collector.collectSymbols();
 
     ASSERT_THAT(collector.symbols(),
-                AllOf(
-                    Contains(HasSymbolName("HeaderFunctionReferenceInMainFile")),
-                    Not(Contains(HasSymbolName("MemberReference"))),
-                    Not(Contains(HasSymbolName("HeaderFunctionReference"))),
-                    Not(Contains(HasSymbolName("HeaderFunction"))),
-                    Not(Contains(HasSymbolName("Class"))),
-                    Not(Contains(HasSymbolName("Member")))));
+                AllOf(Contains(HasSymbolName("TouchHeaderFunction")),
+                      Contains(HasSymbolName("HeaderFunctionReferenceInMainFile")),
+                      Not(Contains(HasSymbolName("MemberReference"))),
+                      Not(Contains(HasSymbolName("HeaderFunctionReference"))),
+                      Not(Contains(HasSymbolName("HeaderFunction"))),
+                      Not(Contains(HasSymbolName("Class"))),
+                      Not(Contains(HasSymbolName("Member"))),
+                      Not(Contains(HasSymbolName("HEADER_DEFINE")))));
 }
 
 TEST_F(SymbolsCollector, DontIndexSystemIncudes)