forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -48,7 +48,7 @@ public:
|
|||||||
createProjectPartsTable();
|
createProjectPartsTable();
|
||||||
createProjectPartsSourcesTable();
|
createProjectPartsSourcesTable();
|
||||||
createUsedMacrosTable();
|
createUsedMacrosTable();
|
||||||
createFileInformationsTable();
|
createFileStatusesTable();
|
||||||
createSourceDependenciesTable();
|
createSourceDependenciesTable();
|
||||||
|
|
||||||
transaction.commit();
|
transaction.commit();
|
||||||
@@ -148,11 +148,11 @@ public:
|
|||||||
table.initialize(database);
|
table.initialize(database);
|
||||||
}
|
}
|
||||||
|
|
||||||
void createFileInformationsTable()
|
void createFileStatusesTable()
|
||||||
{
|
{
|
||||||
Sqlite::Table table;
|
Sqlite::Table table;
|
||||||
table.setUseIfNotExists(true);
|
table.setUseIfNotExists(true);
|
||||||
table.setName("fileInformations");
|
table.setName("fileStatuses");
|
||||||
table.addColumn("sourceId", Sqlite::ColumnType::Integer, Sqlite::Contraint::PrimaryKey);
|
table.addColumn("sourceId", Sqlite::ColumnType::Integer, Sqlite::Contraint::PrimaryKey);
|
||||||
table.addColumn("size", Sqlite::ColumnType::Integer);
|
table.addColumn("size", Sqlite::ColumnType::Integer);
|
||||||
table.addColumn("lastModified", Sqlite::ColumnType::Integer);
|
table.addColumn("lastModified", Sqlite::ColumnType::Integer);
|
||||||
|
@@ -16,8 +16,8 @@ HEADERS += \
|
|||||||
$$PWD/projectpartentry.h \
|
$$PWD/projectpartentry.h \
|
||||||
$$PWD/symbolsvisitorbase.h \
|
$$PWD/symbolsvisitorbase.h \
|
||||||
$$PWD/usedmacro.h \
|
$$PWD/usedmacro.h \
|
||||||
$$PWD/fileinformation.h \
|
$$PWD/sourcedependency.h \
|
||||||
$$PWD/sourcedependency.h
|
$$PWD/filestatus.h
|
||||||
|
|
||||||
!isEmpty(LIBTOOLING_LIBS) {
|
!isEmpty(LIBTOOLING_LIBS) {
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "fileinformation.h"
|
#include "filestatus.h"
|
||||||
#include "symbolsvisitorbase.h"
|
#include "symbolsvisitorbase.h"
|
||||||
#include "sourcedependency.h"
|
#include "sourcedependency.h"
|
||||||
#include "sourcelocationsutils.h"
|
#include "sourcelocationsutils.h"
|
||||||
@@ -50,7 +50,7 @@ public:
|
|||||||
SourceLocationEntries &sourceLocationEntries,
|
SourceLocationEntries &sourceLocationEntries,
|
||||||
FilePathIds &sourceFiles,
|
FilePathIds &sourceFiles,
|
||||||
UsedMacros &usedMacros,
|
UsedMacros &usedMacros,
|
||||||
FileInformations &fileInformations,
|
FileStatuses &fileStatuses,
|
||||||
SourceDependencies &sourceDependencies,
|
SourceDependencies &sourceDependencies,
|
||||||
FilePathCachingInterface &filePathCache,
|
FilePathCachingInterface &filePathCache,
|
||||||
const clang::SourceManager &sourceManager,
|
const clang::SourceManager &sourceManager,
|
||||||
@@ -62,7 +62,7 @@ public:
|
|||||||
m_sourceLocationEntries(sourceLocationEntries),
|
m_sourceLocationEntries(sourceLocationEntries),
|
||||||
m_sourceFiles(sourceFiles),
|
m_sourceFiles(sourceFiles),
|
||||||
m_usedMacros(usedMacros),
|
m_usedMacros(usedMacros),
|
||||||
m_fileInformations(fileInformations)
|
m_fileStatuses(fileStatuses)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +76,7 @@ public:
|
|||||||
const clang::FileEntry *fileEntry = m_sourceManager.getFileEntryForID(
|
const clang::FileEntry *fileEntry = m_sourceManager.getFileEntryForID(
|
||||||
m_sourceManager.getFileID(sourceLocation));
|
m_sourceManager.getFileID(sourceLocation));
|
||||||
if (fileEntry) {
|
if (fileEntry) {
|
||||||
m_fileInformations.emplace_back(filePathId(fileEntry),
|
m_fileStatuses.emplace_back(filePathId(fileEntry),
|
||||||
fileEntry->getSize(),
|
fileEntry->getSize(),
|
||||||
fileEntry->getModificationTime());
|
fileEntry->getModificationTime());
|
||||||
addSourceFile(fileEntry);
|
addSourceFile(fileEntry);
|
||||||
@@ -284,7 +284,7 @@ private:
|
|||||||
SourceLocationEntries &m_sourceLocationEntries;
|
SourceLocationEntries &m_sourceLocationEntries;
|
||||||
FilePathIds &m_sourceFiles;
|
FilePathIds &m_sourceFiles;
|
||||||
UsedMacros &m_usedMacros;
|
UsedMacros &m_usedMacros;
|
||||||
FileInformations &m_fileInformations;
|
FileStatuses &m_fileStatuses;
|
||||||
bool m_skipInclude = false;
|
bool m_skipInclude = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -38,7 +38,7 @@ bool CollectMacrosSourceFileCallbacks::handleBeginSource(clang::CompilerInstance
|
|||||||
m_sourceLocationEntries,
|
m_sourceLocationEntries,
|
||||||
m_sourceFiles,
|
m_sourceFiles,
|
||||||
m_usedMacros,
|
m_usedMacros,
|
||||||
m_fileInformations,
|
m_fileStatuses,
|
||||||
m_sourceDependencies,
|
m_sourceDependencies,
|
||||||
m_filePathCache,
|
m_filePathCache,
|
||||||
compilerInstance.getSourceManager(),
|
compilerInstance.getSourceManager(),
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "fileinformation.h"
|
#include "filestatus.h"
|
||||||
#include "sourcedependency.h"
|
#include "sourcedependency.h"
|
||||||
#include "sourcelocationentry.h"
|
#include "sourcelocationentry.h"
|
||||||
#include "symbolentry.h"
|
#include "symbolentry.h"
|
||||||
@@ -65,7 +65,7 @@ public:
|
|||||||
{
|
{
|
||||||
m_sourceFiles.clear();
|
m_sourceFiles.clear();
|
||||||
m_usedMacros.clear();
|
m_usedMacros.clear();
|
||||||
m_fileInformations.clear();
|
m_fileStatuses.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
const UsedMacros &usedMacros() const
|
const UsedMacros &usedMacros() const
|
||||||
@@ -73,9 +73,9 @@ public:
|
|||||||
return m_usedMacros;
|
return m_usedMacros;
|
||||||
}
|
}
|
||||||
|
|
||||||
const FileInformations &fileInformations() const
|
const FileStatuses &fileStatuses() const
|
||||||
{
|
{
|
||||||
return m_fileInformations;
|
return m_fileStatuses;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SourceDependencies &sourceDependencies() const
|
const SourceDependencies &sourceDependencies() const
|
||||||
@@ -86,7 +86,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
FilePathIds m_sourceFiles;
|
FilePathIds m_sourceFiles;
|
||||||
UsedMacros m_usedMacros;
|
UsedMacros m_usedMacros;
|
||||||
FileInformations m_fileInformations;
|
FileStatuses m_fileStatuses;
|
||||||
SourceDependencies m_sourceDependencies;
|
SourceDependencies m_sourceDependencies;
|
||||||
SymbolEntries &m_symbolEntries;
|
SymbolEntries &m_symbolEntries;
|
||||||
SourceLocationEntries &m_sourceLocationEntries;
|
SourceLocationEntries &m_sourceLocationEntries;
|
||||||
|
@@ -33,10 +33,10 @@
|
|||||||
|
|
||||||
namespace ClangBackEnd {
|
namespace ClangBackEnd {
|
||||||
|
|
||||||
class FileInformation
|
class FileStatus
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FileInformation(FilePathId filePathId,
|
FileStatus(FilePathId filePathId,
|
||||||
off_t size,
|
off_t size,
|
||||||
std::time_t lastModified)
|
std::time_t lastModified)
|
||||||
: filePathId(filePathId),
|
: filePathId(filePathId),
|
||||||
@@ -45,7 +45,7 @@ public:
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
friend
|
friend
|
||||||
bool operator==(const FileInformation &first, const FileInformation &second)
|
bool operator==(const FileStatus &first, const FileStatus &second)
|
||||||
{
|
{
|
||||||
return first.filePathId == second.filePathId
|
return first.filePathId == second.filePathId
|
||||||
&& first.size == second.size
|
&& first.size == second.size
|
||||||
@@ -58,5 +58,5 @@ public:
|
|||||||
std::time_t lastModified;
|
std::time_t lastModified;
|
||||||
};
|
};
|
||||||
|
|
||||||
using FileInformations = std::vector<FileInformation>;
|
using FileStatuses = std::vector<FileStatus>;
|
||||||
}
|
}
|
@@ -197,8 +197,8 @@ public:
|
|||||||
"DELETE FROM newUsedMacros",
|
"DELETE FROM newUsedMacros",
|
||||||
database
|
database
|
||||||
};
|
};
|
||||||
WriteStatement insertFileInformations{
|
WriteStatement insertFileStatuses{
|
||||||
"INSERT OR REPLACE INTO fileInformations(sourceId, size, lastModified) VALUES (?,?,?)",
|
"INSERT OR REPLACE INTO fileStatuses(sourceId, size, lastModified) VALUES (?,?,?)",
|
||||||
database
|
database
|
||||||
};
|
};
|
||||||
WriteStatement insertIntoNewSourceDependenciesStatement{
|
WriteStatement insertIntoNewSourceDependenciesStatement{
|
||||||
|
@@ -71,7 +71,7 @@ void SymbolIndexer::updateProjectPart(V2::ProjectPartContainer &&projectPart,
|
|||||||
|
|
||||||
m_symbolStorage.insertOrUpdateUsedMacros(m_symbolsCollector.usedMacros());
|
m_symbolStorage.insertOrUpdateUsedMacros(m_symbolsCollector.usedMacros());
|
||||||
|
|
||||||
m_symbolStorage.insertFileInformations(m_symbolsCollector.fileInformations());
|
m_symbolStorage.insertFileStatuses(m_symbolsCollector.fileStatuses());
|
||||||
|
|
||||||
m_symbolStorage.insertOrUpdateSourceDependencies(m_symbolsCollector.sourceDependencies());
|
m_symbolStorage.insertOrUpdateSourceDependencies(m_symbolsCollector.sourceDependencies());
|
||||||
|
|
||||||
|
@@ -82,9 +82,9 @@ const UsedMacros &SymbolsCollector::usedMacros() const
|
|||||||
return m_collectMacrosSourceFileCallbacks.usedMacros();
|
return m_collectMacrosSourceFileCallbacks.usedMacros();
|
||||||
}
|
}
|
||||||
|
|
||||||
const FileInformations &SymbolsCollector::fileInformations() const
|
const FileStatuses &SymbolsCollector::fileStatuses() const
|
||||||
{
|
{
|
||||||
return m_collectMacrosSourceFileCallbacks.fileInformations();
|
return m_collectMacrosSourceFileCallbacks.fileStatuses();
|
||||||
}
|
}
|
||||||
|
|
||||||
const SourceDependencies &SymbolsCollector::sourceDependencies() const
|
const SourceDependencies &SymbolsCollector::sourceDependencies() const
|
||||||
|
@@ -52,7 +52,7 @@ public:
|
|||||||
const SourceLocationEntries &sourceLocations() const override;
|
const SourceLocationEntries &sourceLocations() const override;
|
||||||
const FilePathIds &sourceFiles() const override;
|
const FilePathIds &sourceFiles() const override;
|
||||||
const UsedMacros &usedMacros() const override;
|
const UsedMacros &usedMacros() const override;
|
||||||
const FileInformations &fileInformations() const override;
|
const FileStatuses &fileStatuses() const override;
|
||||||
const SourceDependencies &sourceDependencies() const override;
|
const SourceDependencies &sourceDependencies() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "fileinformation.h"
|
#include "filestatus.h"
|
||||||
#include "symbolentry.h"
|
#include "symbolentry.h"
|
||||||
#include "sourcedependency.h"
|
#include "sourcedependency.h"
|
||||||
#include "sourcelocationentry.h"
|
#include "sourcelocationentry.h"
|
||||||
@@ -56,7 +56,7 @@ public:
|
|||||||
virtual const SourceLocationEntries &sourceLocations() const = 0;
|
virtual const SourceLocationEntries &sourceLocations() const = 0;
|
||||||
virtual const FilePathIds &sourceFiles() const = 0;
|
virtual const FilePathIds &sourceFiles() const = 0;
|
||||||
virtual const UsedMacros &usedMacros() const = 0;
|
virtual const UsedMacros &usedMacros() const = 0;
|
||||||
virtual const FileInformations &fileInformations() const = 0;
|
virtual const FileStatuses &fileStatuses() const = 0;
|
||||||
virtual const SourceDependencies &sourceDependencies() const = 0;
|
virtual const SourceDependencies &sourceDependencies() const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -120,14 +120,14 @@ public:
|
|||||||
insertStatement.write(projectPartId, sourceFilePathId.filePathId);
|
insertStatement.write(projectPartId, sourceFilePathId.filePathId);
|
||||||
}
|
}
|
||||||
|
|
||||||
void insertFileInformations(const FileInformations &fileInformations)
|
void insertFileStatuses(const FileStatuses &fileStatuses)
|
||||||
{
|
{
|
||||||
WriteStatement &statement = m_statementFactory.insertFileInformations;
|
WriteStatement &statement = m_statementFactory.insertFileStatuses;
|
||||||
|
|
||||||
for (const FileInformation &fileInformation : fileInformations)
|
for (const FileStatus &fileStatus : fileStatuses)
|
||||||
statement.write(fileInformation.filePathId.filePathId,
|
statement.write(fileStatus.filePathId.filePathId,
|
||||||
fileInformation.size,
|
fileStatus.size,
|
||||||
fileInformation.lastModified);
|
fileStatus.lastModified);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Utils::SmallString toJson(const Utils::SmallStringVector &strings)
|
static Utils::SmallString toJson(const Utils::SmallStringVector &strings)
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "fileinformation.h"
|
#include "filestatus.h"
|
||||||
#include "projectpartentry.h"
|
#include "projectpartentry.h"
|
||||||
#include "sourcelocationentry.h"
|
#include "sourcelocationentry.h"
|
||||||
#include "sourcedependency.h"
|
#include "sourcedependency.h"
|
||||||
@@ -52,7 +52,7 @@ public:
|
|||||||
virtual void updateProjectPartSources(Utils::SmallStringView projectPartName,
|
virtual void updateProjectPartSources(Utils::SmallStringView projectPartName,
|
||||||
const FilePathIds &sourceFilePathIds) = 0;
|
const FilePathIds &sourceFilePathIds) = 0;
|
||||||
virtual void insertOrUpdateUsedMacros(const UsedMacros &usedMacros) = 0;
|
virtual void insertOrUpdateUsedMacros(const UsedMacros &usedMacros) = 0;
|
||||||
virtual void insertFileInformations(const FileInformations &fileInformations) = 0;
|
virtual void insertFileStatuses(const FileStatuses &fileStatuses) = 0;
|
||||||
virtual void insertOrUpdateSourceDependencies(const SourceDependencies &sourceDependencies) = 0;
|
virtual void insertOrUpdateSourceDependencies(const SourceDependencies &sourceDependencies) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
#include <clangcodemodelservermessages.h>
|
#include <clangcodemodelservermessages.h>
|
||||||
#include <clangpathwatcher.h>
|
#include <clangpathwatcher.h>
|
||||||
#include <clangrefactoringmessages.h>
|
#include <clangrefactoringmessages.h>
|
||||||
#include <fileinformation.h>
|
#include <filestatus.h>
|
||||||
#include <filepath.h>
|
#include <filepath.h>
|
||||||
#include <nativefilepath.h>
|
#include <nativefilepath.h>
|
||||||
#include <precompiledheadersupdatedmessage.h>
|
#include <precompiledheadersupdatedmessage.h>
|
||||||
@@ -855,14 +855,14 @@ std::ostream &operator<<(std::ostream &out, const UsedMacro &usedMacro)
|
|||||||
<< ")";
|
<< ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ostream &operator<<(std::ostream &out, const FileInformation &fileInformation)
|
std::ostream &operator<<(std::ostream &out, const FileStatus &fileStatus)
|
||||||
{
|
{
|
||||||
return out << "("
|
return out << "("
|
||||||
<< fileInformation.filePathId
|
<< fileStatus.filePathId
|
||||||
<< ", "
|
<< ", "
|
||||||
<< fileInformation.size
|
<< fileStatus.size
|
||||||
<< ", "
|
<< ", "
|
||||||
<< fileInformation.lastModified
|
<< fileStatus.lastModified
|
||||||
<< ")";
|
<< ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -133,7 +133,7 @@ using NativeFilePathView = AbstractFilePathView<'\\'>;
|
|||||||
class ToolTipInfo;
|
class ToolTipInfo;
|
||||||
class ProjectPartEntry;
|
class ProjectPartEntry;
|
||||||
class UsedMacro;
|
class UsedMacro;
|
||||||
class FileInformation;
|
class FileStatus;
|
||||||
class SourceDependency;
|
class SourceDependency;
|
||||||
|
|
||||||
std::ostream &operator<<(std::ostream &out, const SourceLocationEntry &entry);
|
std::ostream &operator<<(std::ostream &out, const SourceLocationEntry &entry);
|
||||||
@@ -198,7 +198,7 @@ std::ostream &operator<<(std::ostream &out, const FilePathView &filePathView);
|
|||||||
std::ostream &operator<<(std::ostream &out, const NativeFilePathView &nativeFilePathView);
|
std::ostream &operator<<(std::ostream &out, const NativeFilePathView &nativeFilePathView);
|
||||||
std::ostream &operator<<(std::ostream &out, const ProjectPartEntry &projectPartEntry);
|
std::ostream &operator<<(std::ostream &out, const ProjectPartEntry &projectPartEntry);
|
||||||
std::ostream &operator<<(std::ostream &out, const UsedMacro &usedMacro);
|
std::ostream &operator<<(std::ostream &out, const UsedMacro &usedMacro);
|
||||||
std::ostream &operator<<(std::ostream &out, const FileInformation &fileInformation);
|
std::ostream &operator<<(std::ostream &out, const FileStatus &fileStatus);
|
||||||
std::ostream &operator<<(std::ostream &out, const SourceDependency &sourceDependency);
|
std::ostream &operator<<(std::ostream &out, const SourceDependency &sourceDependency);
|
||||||
|
|
||||||
void PrintTo(const FilePath &filePath, ::std::ostream *os);
|
void PrintTo(const FilePath &filePath, ::std::ostream *os);
|
||||||
|
@@ -57,8 +57,8 @@ public:
|
|||||||
MOCK_CONST_METHOD0(usedMacros,
|
MOCK_CONST_METHOD0(usedMacros,
|
||||||
const ClangBackEnd::UsedMacros &());
|
const ClangBackEnd::UsedMacros &());
|
||||||
|
|
||||||
MOCK_CONST_METHOD0(fileInformations,
|
MOCK_CONST_METHOD0(fileStatuses,
|
||||||
const ClangBackEnd::FileInformations &());
|
const ClangBackEnd::FileStatuses &());
|
||||||
|
|
||||||
MOCK_CONST_METHOD0(sourceDependencies,
|
MOCK_CONST_METHOD0(sourceDependencies,
|
||||||
const ClangBackEnd::SourceDependencies &());
|
const ClangBackEnd::SourceDependencies &());
|
||||||
|
@@ -46,8 +46,8 @@ public:
|
|||||||
const ClangBackEnd::FilePathIds &sourceFilePathIds));
|
const ClangBackEnd::FilePathIds &sourceFilePathIds));
|
||||||
MOCK_METHOD1(insertOrUpdateUsedMacros,
|
MOCK_METHOD1(insertOrUpdateUsedMacros,
|
||||||
void (const ClangBackEnd::UsedMacros &usedMacros));
|
void (const ClangBackEnd::UsedMacros &usedMacros));
|
||||||
MOCK_METHOD1(insertFileInformations,
|
MOCK_METHOD1(insertFileStatuses,
|
||||||
void (const ClangBackEnd::FileInformations &fileInformations));
|
void (const ClangBackEnd::FileStatuses &fileStatuses));
|
||||||
MOCK_METHOD1(insertOrUpdateSourceDependencies,
|
MOCK_METHOD1(insertOrUpdateSourceDependencies,
|
||||||
void (const ClangBackEnd::SourceDependencies &sourceDependencies));
|
void (const ClangBackEnd::SourceDependencies &sourceDependencies));
|
||||||
};
|
};
|
||||||
|
@@ -114,13 +114,13 @@ TEST_F(RefactoringDatabaseInitializer, AddUsedMacrosTable)
|
|||||||
initializer.createUsedMacrosTable();
|
initializer.createUsedMacrosTable();
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(RefactoringDatabaseInitializer, AddFileInformationsTable)
|
TEST_F(RefactoringDatabaseInitializer, AddFileStatusesTable)
|
||||||
{
|
{
|
||||||
InSequence s;
|
InSequence s;
|
||||||
|
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS fileInformations(sourceId INTEGER PRIMARY KEY, size INTEGER, lastModified INTEGER)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS fileStatuses(sourceId INTEGER PRIMARY KEY, size INTEGER, lastModified INTEGER)")));
|
||||||
|
|
||||||
initializer.createFileInformationsTable();
|
initializer.createFileStatusesTable();
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(RefactoringDatabaseInitializer, AddSourceDependenciesTable)
|
TEST_F(RefactoringDatabaseInitializer, AddSourceDependenciesTable)
|
||||||
@@ -154,7 +154,7 @@ TEST_F(RefactoringDatabaseInitializer, CreateInTheContructor)
|
|||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS usedMacros(usedMacroId INTEGER PRIMARY KEY, sourceId INTEGER, macroName TEXT)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS usedMacros(usedMacroId INTEGER PRIMARY KEY, sourceId INTEGER, macroName TEXT)")));
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_usedMacros_sourceId_macroName ON usedMacros(sourceId, macroName)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_usedMacros_sourceId_macroName ON usedMacros(sourceId, macroName)")));
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_usedMacros_macroName ON usedMacros(macroName)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_usedMacros_macroName ON usedMacros(macroName)")));
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS fileInformations(sourceId INTEGER PRIMARY KEY, size INTEGER, lastModified INTEGER)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS fileStatuses(sourceId INTEGER PRIMARY KEY, size INTEGER, lastModified INTEGER)")));
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS sourceDependencies(sourceId INTEGER, dependencySourceId INTEGER)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE TABLE IF NOT EXISTS sourceDependencies(sourceId INTEGER, dependencySourceId INTEGER)")));
|
||||||
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_sourceDependencies_sourceId_dependencySourceId ON sourceDependencies(sourceId, dependencySourceId)")));
|
EXPECT_CALL(mockDatabase, execute(Eq("CREATE INDEX IF NOT EXISTS index_sourceDependencies_sourceId_dependencySourceId ON sourceDependencies(sourceId, dependencySourceId)")));
|
||||||
EXPECT_CALL(mockDatabase, commit());
|
EXPECT_CALL(mockDatabase, commit());
|
||||||
|
@@ -226,10 +226,10 @@ TEST_F(StorageSqliteStatementFactory, DeleteAllInNewUnusedMacros)
|
|||||||
Eq("DELETE FROM newUsedMacros"));
|
Eq("DELETE FROM newUsedMacros"));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(StorageSqliteStatementFactory, InsertFileInformations)
|
TEST_F(StorageSqliteStatementFactory, InsertFileStatuses)
|
||||||
{
|
{
|
||||||
ASSERT_THAT(factory.insertFileInformations.sqlStatement,
|
ASSERT_THAT(factory.insertFileStatuses.sqlStatement,
|
||||||
Eq("INSERT OR REPLACE INTO fileInformations(sourceId, size, lastModified) VALUES (?,?,?)"));
|
Eq("INSERT OR REPLACE INTO fileStatuses(sourceId, size, lastModified) VALUES (?,?,?)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(StorageSqliteStatementFactory, InsertIntoNewSourceDependencies)
|
TEST_F(StorageSqliteStatementFactory, InsertIntoNewSourceDependencies)
|
||||||
|
@@ -37,7 +37,7 @@
|
|||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
using Utils::PathString;
|
using Utils::PathString;
|
||||||
using ClangBackEnd::FileInformations;
|
using ClangBackEnd::FileStatuses;
|
||||||
using ClangBackEnd::FilePathIds;
|
using ClangBackEnd::FilePathIds;
|
||||||
using ClangBackEnd::FilePathView;
|
using ClangBackEnd::FilePathView;
|
||||||
using ClangBackEnd::V2::ProjectPartContainer;
|
using ClangBackEnd::V2::ProjectPartContainer;
|
||||||
@@ -67,7 +67,7 @@ protected:
|
|||||||
ON_CALL(mockCollector, sourceLocations()).WillByDefault(ReturnRef(sourceLocations));
|
ON_CALL(mockCollector, sourceLocations()).WillByDefault(ReturnRef(sourceLocations));
|
||||||
ON_CALL(mockCollector, sourceFiles()).WillByDefault(ReturnRef(sourceFileIds));
|
ON_CALL(mockCollector, sourceFiles()).WillByDefault(ReturnRef(sourceFileIds));
|
||||||
ON_CALL(mockCollector, usedMacros()).WillByDefault(ReturnRef(usedMacros));
|
ON_CALL(mockCollector, usedMacros()).WillByDefault(ReturnRef(usedMacros));
|
||||||
ON_CALL(mockCollector, fileInformations()).WillByDefault(ReturnRef(fileInformation));
|
ON_CALL(mockCollector, fileStatuses()).WillByDefault(ReturnRef(fileStatus));
|
||||||
ON_CALL(mockCollector, sourceDependencies()).WillByDefault(ReturnRef(sourceDependencies));
|
ON_CALL(mockCollector, sourceDependencies()).WillByDefault(ReturnRef(sourceDependencies));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,7 +95,7 @@ protected:
|
|||||||
SourceLocationEntries sourceLocations{{1, {1, 1}, {42, 23}, SymbolType::Declaration}};
|
SourceLocationEntries sourceLocations{{1, {1, 1}, {42, 23}, SymbolType::Declaration}};
|
||||||
FilePathIds sourceFileIds{{1, 1}, {42, 23}};
|
FilePathIds sourceFileIds{{1, 1}, {42, 23}};
|
||||||
UsedMacros usedMacros{{"Foo", {1, 1}}};
|
UsedMacros usedMacros{{"Foo", {1, 1}}};
|
||||||
FileInformations fileInformation{{{1, 2}, 3, 4}};
|
FileStatuses fileStatus{{{1, 2}, 3, 4}};
|
||||||
SourceDependencies sourceDependencies{{{1, 1}, {1, 2}}, {{1, 1}, {1, 3}}};
|
SourceDependencies sourceDependencies{{{1, 1}, {1, 2}}, {{1, 1}, {1, 3}}};
|
||||||
NiceMock<MockSqliteTransactionBackend> mockSqliteTransactionBackend;
|
NiceMock<MockSqliteTransactionBackend> mockSqliteTransactionBackend;
|
||||||
NiceMock<MockSymbolsCollector> mockCollector;
|
NiceMock<MockSymbolsCollector> mockCollector;
|
||||||
@@ -199,9 +199,9 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertOrUpdateUsedMacros)
|
|||||||
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
|
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertFileInformations)
|
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertFileStatuses)
|
||||||
{
|
{
|
||||||
EXPECT_CALL(mockStorage, insertFileInformations(Eq(fileInformation)))
|
EXPECT_CALL(mockStorage, insertFileStatuses(Eq(fileStatus)))
|
||||||
.Times(2);
|
.Times(2);
|
||||||
|
|
||||||
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
|
indexer.updateProjectParts({projectPart1, projectPart2}, Utils::clone(unsaved));
|
||||||
@@ -228,7 +228,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrder)
|
|||||||
EXPECT_CALL(mockStorage, insertOrUpdateProjectPart(_, _, _));
|
EXPECT_CALL(mockStorage, insertOrUpdateProjectPart(_, _, _));
|
||||||
EXPECT_CALL(mockStorage, updateProjectPartSources(_, _));
|
EXPECT_CALL(mockStorage, updateProjectPartSources(_, _));
|
||||||
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
|
EXPECT_CALL(mockStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
|
||||||
EXPECT_CALL(mockStorage, insertFileInformations(Eq(fileInformation)));
|
EXPECT_CALL(mockStorage, insertFileStatuses(Eq(fileStatus)));
|
||||||
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
|
EXPECT_CALL(mockStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
|
||||||
EXPECT_CALL(mockSqliteTransactionBackend, commit());
|
EXPECT_CALL(mockSqliteTransactionBackend, commit());
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@
|
|||||||
#include "filesystem-utilities.h"
|
#include "filesystem-utilities.h"
|
||||||
|
|
||||||
#include <symbolscollector.h>
|
#include <symbolscollector.h>
|
||||||
#include <fileinformation.h>
|
#include <filestatus.h>
|
||||||
|
|
||||||
#include <filepathcaching.h>
|
#include <filepathcaching.h>
|
||||||
#include <refactoringdatabaseinitializer.h>
|
#include <refactoringdatabaseinitializer.h>
|
||||||
@@ -115,7 +115,7 @@ protected:
|
|||||||
return QFileInfo(QString(filePath)).lastModified().toTime_t();
|
return QFileInfo(QString(filePath)).lastModified().toTime_t();
|
||||||
}
|
}
|
||||||
|
|
||||||
ClangBackEnd::FileInformation fileInformation(Utils::SmallStringView filePath) const
|
ClangBackEnd::FileStatus fileStatus(Utils::SmallStringView filePath) const
|
||||||
{
|
{
|
||||||
return {filePathId(filePath), fileSize(filePath), lastModified(filePath)};
|
return {filePathId(filePath), fileSize(filePath), lastModified(filePath)};
|
||||||
}
|
}
|
||||||
@@ -304,14 +304,14 @@ TEST_F(SymbolsCollector, ClearSourceLocations)
|
|||||||
ASSERT_THAT(collector.sourceLocations(), IsEmpty());
|
ASSERT_THAT(collector.sourceLocations(), IsEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, ClearFileInformation)
|
TEST_F(SymbolsCollector, ClearFileStatus)
|
||||||
{
|
{
|
||||||
collector.addFiles({filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")}, {"cc"});
|
collector.addFiles({filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")}, {"cc"});
|
||||||
collector.collectSymbols();
|
collector.collectSymbols();
|
||||||
|
|
||||||
collector.clear();
|
collector.clear();
|
||||||
|
|
||||||
ASSERT_THAT(collector.fileInformations(), IsEmpty());
|
ASSERT_THAT(collector.fileStatuses(), IsEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, ClearUsedMacros)
|
TEST_F(SymbolsCollector, ClearUsedMacros)
|
||||||
@@ -344,14 +344,14 @@ TEST_F(SymbolsCollector, DontCollectSourceFilesAfterFilesAreCleared)
|
|||||||
ASSERT_THAT(collector.sourceFiles(), IsEmpty());
|
ASSERT_THAT(collector.sourceFiles(), IsEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, DontCollectFileInformationAfterFilesAreCleared)
|
TEST_F(SymbolsCollector, DontCollectFileStatusAfterFilesAreCleared)
|
||||||
{
|
{
|
||||||
collector.addFiles({filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")}, {"cc"});
|
collector.addFiles({filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")}, {"cc"});
|
||||||
|
|
||||||
collector.clear();
|
collector.clear();
|
||||||
collector.collectSymbols();
|
collector.collectSymbols();
|
||||||
|
|
||||||
ASSERT_THAT(collector.fileInformations(), IsEmpty());
|
ASSERT_THAT(collector.fileStatuses(), IsEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, DontCollectUsedMacrosAfterFilesAreCleared)
|
TEST_F(SymbolsCollector, DontCollectUsedMacrosAfterFilesAreCleared)
|
||||||
@@ -552,18 +552,18 @@ TEST_F(SymbolsCollector, CollectMacroCompilerArgumentSymbols)
|
|||||||
Contains(HasSymbolName("COMPILER_ARGUMENT")));
|
Contains(HasSymbolName("COMPILER_ARGUMENT")));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, CollectFileInformations)
|
TEST_F(SymbolsCollector, CollectFileStatuses)
|
||||||
{
|
{
|
||||||
auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_main.cpp");
|
auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_main.cpp");
|
||||||
collector.addFiles({fileId}, {"cc"});
|
collector.addFiles({fileId}, {"cc"});
|
||||||
|
|
||||||
collector.collectSymbols();
|
collector.collectSymbols();
|
||||||
|
|
||||||
ASSERT_THAT(collector.fileInformations(),
|
ASSERT_THAT(collector.fileStatuses(),
|
||||||
ElementsAre(
|
ElementsAre(
|
||||||
fileInformation(TESTDATA_DIR "/symbolscollector_main.cpp"),
|
fileStatus(TESTDATA_DIR "/symbolscollector_main.cpp"),
|
||||||
fileInformation(TESTDATA_DIR "/symbolscollector_header1.h"),
|
fileStatus(TESTDATA_DIR "/symbolscollector_header1.h"),
|
||||||
fileInformation(TESTDATA_DIR "/symbolscollector_header2.h")));
|
fileStatus(TESTDATA_DIR "/symbolscollector_header2.h")));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolsCollector, CollectSourceDependencies)
|
TEST_F(SymbolsCollector, CollectSourceDependencies)
|
||||||
|
@@ -78,7 +78,7 @@ protected:
|
|||||||
MockSqliteWriteStatement &syncNewUsedMacrosStatement = statementFactory.syncNewUsedMacrosStatement;
|
MockSqliteWriteStatement &syncNewUsedMacrosStatement = statementFactory.syncNewUsedMacrosStatement;
|
||||||
MockSqliteWriteStatement &deleteOutdatedUsedMacrosStatement = statementFactory.deleteOutdatedUsedMacrosStatement;
|
MockSqliteWriteStatement &deleteOutdatedUsedMacrosStatement = statementFactory.deleteOutdatedUsedMacrosStatement;
|
||||||
MockSqliteWriteStatement &deleteNewUsedMacrosTableStatement = statementFactory.deleteNewUsedMacrosTableStatement;
|
MockSqliteWriteStatement &deleteNewUsedMacrosTableStatement = statementFactory.deleteNewUsedMacrosTableStatement;
|
||||||
MockSqliteWriteStatement &insertFileInformations = statementFactory.insertFileInformations;
|
MockSqliteWriteStatement &insertFileStatuses = statementFactory.insertFileStatuses;
|
||||||
MockSqliteWriteStatement &insertIntoNewSourceDependenciesStatement = statementFactory.insertIntoNewSourceDependenciesStatement;
|
MockSqliteWriteStatement &insertIntoNewSourceDependenciesStatement = statementFactory.insertIntoNewSourceDependenciesStatement;
|
||||||
MockSqliteWriteStatement &syncNewSourceDependenciesStatement = statementFactory.syncNewSourceDependenciesStatement;
|
MockSqliteWriteStatement &syncNewSourceDependenciesStatement = statementFactory.syncNewSourceDependenciesStatement;
|
||||||
MockSqliteWriteStatement &deleteOutdatedSourceDependenciesStatement = statementFactory.deleteOutdatedSourceDependenciesStatement;
|
MockSqliteWriteStatement &deleteOutdatedSourceDependenciesStatement = statementFactory.deleteOutdatedSourceDependenciesStatement;
|
||||||
@@ -235,12 +235,12 @@ TEST_F(SymbolStorage, InsertOrUpdateUsedMacros)
|
|||||||
storage.insertOrUpdateUsedMacros({{"FOO", {1, 42}}, {"BAR", {1, 43}}});
|
storage.insertOrUpdateUsedMacros({{"FOO", {1, 42}}, {"BAR", {1, 43}}});
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolStorage, InsertFileInformations)
|
TEST_F(SymbolStorage, InsertFileStatuses)
|
||||||
{
|
{
|
||||||
EXPECT_CALL(insertFileInformations, write(TypedEq<uint>(42), TypedEq<uint>(1), TypedEq<uint>(2)));
|
EXPECT_CALL(insertFileStatuses, write(TypedEq<uint>(42), TypedEq<uint>(1), TypedEq<uint>(2)));
|
||||||
EXPECT_CALL(insertFileInformations, write(TypedEq<uint>(43), TypedEq<uint>(4), TypedEq<uint>(5)));
|
EXPECT_CALL(insertFileStatuses, write(TypedEq<uint>(43), TypedEq<uint>(4), TypedEq<uint>(5)));
|
||||||
|
|
||||||
storage.insertFileInformations({{{1, 42}, 1, 2}, {{1, 43}, 4, 5}});
|
storage.insertFileStatuses({{{1, 42}, 1, 2}, {{1, 43}, 4, 5}});
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(SymbolStorage, InsertOrUpdateSourceDependencies)
|
TEST_F(SymbolStorage, InsertOrUpdateSourceDependencies)
|
||||||
|
Reference in New Issue
Block a user