From 7cac843343bbaeeefb5f0af062edb5fc0233ec45 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 30 Aug 2018 16:18:19 +0200 Subject: [PATCH] ClangRefactoring: Remove unused code Change-Id: I752d688039e8bb85654fd54b61a0c8a4e6677954 Reviewed-by: Ivan Donchevskii --- .../source/clangrefactoringbackend-source.pri | 2 - .../source/projectpartqueue.cpp | 107 ------------- .../source/projectpartqueue.h | 46 ------ .../source/symbolindexertaskqueue.cpp | 33 +--- .../source/symbolindexertaskqueue.h | 6 +- .../source/symbolindexertaskqueueinterface.h | 2 +- .../unittest/mocksymbolindexertaskqueue.h | 2 +- tests/unit/unittest/projectpartqueue-test.cpp | 104 ------------- .../unittest/symbolindexertaskqueue-test.cpp | 146 +++++++----------- tests/unit/unittest/unittest.pro | 1 - 10 files changed, 58 insertions(+), 391 deletions(-) delete mode 100644 src/tools/clangrefactoringbackend/source/projectpartqueue.cpp delete mode 100644 src/tools/clangrefactoringbackend/source/projectpartqueue.h delete mode 100644 tests/unit/unittest/projectpartqueue-test.cpp diff --git a/src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri b/src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri index 558c86baebf..bea46904679 100644 --- a/src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri +++ b/src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri @@ -22,7 +22,6 @@ HEADERS += \ $$PWD/projectpartartefact.h \ $$PWD/filestatuscache.h \ $$PWD/indexdataconsumer.h \ - $$PWD/projectpartqueue.h \ $$PWD/sourcesmanager.h \ $$PWD/symbolindexertaskqueue.h \ $$PWD/symbolindexertaskscheduler.h \ @@ -76,7 +75,6 @@ SOURCES += \ $$PWD/symbolindexer.cpp \ $$PWD/projectpartartefact.cpp \ $$PWD/filestatuscache.cpp \ - $$PWD/projectpartqueue.cpp \ $$PWD/symbolindexertaskqueue.cpp \ $$PWD/symbolindexertaskscheduler.cpp \ $$PWD/symbolscollectormanager.cpp diff --git a/src/tools/clangrefactoringbackend/source/projectpartqueue.cpp b/src/tools/clangrefactoringbackend/source/projectpartqueue.cpp deleted file mode 100644 index d64714310b7..00000000000 --- a/src/tools/clangrefactoringbackend/source/projectpartqueue.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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 - -#include "projectpartqueue.h" - -namespace ClangBackEnd { - -ProjectPartQueue::ProjectPartQueue() -{ - -} - -void ProjectPartQueue::addProjectParts(V2::ProjectPartContainers &&projectParts) -{ - auto compare = [](const V2::ProjectPartContainer &first, const V2::ProjectPartContainer &second) { - return first.projectPartId < second.projectPartId; - }; - - auto merge = [](V2::ProjectPartContainer &&first, - V2::ProjectPartContainer &&second) { - first.arguments = std::move(second.arguments); - first.compilerMacros = std::move(second.compilerMacros); - first.includeSearchPaths = std::move(second.includeSearchPaths); - FilePathIds headerPathIds; - headerPathIds.reserve(first.headerPathIds.size() + second.headerPathIds.size()); - std::set_union(first.headerPathIds.begin(), - first.headerPathIds.end(), - second.headerPathIds.begin(), - second.headerPathIds.end(), - std::back_inserter(headerPathIds)); - first.headerPathIds = std::move(headerPathIds); - FilePathIds sourcePathIds; - headerPathIds.reserve(first.sourcePathIds.size() + second.sourcePathIds.size()); - std::set_union(first.sourcePathIds.begin(), - first.sourcePathIds.end(), - second.sourcePathIds.begin(), - second.sourcePathIds.end(), - std::back_inserter(sourcePathIds)); - first.sourcePathIds = std::move(sourcePathIds); - - return first; - }; - - m_projectParts = Utils::setUnionMerge(m_projectParts, - projectParts, - merge, - compare); -} - -class CompareDifference -{ -public: - bool operator()(const V2::ProjectPartContainer &first, const Utils::SmallString &second) - { - return first.projectPartId < second; - } - - bool operator()(const Utils::SmallString &first, const V2::ProjectPartContainer &second) - { - return first < second.projectPartId; - } -}; - -void ProjectPartQueue::removeProjectParts(const Utils::SmallStringVector &projectsPartIds) -{ - V2::ProjectPartContainers notToBeRemovedProjectParts; - notToBeRemovedProjectParts.reserve(m_projectParts.size()); - std::set_difference(std::make_move_iterator(m_projectParts.begin()), - std::make_move_iterator(m_projectParts.end()), - projectsPartIds.begin(), - projectsPartIds.end(), - std::back_inserter(notToBeRemovedProjectParts), - CompareDifference{}); - - m_projectParts = std::move(notToBeRemovedProjectParts); -} - -const V2::ProjectPartContainers &ProjectPartQueue::projectParts() const -{ - return m_projectParts; -} - -} // namespace ClangBackEnd diff --git a/src/tools/clangrefactoringbackend/source/projectpartqueue.h b/src/tools/clangrefactoringbackend/source/projectpartqueue.h deleted file mode 100644 index b885a1ccb28..00000000000 --- a/src/tools/clangrefactoringbackend/source/projectpartqueue.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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. -** -****************************************************************************/ - -#pragma once - -#include - -namespace ClangBackEnd { - -class ProjectPartQueue -{ -public: - ProjectPartQueue(); - - void addProjectParts(V2::ProjectPartContainers &&projectParts); - void removeProjectParts(const Utils::SmallStringVector &projectsPartIds); - - const V2::ProjectPartContainers &projectParts() const; - -private: - V2::ProjectPartContainers m_projectParts; -}; - -} // namespace ClangBackEnd diff --git a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.cpp b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.cpp index 3f02ca0adea..bb891467a67 100644 --- a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.cpp +++ b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.cpp @@ -42,12 +42,10 @@ void SymbolIndexerTaskQueue::addOrUpdateTasks(std::vector &&t m_tasks = Utils::setUnionMerge>(tasks, m_tasks, merge); } -void SymbolIndexerTaskQueue::removeTasks(const Utils::SmallStringVector &projectPartIds) +void SymbolIndexerTaskQueue::removeTasks(const std::vector &projectPartIds) { - std::vector ids = projectPartNumberIds(projectPartIds); - auto shouldBeRemoved = [&] (const SymbolIndexerTask& task) { - return std::binary_search(ids.begin(), ids.end(), task.projectPartId); + return std::binary_search(projectPartIds.begin(), projectPartIds.end(), task.projectPartId); }; auto newEnd = std::remove_if(m_tasks.begin(), m_tasks.end(), shouldBeRemoved); @@ -60,33 +58,6 @@ const std::vector &SymbolIndexerTaskQueue::tasks() const return m_tasks; } -std::size_t SymbolIndexerTaskQueue::projectPartNumberId(Utils::SmallStringView projectPartId) -{ - auto found = std::find(m_projectPartIds.begin(), m_projectPartIds.end(), projectPartId); - - if (found != m_projectPartIds.end()) - return std::size_t(std::distance(m_projectPartIds.begin(), found)); - - m_projectPartIds.emplace_back(projectPartId); - - return m_projectPartIds.size() - 1; -} - -std::vector SymbolIndexerTaskQueue::projectPartNumberIds(const Utils::SmallStringVector &projectPartIds) -{ - std::vector ids; - std::transform(projectPartIds.begin(), - projectPartIds.end(), - std::back_inserter(ids), - [&] (Utils::SmallStringView projectPartId) { - return projectPartNumberId(projectPartId); - }); - - std::sort(ids.begin(), ids.end()); - - return ids; -} - void SymbolIndexerTaskQueue::processTasks() { int taskCount = m_symbolIndexerScheduler.freeSlots(); diff --git a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h index 979129eb998..6a627e8865f 100644 --- a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h +++ b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueue.h @@ -53,14 +53,10 @@ public: {} void addOrUpdateTasks(std::vector &&tasks); - void removeTasks(const Utils::SmallStringVector &projectPartIds); + void removeTasks(const std::vector &projectPartIds); const std::vector &tasks() const; - std::size_t projectPartNumberId(Utils::SmallStringView projectPartId); - std::vector projectPartNumberIds(const Utils::SmallStringVector &projectPartIds) - /* [[ensures result: std::is_sorted(result)]] */; - void processTasks(); void syncTasks(); diff --git a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueueinterface.h b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueueinterface.h index d4d79ec6cfb..9e96a79e6c8 100644 --- a/src/tools/clangrefactoringbackend/source/symbolindexertaskqueueinterface.h +++ b/src/tools/clangrefactoringbackend/source/symbolindexertaskqueueinterface.h @@ -40,7 +40,7 @@ public: virtual void addOrUpdateTasks(std::vector &&tasks) = 0 /* [[expects: std::is_sorted(tasks)]] */; - virtual void removeTasks(const Utils::SmallStringVector &projectPartIds) = 0 + virtual void removeTasks(const std::vector &projectPartIds) = 0 /* [[expects: std::is_sorted(projectPartIds)]] */; virtual void processTasks() = 0; diff --git a/tests/unit/unittest/mocksymbolindexertaskqueue.h b/tests/unit/unittest/mocksymbolindexertaskqueue.h index 276dcf2c480..b17fecd5167 100644 --- a/tests/unit/unittest/mocksymbolindexertaskqueue.h +++ b/tests/unit/unittest/mocksymbolindexertaskqueue.h @@ -35,6 +35,6 @@ public: MOCK_METHOD1(addOrUpdateTasks, void (std::vector< ClangBackEnd::SymbolIndexerTask> &&tasks)); MOCK_METHOD1(removeTasks, - void (const Utils::SmallStringVector &projectPartIds)); + void (const std::vector &projectPartIds)); MOCK_METHOD0(processTasks, void()); }; diff --git a/tests/unit/unittest/projectpartqueue-test.cpp b/tests/unit/unittest/projectpartqueue-test.cpp deleted file mode 100644 index b6892df0872..00000000000 --- a/tests/unit/unittest/projectpartqueue-test.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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" - -#include - -namespace { - -class ProjectPartQueue : public testing::Test -{ -protected: - ClangBackEnd::ProjectPartQueue queue; - ClangBackEnd::V2::ProjectPartContainer projectPart1{"ProjectPart1", - {"--yi"}, - {{"YI","1"}}, - {"/yi"}, - {{1, 1}}, - {{1, 2}}}; - ClangBackEnd::V2::ProjectPartContainer projectPart2{"ProjectPart2", - {"--er"}, - {{"ER","2"}}, - {"/bar"}, - {{2, 3}}, - {{2, 4}}}; - ClangBackEnd::V2::ProjectPartContainer projectPart2b{"ProjectPart2", - {"--liang"}, - {{"LIANG","3"}}, - {"/liang"}, - {{2, 5}}, - {{2, 4}, {2, 6}}}; - ClangBackEnd::V2::ProjectPartContainer projectPart3{"ProjectPart3", - {"--san"}, - {{"SAN","2"}}, - {"/SAN"}, - {{3, 7}}, - {{3, 8}}}; - ClangBackEnd::V2::ProjectPartContainer projectPartMerged{"ProjectPart2", - {"--liang"}, - {{"LIANG","3"}}, - {"/liang"}, - {{2, 3}, {2, 5}}, - {{2, 4}, {2, 6}}}; -}; - -TEST_F(ProjectPartQueue, AddProjectPart) -{ - queue.addProjectParts({projectPart1}); - - queue.addProjectParts({projectPart2}); - - ASSERT_THAT(queue.projectParts(), ElementsAre(projectPart1, projectPart2)); -} - -TEST_F(ProjectPartQueue, IgnoreIdenticalProjectPart) -{ - queue.addProjectParts({projectPart1, projectPart2}); - - queue.addProjectParts({projectPart1, projectPart2}); - - ASSERT_THAT(queue.projectParts(), ElementsAre(projectPart1, projectPart2)); -} - -TEST_F(ProjectPartQueue, MergeSameProjectPartWithSameId) -{ - queue.addProjectParts({projectPart1, projectPart2}); - - queue.addProjectParts({projectPart1, projectPart2b, projectPart3}); - - ASSERT_THAT(queue.projectParts(), ElementsAre(projectPart1, projectPartMerged, projectPart3)); -} - -TEST_F(ProjectPartQueue, RemoveProjectPart) -{ - queue.addProjectParts({projectPart1, projectPart2, projectPart3}); - - queue.removeProjectParts({projectPart2.projectPartId}); - - ASSERT_THAT(queue.projectParts(), ElementsAre(projectPart1, projectPart3)); -} - -} diff --git a/tests/unit/unittest/symbolindexertaskqueue-test.cpp b/tests/unit/unittest/symbolindexertaskqueue-test.cpp index 5838fed0f92..cf337e5e69c 100644 --- a/tests/unit/unittest/symbolindexertaskqueue-test.cpp +++ b/tests/unit/unittest/symbolindexertaskqueue-test.cpp @@ -49,11 +49,6 @@ MATCHER_P2(IsTask, filePathId, projectPartId, class SymbolIndexerTaskQueue : public testing::Test { -protected: - int projectPartId(const Utils::SmallString &projectPartId) - { - return int(queue.projectPartNumberId(projectPartId)); - } protected: NiceMock mockSymbolIndexerTaskScheduler; ClangBackEnd::SymbolIndexerTaskQueue queue{mockSymbolIndexerTaskScheduler}; @@ -61,117 +56,82 @@ protected: TEST_F(SymbolIndexerTaskQueue, AddTasks) { - queue.addOrUpdateTasks({{{1, 2}, projectPartId("foo"), Callable{}}, - {{1, 4}, projectPartId("foo"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 1, Callable{}}, + {{1, 4}, 1, Callable{}}}); - queue.addOrUpdateTasks({{{1, 1}, projectPartId("foo"), Callable{}}, - {{1, 3}, projectPartId("foo"), Callable{}}, - {{1, 5}, projectPartId("foo"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); ASSERT_THAT(queue.tasks(), - ElementsAre(IsTask(FilePathId{1, 1}, projectPartId("foo")), - IsTask(FilePathId{1, 2}, projectPartId("foo")), - IsTask(FilePathId{1, 3}, projectPartId("foo")), - IsTask(FilePathId{1, 4}, projectPartId("foo")), - IsTask(FilePathId{1, 5}, projectPartId("foo")))); + ElementsAre(IsTask(FilePathId{1, 1}, 1), + IsTask(FilePathId{1, 2}, 1), + IsTask(FilePathId{1, 3}, 1), + IsTask(FilePathId{1, 4}, 1), + IsTask(FilePathId{1, 5}, 1))); } TEST_F(SymbolIndexerTaskQueue, ReplaceTask) { - queue.addOrUpdateTasks({{{1, 1}, projectPartId("foo"), Callable{}}, - {{1, 3}, projectPartId("foo"), Callable{}}, - {{1, 5}, projectPartId("foo"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); - queue.addOrUpdateTasks({{{1, 2}, projectPartId("foo"), Callable{}}, - {{1, 3}, projectPartId("foo"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}}); ASSERT_THAT(queue.tasks(), - ElementsAre(IsTask(FilePathId{1, 1}, projectPartId("foo")), - IsTask(FilePathId{1, 2}, projectPartId("foo")), - IsTask(FilePathId{1, 3}, projectPartId("foo")), - IsTask(FilePathId{1, 5}, projectPartId("foo")))); + ElementsAre(IsTask(FilePathId{1, 1}, 1), + IsTask(FilePathId{1, 2}, 1), + IsTask(FilePathId{1, 3}, 1), + IsTask(FilePathId{1, 5}, 1))); } TEST_F(SymbolIndexerTaskQueue, AddTaskWithDifferentProjectId) { - queue.addOrUpdateTasks({{{1, 1}, projectPartId("foo"), Callable{}}, - {{1, 3}, projectPartId("foo"), Callable{}}, - {{1, 5}, projectPartId("foo"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); - queue.addOrUpdateTasks({{{1, 2}, projectPartId("bar"), Callable{}}, - {{1, 3}, projectPartId("bar"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 2, Callable{}}, + {{1, 3}, 2, Callable{}}}); ASSERT_THAT(queue.tasks(), - ElementsAre(IsTask(FilePathId{1, 1}, projectPartId("foo")), - IsTask(FilePathId{1, 2}, projectPartId("bar")), - IsTask(FilePathId{1, 3}, projectPartId("foo")), - IsTask(FilePathId{1, 3}, projectPartId("bar")), - IsTask(FilePathId{1, 5}, projectPartId("foo")))); + ElementsAre(IsTask(FilePathId{1, 1}, 1), + IsTask(FilePathId{1, 2}, 2), + IsTask(FilePathId{1, 3}, 1), + IsTask(FilePathId{1, 3}, 2), + IsTask(FilePathId{1, 5}, 1))); } TEST_F(SymbolIndexerTaskQueue, RemoveTaskByProjectParts) { - queue.addOrUpdateTasks({{{1, 1}, projectPartId("yi"), Callable{}}, - {{1, 3}, projectPartId("yi"), Callable{}}, - {{1, 5}, projectPartId("yi"), Callable{}}}); - queue.addOrUpdateTasks({{{1, 2}, projectPartId("er"), Callable{}}, - {{1, 3}, projectPartId("er"), Callable{}}}); - queue.addOrUpdateTasks({{{1, 2}, projectPartId("san"), Callable{}}, - {{1, 3}, projectPartId("san"), Callable{}}}); - queue.addOrUpdateTasks({{{1, 2}, projectPartId("se"), Callable{}}, - {{1, 3}, projectPartId("se"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 2, Callable{}}, + {{1, 3}, 2, Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 3, Callable{}}, + {{1, 3}, 3, Callable{}}}); + queue.addOrUpdateTasks({{{1, 2}, 4, Callable{}}, + {{1, 3}, 4, Callable{}}}); - queue.removeTasks({"er", "san"}); + queue.removeTasks({2, 3}); ASSERT_THAT(queue.tasks(), - ElementsAre(IsTask(FilePathId{1, 1}, projectPartId("yi")), - IsTask(FilePathId{1, 2}, projectPartId("se")), - IsTask(FilePathId{1, 3}, projectPartId("yi")), - IsTask(FilePathId{1, 3}, projectPartId("se")), - IsTask(FilePathId{1, 5}, projectPartId("yi")))); -} - -TEST_F(SymbolIndexerTaskQueue, GetProjectPartIdIfEmpty) -{ - auto id = queue.projectPartNumberId("foo"); - - ASSERT_THAT(id , 0); -} - -TEST_F(SymbolIndexerTaskQueue, GetProjectPartIdIfNotExists) -{ - queue.projectPartNumberId("foo"); - - auto id = queue.projectPartNumberId("bar"); - - ASSERT_THAT(id , 1); -} - -TEST_F(SymbolIndexerTaskQueue, GetProjectPartIdIfExists) -{ - queue.projectPartNumberId("foo"); - queue.projectPartNumberId("bar"); - - auto id = queue.projectPartNumberId("foo"); - - ASSERT_THAT(id , 0); -} - -TEST_F(SymbolIndexerTaskQueue, GetProjectPartIds) -{ - queue.projectPartNumberIds({"yi", "er", "san"}); - - auto ids = queue.projectPartNumberIds({"yi", "se", "san"}); - - ASSERT_THAT(ids , ElementsAre(0, 2, 3)); + ElementsAre(IsTask(FilePathId{1, 1}, 1), + IsTask(FilePathId{1, 2}, 4), + IsTask(FilePathId{1, 3}, 1), + IsTask(FilePathId{1, 3}, 4), + IsTask(FilePathId{1, 5}, 1))); } TEST_F(SymbolIndexerTaskQueue, ProcessTasksCallsFreeSlotsAndAddTasksInScheduler) { InSequence s; - queue.addOrUpdateTasks({{{1, 1}, projectPartId("yi"), Callable{}}, - {{1, 3}, projectPartId("yi"), Callable{}}, - {{1, 5}, projectPartId("yi"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); EXPECT_CALL(mockSymbolIndexerTaskScheduler, freeSlots()).WillRepeatedly(Return(2)); EXPECT_CALL(mockSymbolIndexerTaskScheduler, addTasks(SizeIs(2))); @@ -192,9 +152,9 @@ TEST_F(SymbolIndexerTaskQueue, ProcessTasksCallsFreeSlotsAndAddTasksWithNoTaskIn TEST_F(SymbolIndexerTaskQueue, ProcessTasksCallsFreeSlotsAndMoveAllTasksInSchedulerIfMoreSlotsAreFree) { InSequence s; - queue.addOrUpdateTasks({{{1, 1}, projectPartId("yi"), Callable{}}, - {{1, 3}, projectPartId("yi"), Callable{}}, - {{1, 5}, projectPartId("yi"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); EXPECT_CALL(mockSymbolIndexerTaskScheduler, freeSlots()).WillRepeatedly(Return(4)); EXPECT_CALL(mockSymbolIndexerTaskScheduler, addTasks(SizeIs(3))); @@ -204,9 +164,9 @@ TEST_F(SymbolIndexerTaskQueue, ProcessTasksCallsFreeSlotsAndMoveAllTasksInSchedu TEST_F(SymbolIndexerTaskQueue, ProcessTasksRemovesProcessedTasks) { - queue.addOrUpdateTasks({{{1, 1}, projectPartId("yi"), Callable{}}, - {{1, 3}, projectPartId("yi"), Callable{}}, - {{1, 5}, projectPartId("yi"), Callable{}}}); + queue.addOrUpdateTasks({{{1, 1}, 1, Callable{}}, + {{1, 3}, 1, Callable{}}, + {{1, 5}, 1, Callable{}}}); ON_CALL(mockSymbolIndexerTaskScheduler, freeSlots()).WillByDefault(Return(2)); queue.processTasks(); diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index d329900d1ea..c0ae7bd2303 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -93,7 +93,6 @@ SOURCES += \ filestatuscache-test.cpp \ highlightingresultreporter-test.cpp \ precompiledheaderstorage-test.cpp \ - projectpartqueue-test.cpp \ generatedfiles-test.cpp \ sourcesmanager-test.cpp \ symbolindexertaskqueue-test.cpp \