feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
0172631b48a7ea96c64a8d7aa21f70ded7221014
qt-creator/tests/unit/unittest/symbolindexer-test.cpp

343 lines
15 KiB
C++
Raw Normal View History

Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "googletest.h"
Clang: Collect source files Change-Id: If0183cafd00ed7e42bacbdb72a1d65624dc03cee Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-10-26 13:23:27 +02:00
#include "mockclangpathwatcher.h"
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
#include "mocksymbolscollector.h"
#include "mocksymbolstorage.h"
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
#include "mockfilepathcaching.h"
#include "mocksqlitetransactionbackend.h"
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
#include <symbolindexer.h>
#include <updatepchprojectpartsmessage.h>
#include <projectpartcontainerv2.h>
namespace {
using Utils::PathString;
Clang: Introduce CompilerMacro We want not only the name but the value of the macro too. So we can compare if anything has changed. Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 19:03:14 +01:00
using ClangBackEnd::CompilerMacro;
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
using ClangBackEnd::FileStatuses;
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
using ClangBackEnd::FilePathId;
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
using ClangBackEnd::FilePathIds;
using ClangBackEnd::FilePathView;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::V2::ProjectPartContainer;
using ClangBackEnd::V2::ProjectPartContainers;
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
using ClangBackEnd::V2::FileContainers;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::SymbolEntries;
using ClangBackEnd::SymbolEntry;
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
using ClangBackEnd::SourceDependencies;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::SourceLocationEntries;
using ClangBackEnd::SourceLocationEntry;
using ClangBackEnd::SymbolType;
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
using ClangBackEnd::UsedMacros;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
MATCHER_P2(IsFileId, directoryId, fileNameId,
std::string(negation ? "isn't " : "is ")
+ PrintToString(ClangBackEnd::FilePathId(directoryId, fileNameId)))
{
return arg == ClangBackEnd::FilePathId(directoryId, fileNameId);
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
class SymbolIndexer : public testing::Test
{
protected:
Clang: Cleanup symbol indexer test Change-Id: I1cfa70d092d27949e0cf9466b190afbc40c1a591 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:19:21 +01:00
void SetUp()
{
ON_CALL(mockCollector, symbols()).WillByDefault(ReturnRef(symbolEntries));
ON_CALL(mockCollector, sourceLocations()).WillByDefault(ReturnRef(sourceLocations));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ON_CALL(mockCollector, sourceFiles()).WillByDefault(ReturnRef(sourceFileIds));
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
ON_CALL(mockCollector, usedMacros()).WillByDefault(ReturnRef(usedMacros));
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
ON_CALL(mockCollector, fileStatuses()).WillByDefault(ReturnRef(fileStatus));
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
ON_CALL(mockCollector, sourceDependencies()).WillByDefault(ReturnRef(sourceDependencies));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
ON_CALL(mockStorage, fetchProjectPartArtefact(A<FilePathId>())).WillByDefault(Return(artefact));
Clang: Cleanup symbol indexer test Change-Id: I1cfa70d092d27949e0cf9466b190afbc40c1a591 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:19:21 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
protected:
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ClangBackEnd::FilePathId main1PathId{1, 1};
ClangBackEnd::FilePathId main2PathId{1, 2};
ClangBackEnd::FilePathId header2PathId{1, 12};
ClangBackEnd::FilePathId header1PathId{1, 11};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
PathString generatedFileName = "includecollector_generated_file.h";
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ClangBackEnd::FilePathId generatedFilePathId{1, 21};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
ProjectPartContainer projectPart1{"project1",
{"-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"},
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
{{"BAR", "1"}, {"FOO", "1"}},
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{header1PathId},
{main1PathId}};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
ProjectPartContainer projectPart2{"project2",
{"-I", TESTDATA_DIR, "-x", "c++-header", "-Wno-pragma-once-outside-header"},
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
{{"BAR", "1"}, {"FOO", "0"}},
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{header2PathId},
{main2PathId}};
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
FileContainers unsaved{{{TESTDATA_DIR, "query_simplefunction.h"},
"void f();",
{}}};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
SymbolEntries symbolEntries{{1, {"function", "function"}}};
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
SourceLocationEntries sourceLocations{{1, {1, 1}, {42, 23}, SymbolType::Declaration}};
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
FilePathIds sourceFileIds{{1, 1}, {42, 23}};
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
UsedMacros usedMacros{{"Foo", {1, 1}}};
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
FileStatuses fileStatus{{{1, 2}, 3, 4}};
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
SourceDependencies sourceDependencies{{{1, 1}, {1, 2}}, {{1, 1}, {1, 3}}};
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
ClangBackEnd::ProjectPartArtefact artefact{"[\"-DFOO\"]", "{\"FOO\":\"1\",\"BAR\":\"1\"}", 74};
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
NiceMock<MockSqliteTransactionBackend> mockSqliteTransactionBackend;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
NiceMock<MockSymbolsCollector> mockCollector;
NiceMock<MockSymbolStorage> mockStorage;
Clang: Collect source files Change-Id: If0183cafd00ed7e42bacbdb72a1d65624dc03cee Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-10-26 13:23:27 +02:00
NiceMock<MockClangPathWatcher> mockPathWatcher;
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
NiceMock<MockFilePathCaching> mockFilePathCaching;
ClangBackEnd::SymbolIndexer indexer{mockCollector, mockStorage, mockPathWatcher, mockFilePathCaching, mockSqliteTransactionBackend};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
};
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, addFiles(projectPart1.sourcePathIds(), projectPart1.arguments()));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
indexer.updateProjectParts({projectPart1}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsClearInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, clear()).Times(2);
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesInCollectorForEveryProjectPart)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, addFiles(_, _)).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsDoesNotCallAddFilesInCollectorForEmptyEveryProjectParts)
{
EXPECT_CALL(mockCollector, addFiles(_, _))
.Times(0);
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
indexer.updateProjectParts({}, {});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallscollectSymbolsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, collectSymbols()).Times(2);;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsSymbolsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, symbols()).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsSourceLocationsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, sourceLocations()).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddUnsavedFilesInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, addUnsavedFiles(unsaved)).Times(2);
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddSymbolsAndSourceLocationsInStorage)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin()).Times(2);
EXPECT_CALL(mockStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations)).Times(2);
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsUpdateProjectPartsInStorage)
{
Clang: Add macro names the to project part So we can compare later if the macro names have changed. Change-Id: I65c5f76e07fced8df6cc7282c03430adffcf5fa8 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 12:07:15 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateProjectPart(Eq("project1"),
ElementsAre("-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"),
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
ElementsAre(CompilerMacro{"BAR", "1"}, CompilerMacro{"FOO", "1"})));
Clang: Add macro names the to project part So we can compare later if the macro names have changed. Change-Id: I65c5f76e07fced8df6cc7282c03430adffcf5fa8 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 12:07:15 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateProjectPart(Eq("project2"),
ElementsAre("-I", TESTDATA_DIR, "-x", "c++-header", "-Wno-pragma-once-outside-header"),
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
ElementsAre(CompilerMacro{"BAR", "1"}, CompilerMacro{"FOO", "0"})));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsUpdateProjectPartSources)
{
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockStorage, updateProjectPartSources(TypedEq<Utils::SmallStringView>("project1"), ElementsAre(IsFileId(1, 1), IsFileId(42, 23))));
EXPECT_CALL(mockStorage, updateProjectPartSources(TypedEq<Utils::SmallStringView>("project2"), ElementsAre(IsFileId(1, 1), IsFileId(42, 23))));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertOrUpdateUsedMacros)
Clang: Update or insert used defines in the storage by the symbol indexer Change-Id: Id8af85976be391e17886c9947863b81d206bb575 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-23 18:08:17 +01:00
{
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(Eq(usedMacros)))
Clang: Update or insert used defines in the storage by the symbol indexer Change-Id: Id8af85976be391e17886c9947863b81d206bb575 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-23 18:08:17 +01:00
.Times(2);
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertFileStatuses)
Clang: SymbolIndexer is saving the file information to the symbol storage Change-Id: Id34ce9901c1a938e7ea14da444a9ef1b052286e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-30 14:02:48 +01:00
{
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
EXPECT_CALL(mockStorage, insertFileStatuses(Eq(fileStatus)))
Clang: SymbolIndexer is saving the file information to the symbol storage Change-Id: Id34ce9901c1a938e7ea14da444a9ef1b052286e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-30 14:02:48 +01:00
.Times(2);
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertOrUpdateSourceDependencies)
{
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)))
.Times(2);
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsFetchProjectPartArtefacts)
{
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId())));
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart2.projectPartId())));
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrder)
{
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
InSequence s;
EXPECT_CALL(mockCollector, clear());
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId())));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
EXPECT_CALL(mockCollector, addFiles(_, _));
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
EXPECT_CALL(mockCollector, addUnsavedFiles(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
EXPECT_CALL(mockCollector, collectSymbols());
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
EXPECT_CALL(mockStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations));
Clang: Introduce CompilerMacro We want not only the name but the value of the macro too. So we can compare if anything has changed. Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 19:03:14 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateProjectPart(Eq(projectPart1.projectPartId()), Eq(projectPart1.arguments()), Eq(projectPart1.compilerMacros())));
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockStorage, updateProjectPartSources(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId()), Eq(sourceFileIds)));
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
EXPECT_CALL(mockStorage, insertFileStatuses(Eq(fileStatus)));
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
indexer.updateProjectParts({projectPart1}, Utils::clone(unsaved));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Add path notifier to symbol indexer Change-Id: I2a605a5a5ac2511566edd9c069e84b5ec9d95279 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:20:24 +01:00
TEST_F(SymbolIndexer, CallSetNotifier)
{
EXPECT_CALL(mockPathWatcher, setNotifier(_));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ClangBackEnd::SymbolIndexer indexer{mockCollector, mockStorage, mockPathWatcher, mockFilePathCaching, mockSqliteTransactionBackend};
Clang: Add path notifier to symbol indexer Change-Id: I2a605a5a5ac2511566edd9c069e84b5ec9d95279 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:20:24 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
TEST_F(SymbolIndexer, PathChangedCallsFetchProjectPartArtefactInStorage)
{
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(sourceFileIds[0]));
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(sourceFileIds[1]));
indexer.pathsChanged(sourceFileIds);
}
TEST_F(SymbolIndexer, UpdateChangedPathCallsInOrder)
{
InSequence s;
EXPECT_CALL(mockCollector, clear());
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(sourceFileIds[0]));
EXPECT_CALL(mockCollector, addFiles(ElementsAre(sourceFileIds[0]), Eq(artefact.compilerArguments)));
EXPECT_CALL(mockCollector, collectSymbols());
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
EXPECT_CALL(mockStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations));
EXPECT_CALL(mockStorage, updateProjectPartSources(artefact.projectPartId, Eq(sourceFileIds)));
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
EXPECT_CALL(mockStorage, insertFileStatuses(Eq(fileStatus)));
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
EXPECT_CALL(mockSqliteTransactionBackend, commit());
indexer.updateChangedPath(sourceFileIds[0]);
}
TEST_F(SymbolIndexer, HandleEmptyOptionalInUpdateChangedPath)
{
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
ON_CALL(mockStorage, fetchProjectPartArtefact(A<FilePathId>()))
.WillByDefault(Return(Utils::optional<ClangBackEnd::ProjectPartArtefact>()));
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockCollector, clear());
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(sourceFileIds[0]));
EXPECT_CALL(mockCollector, addFiles(_, _)).Times(0);
EXPECT_CALL(mockCollector, collectSymbols()).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin()).Times(0);
EXPECT_CALL(mockStorage, addSymbolsAndSourceLocations(_, _)).Times(0);
EXPECT_CALL(mockStorage, updateProjectPartSources(An<int>(), _)).Times(0);
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(_)).Times(0);
EXPECT_CALL(mockStorage, insertFileStatuses(_)).Times(0);
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(_)).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(0);
indexer.updateChangedPath(sourceFileIds[0]);
}
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
TEST_F(SymbolIndexer, CompilerMacrosAreNotDifferent)
{
ON_CALL(mockStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
auto areDifferent = indexer.compilerMacrosAreDifferent(projectPart1);
ASSERT_FALSE(areDifferent);
}
TEST_F(SymbolIndexer, CompilerMacrosAreDifferent)
{
ON_CALL(mockStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
auto areDifferent = indexer.compilerMacrosAreDifferent(projectPart2);
ASSERT_TRUE(areDifferent);
}
TEST_F(SymbolIndexer, DontReparseInUpdateProjectPartsIfDefinesAreTheSame)
{
ON_CALL(mockStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
EXPECT_CALL(mockCollector, clear());
EXPECT_CALL(mockStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId())));
EXPECT_CALL(mockCollector, addFiles(_, _)).Times(0);
EXPECT_CALL(mockCollector, collectSymbols()).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin()).Times(0);
EXPECT_CALL(mockStorage, addSymbolsAndSourceLocations(_, _)).Times(0);
EXPECT_CALL(mockStorage, updateProjectPartSources(An<int>(), _)).Times(0);
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(_)).Times(0);
EXPECT_CALL(mockStorage, insertFileStatuses(_)).Times(0);
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(_)).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(0);
indexer.updateProjectPart(std::move(projectPart1), {});
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Copy Permalink