feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UnitTests: Remove heap allocations in the DocumentProcessor test

Browse Source 
A fixture class is called for every test, so we don't need that setup
code.

Change-Id: I7fb2ee8248a161f701292a90eb6b8b88e9df08a7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Marco Bubke
2017-11-29 15:20:15 +01:00
parent 7376336e15
commit 8dac5ff1c4
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/unit/unittest/clangdocumentprocessor-test.cpp
View File

@@ -41,39 +41,23 @@ using namespace ClangBackEnd;
namespace {
struct Data {
Data()
{
projects.createOrUpdate({ProjectPartContainer(projectPartId)});
const QVector<FileContainer> fileContainer{FileContainer(filePath, projectPartId)};
document = documents.create(fileContainer).front();
documents.setVisibleInEditors({filePath});
documents.setUsedByCurrentEditor(filePath);
}
ClangBackEnd::ProjectParts projects;
ClangBackEnd::UnsavedFiles unsavedFiles;
ClangBackEnd::Documents documents{projects, unsavedFiles};
ClangBackEnd::Document document;
DummyIpcClient dummyIpcClient;
Utf8String filePath{Utf8StringLiteral(TESTDATA_DIR"/translationunits.cpp")};
Utf8String projectPartId{Utf8StringLiteral("/path/to/projectfile")};
};
class DocumentProcessor : public ::testing::Test
{
protected:
void SetUp() override;
void TearDown() override;
bool waitUntilAllJobsFinished(int timeOutInMs = 10000) const;
protected:
std::unique_ptr<Data> d;
std::unique_ptr<ClangBackEnd::DocumentProcessor> documentProcessor;
ClangBackEnd::ProjectParts projects;
ClangBackEnd::UnsavedFiles unsavedFiles;
ClangBackEnd::Documents documents{projects, unsavedFiles};
bool waitUntilAllJobsFinished(int timeOutInMs = 10000) const;
DummyIpcClient dummyIpcClient;
Utf8String filePath{Utf8StringLiteral(TESTDATA_DIR"/translationunits.cpp")};
Utf8String projectPartId{Utf8StringLiteral("/path/to/projectfile")};
std::unique_ptr<ClangBackEnd::DocumentProcessor> documentProcessor;
};
using DocumentProcessorSlowTest = DocumentProcessor;
@@ -98,18 +82,19 @@ TEST_F(DocumentProcessorSlowTest, ProcessSingleJob)
void DocumentProcessor::SetUp()
{
d.reset(new Data);
documentProcessor.reset(new ClangBackEnd::DocumentProcessor(d->document,
d->documents,
d->unsavedFiles,
d->projects,
d->dummyIpcClient));
const QVector<FileContainer> fileContainer{FileContainer(filePath, projectPartId)};
projects.createOrUpdate({ProjectPartContainer(projectPartId)});
ClangBackEnd::Document document = {documents.create(fileContainer).front()};
documents.setVisibleInEditors({filePath});
documents.setUsedByCurrentEditor(filePath);
documentProcessor = std::make_unique<ClangBackEnd::DocumentProcessor>(
document, documents, unsavedFiles, projects, dummyIpcClient);
}
void DocumentProcessor::TearDown()
{
ASSERT_TRUE(waitUntilAllJobsFinished()); // QFuture/QFutureWatcher is implemented with events
d.reset();
}
bool DocumentProcessor::waitUntilAllJobsFinished(int timeOutInMs) const