From 32f46e55ed5297157d1abf499d70f6c0f08d34d7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 2 Jul 2021 16:52:13 +0200 Subject: [PATCH] CppTools: Move ProjectPartChooser tests into the plugin Change-Id: Ic2ef95d4d6a5bd65cbc611b66a0b297c7468bbcb Reviewed-by: Christian Stenger --- src/plugins/cpptools/CMakeLists.txt | 1 + src/plugins/cpptools/cpptools.pro | 1 + src/plugins/cpptools/cpptools.qbs | 1 + src/plugins/cpptools/cpptoolsplugin.h | 22 ++ .../cpptools/cpptoolsunittestfiles.pri | 2 - src/plugins/cpptools/projectinfo_test.cpp | 322 ++++++++++++++++ tests/unit/unittest/CMakeLists.txt | 1 - .../unittest/cppprojectpartchooser-test.cpp | 356 ------------------ tests/unit/unittest/unittest.pro | 1 - tests/unit/unittest/unittest.qbs | 1 - 10 files changed, 347 insertions(+), 361 deletions(-) create mode 100644 src/plugins/cpptools/projectinfo_test.cpp delete mode 100644 tests/unit/unittest/cppprojectpartchooser-test.cpp diff --git a/src/plugins/cpptools/CMakeLists.txt b/src/plugins/cpptools/CMakeLists.txt index 4f5dbf7fee3..09ab76ebb3c 100644 --- a/src/plugins/cpptools/CMakeLists.txt +++ b/src/plugins/cpptools/CMakeLists.txt @@ -122,6 +122,7 @@ extend_qtc_plugin(CppTools cppsourceprocessor_test.cpp cpptoolstestcase.cpp cpptoolstestcase.h modelmanagertesthelper.cpp modelmanagertesthelper.h + projectinfo_test.cpp symbolsearcher_test.cpp typehierarchybuilder_test.cpp ) diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 576d3087454..3aa8c2a1347 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -216,6 +216,7 @@ equals(TEST, 1) { cpptoolstestcase.cpp \ compileroptionsbuilder_test.cpp \ modelmanagertesthelper.cpp \ + projectinfo_test.cpp \ symbolsearcher_test.cpp \ typehierarchybuilder_test.cpp diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 5418f1cd040..51684584845 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -242,6 +242,7 @@ Project { "cppsourceprocessor_test.cpp", "modelmanagertesthelper.cpp", "modelmanagertesthelper.h", + "projectinfo_test.cpp", "symbolsearcher_test.cpp", "typehierarchybuilder_test.cpp", ] diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 51eea65deca..947d2c2d356 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -210,6 +210,28 @@ private slots: void test_optionsBuilder_buildAllOptions(); void test_optionsBuilder_buildAllOptionsMsvc(); void test_optionsBuilder_buildAllOptionsMsvcWithExceptions(); + + void test_projectPartChooser_chooseManuallySet(); + void test_projectPartChooser_indicateManuallySet(); + void test_projectPartChooser_indicateManuallySetForFallbackToProjectPartFromDependencies(); + void test_projectPartChooser_doNotIndicateNotManuallySet(); + void test_projectPartChooser_forMultipleChooseFromActiveProject(); + void test_projectPartChooser_forMultiplePreferSelectedForBuilding(); + void test_projectPartChooser_forMultipleFromDependenciesChooseFromActiveProject(); + void test_projectPartChooser_forMultipleCheckIfActiveProjectChanged(); + void test_projectPartChooser_forMultipleAndAmbigiousHeaderPreferCProjectPart(); + void test_projectPartChooser_forMultipleAndAmbigiousHeaderPreferCxxProjectPart(); + void test_projectPartChooser_indicateMultiple(); + void test_projectPartChooser_indicateMultipleForFallbackToProjectPartFromDependencies(); + void test_projectPartChooser_forMultipleChooseNewIfPreviousIsGone(); + void test_projectPartChooser_fallbackToProjectPartFromDependencies(); + void test_projectPartChooser_fallbackToProjectPartFromModelManager(); + void test_projectPartChooser_continueUsingFallbackFromModelManagerIfProjectDoesNotChange(); + void test_projectPartChooser_stopUsingFallbackFromModelManagerIfProjectChanges1(); + void test_projectPartChooser_stopUsingFallbackFromModelManagerIfProjectChanges2(); + void test_projectPartChooser_indicateFallbacktoProjectPartFromModelManager(); + void test_projectPartChooser_indicateFromDependencies(); + void test_projectPartChooser_doNotIndicateFromDependencies(); #endif private: diff --git a/src/plugins/cpptools/cpptoolsunittestfiles.pri b/src/plugins/cpptools/cpptoolsunittestfiles.pri index c7b54eb7f85..2c408862171 100644 --- a/src/plugins/cpptools/cpptoolsunittestfiles.pri +++ b/src/plugins/cpptools/cpptoolsunittestfiles.pri @@ -11,7 +11,6 @@ HEADERS += \ $$PWD/cppprojectfilecategorizer.h \ $$PWD/projectinfo.h \ $$PWD/cppprojectinfogenerator.cpp \ - $$PWD/cppprojectpartchooser.h \ $$PWD/headerpathfilter.h SOURCES += \ @@ -21,5 +20,4 @@ SOURCES += \ $$PWD/cppprojectfilecategorizer.cpp \ $$PWD/projectinfo.cpp \ $$PWD/cppprojectinfogenerator.cpp \ - $$PWD/cppprojectpartchooser.cpp \ $$PWD/headerpathfilter.cpp diff --git a/src/plugins/cpptools/projectinfo_test.cpp b/src/plugins/cpptools/projectinfo_test.cpp new file mode 100644 index 00000000000..bbac13216d8 --- /dev/null +++ b/src/plugins/cpptools/projectinfo_test.cpp @@ -0,0 +1,322 @@ +/**************************************************************************** +** +** Copyright (C) 2021 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 "cppprojectpartchooser.h" +#include "cpptoolsplugin.h" + +#include + +namespace CppTools { +namespace Internal { + +namespace { +class ProjectPartChooserTest +{ +public: + ProjectPartChooserTest() + { + chooser.setFallbackProjectPart([&]() { + return fallbackProjectPart; + }); + chooser.setProjectPartsForFile([&](const QString &) { + return projectPartsForFile; + }); + chooser.setProjectPartsFromDependenciesForFile([&](const QString &) { + return projectPartsFromDependenciesForFile; + }); + } + + const ProjectPartInfo choose() + { + return chooser.choose(filePath, currentProjectPartInfo, preferredProjectPartId, + activeProject, languagePreference, projectsChanged); + } + + static QList createProjectPartsWithDifferentProjects() + { + QList projectParts; + + const ProjectPart::Ptr p1{new ProjectPart}; + p1->project = reinterpret_cast(1 << 0); + projectParts.append(p1); + const ProjectPart::Ptr p2{new ProjectPart}; + p2->project = reinterpret_cast(1 << 1); + projectParts.append(p2); + + return projectParts; + } + + static QList createCAndCxxProjectParts() + { + QList projectParts; + + // Create project part for C + const ProjectPart::Ptr cprojectpart{new ProjectPart}; + cprojectpart->languageVersion = Utils::LanguageVersion::C11; + projectParts.append(cprojectpart); + + // Create project part for CXX + const ProjectPart::Ptr cxxprojectpart{new ProjectPart}; + cxxprojectpart->languageVersion = Utils::LanguageVersion::CXX98; + projectParts.append(cxxprojectpart); + + return projectParts; + } + + QString filePath; + ProjectPart::Ptr currentProjectPart{new ProjectPart}; + ProjectPartInfo currentProjectPartInfo{currentProjectPart, + {currentProjectPart}, + ProjectPartInfo::NoHint}; + QString preferredProjectPartId; + const ProjectExplorer::Project *activeProject = nullptr; + Language languagePreference = Language::Cxx; + bool projectsChanged = false; + ProjectPartChooser chooser; + + QList projectPartsForFile; + QList projectPartsFromDependenciesForFile; + ProjectPart::Ptr fallbackProjectPart; +}; +} + +void CppToolsPlugin::test_projectPartChooser_chooseManuallySet() +{ + ProjectPart::Ptr p1(new ProjectPart); + ProjectPart::Ptr p2(new ProjectPart); + ProjectPartChooserTest t; + p2->projectFile = "someId"; + t.preferredProjectPartId = p2->projectFile; + t.projectPartsForFile += {p1, p2}; + + QCOMPARE(t.choose().projectPart, p2); +} + +void CppToolsPlugin::test_projectPartChooser_indicateManuallySet() +{ + ProjectPart::Ptr p1(new ProjectPart); + ProjectPart::Ptr p2(new ProjectPart); + ProjectPartChooserTest t; + p2->projectFile = "someId"; + t.preferredProjectPartId = p2->projectFile; + t.projectPartsForFile += {p1, p2}; + + QVERIFY(t.choose().hints & ProjectPartInfo::IsPreferredMatch); +} + +void CppToolsPlugin::test_projectPartChooser_indicateManuallySetForFallbackToProjectPartFromDependencies() +{ + ProjectPart::Ptr p1(new ProjectPart); + ProjectPart::Ptr p2(new ProjectPart); + ProjectPartChooserTest t; + p2->projectFile = "someId"; + t.preferredProjectPartId = p2->projectFile; + t.projectPartsFromDependenciesForFile += {p1, p2}; + + QVERIFY(t.choose().hints & ProjectPartInfo::IsPreferredMatch); +} + +void CppToolsPlugin::test_projectPartChooser_doNotIndicateNotManuallySet() +{ + QVERIFY(!(ProjectPartChooserTest().choose().hints & ProjectPartInfo::IsPreferredMatch)); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleChooseFromActiveProject() +{ + ProjectPartChooserTest t; + const QList projectParts = t.createProjectPartsWithDifferentProjects(); + const ProjectPart::Ptr secondProjectPart = projectParts.at(1); + t.projectPartsForFile += projectParts; + t.activeProject = secondProjectPart->project; + + QCOMPARE(t.choose().projectPart, secondProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_forMultiplePreferSelectedForBuilding() +{ + const ProjectPart::Ptr firstProjectPart{new ProjectPart}; + const ProjectPart::Ptr secondProjectPart{new ProjectPart}; + firstProjectPart->selectedForBuilding = false; + secondProjectPart->selectedForBuilding = true; + ProjectPartChooserTest t; + t.projectPartsForFile += firstProjectPart; + t.projectPartsForFile += secondProjectPart; + + QCOMPARE(t.choose().projectPart, secondProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleFromDependenciesChooseFromActiveProject() +{ + ProjectPartChooserTest t; + const QList projectParts = t.createProjectPartsWithDifferentProjects(); + const ProjectPart::Ptr secondProjectPart = projectParts.at(1); + t.projectPartsFromDependenciesForFile += projectParts; + t.activeProject = secondProjectPart->project; + + QCOMPARE(t.choose().projectPart, secondProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleCheckIfActiveProjectChanged() +{ + ProjectPartChooserTest t; + const QList projectParts = t.createProjectPartsWithDifferentProjects(); + const ProjectPart::Ptr firstProjectPart = projectParts.at(0); + const ProjectPart::Ptr secondProjectPart = projectParts.at(1); + t.projectPartsForFile += projectParts; + t.currentProjectPartInfo.projectPart = firstProjectPart; + t.activeProject = secondProjectPart->project; + + QCOMPARE(t.choose().projectPart, secondProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleAndAmbigiousHeaderPreferCProjectPart() +{ + ProjectPartChooserTest t; + t.languagePreference = Language::C; + t.projectPartsForFile = t.createCAndCxxProjectParts(); + const ProjectPart::Ptr cProjectPart = t.projectPartsForFile.at(0); + + QCOMPARE(t.choose().projectPart, cProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleAndAmbigiousHeaderPreferCxxProjectPart() +{ + ProjectPartChooserTest t; + t.languagePreference = Language::Cxx; + t.projectPartsForFile = t.createCAndCxxProjectParts(); + const ProjectPart::Ptr cxxProjectPart = t.projectPartsForFile.at(1); + + QCOMPARE(t.choose().projectPart, cxxProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_indicateMultiple() +{ + const ProjectPart::Ptr p1{new ProjectPart}; + const ProjectPart::Ptr p2{new ProjectPart}; + ProjectPartChooserTest t; + t.projectPartsForFile += { p1, p2 }; + + QVERIFY(t.choose().hints & ProjectPartInfo::IsAmbiguousMatch); +} + +void CppToolsPlugin::test_projectPartChooser_indicateMultipleForFallbackToProjectPartFromDependencies() +{ + const ProjectPart::Ptr p1{new ProjectPart}; + const ProjectPart::Ptr p2{new ProjectPart}; + ProjectPartChooserTest t; + t.projectPartsFromDependenciesForFile += { p1, p2 }; + + QVERIFY(t.choose().hints & ProjectPartInfo::IsAmbiguousMatch); +} + +void CppToolsPlugin::test_projectPartChooser_forMultipleChooseNewIfPreviousIsGone() +{ + const ProjectPart::Ptr newProjectPart{new ProjectPart}; + ProjectPartChooserTest t; + t.projectPartsForFile += newProjectPart; + + QCOMPARE(t.choose().projectPart, newProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_fallbackToProjectPartFromDependencies() +{ + const ProjectPart::Ptr fromDependencies{new ProjectPart}; + ProjectPartChooserTest t; + t.projectPartsFromDependenciesForFile += fromDependencies; + + QCOMPARE(t.choose().projectPart, fromDependencies); +} + +void CppToolsPlugin::test_projectPartChooser_fallbackToProjectPartFromModelManager() +{ + ProjectPartChooserTest t; + t.fallbackProjectPart.reset(new ProjectPart); + + QCOMPARE(t.choose().projectPart, t.fallbackProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_continueUsingFallbackFromModelManagerIfProjectDoesNotChange() +{ + // ...without re-calculating the dependency table. + ProjectPartChooserTest t; + t.fallbackProjectPart.reset(new ProjectPart); + t.currentProjectPartInfo.projectPart = t.fallbackProjectPart; + t.currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; + t.projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart); + + QCOMPARE(t.choose().projectPart, t.fallbackProjectPart); +} + +void CppToolsPlugin::test_projectPartChooser_stopUsingFallbackFromModelManagerIfProjectChanges1() +{ + ProjectPartChooserTest t; + t.fallbackProjectPart.reset(new ProjectPart); + t.currentProjectPartInfo.projectPart = t.fallbackProjectPart; + t.currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; + const ProjectPart::Ptr addedProject(new ProjectPart); + t.projectPartsForFile += addedProject; + + QCOMPARE(t.choose().projectPart, addedProject); +} + +void CppToolsPlugin::test_projectPartChooser_stopUsingFallbackFromModelManagerIfProjectChanges2() +{ + ProjectPartChooserTest t; + t.fallbackProjectPart.reset(new ProjectPart); + t.currentProjectPartInfo.projectPart = t.fallbackProjectPart; + t.currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; + const ProjectPart::Ptr addedProject(new ProjectPart); + t.projectPartsFromDependenciesForFile += addedProject; + t.projectsChanged = true; + + QCOMPARE(t.choose().projectPart, addedProject); +} + +void CppToolsPlugin::test_projectPartChooser_indicateFallbacktoProjectPartFromModelManager() +{ + ProjectPartChooserTest t; + t.fallbackProjectPart.reset(new ProjectPart); + + QVERIFY(t.choose().hints & ProjectPartInfo::IsFallbackMatch); +} + +void CppToolsPlugin::test_projectPartChooser_indicateFromDependencies() +{ + ProjectPartChooserTest t; + t.projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart); + + QVERIFY(t.choose().hints & ProjectPartInfo::IsFromDependenciesMatch); +} + +void CppToolsPlugin::test_projectPartChooser_doNotIndicateFromDependencies() +{ + ProjectPartChooserTest t; + t.projectPartsForFile += ProjectPart::Ptr(new ProjectPart); + + QVERIFY(!(t.choose().hints & ProjectPartInfo::IsFromDependenciesMatch)); +} + +} // namespace Internal +} // namespace CppTools diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt index 6ea6ee7bd0d..a941902d6bb 100644 --- a/tests/unit/unittest/CMakeLists.txt +++ b/tests/unit/unittest/CMakeLists.txt @@ -45,7 +45,6 @@ add_qtc_test(unittest GTEST conditionally-disabled-tests.h cppprojectfilecategorizer-test.cpp cppprojectinfogenerator-test.cpp - cppprojectpartchooser-test.cpp dummyclangipcclient.h dynamicastmatcherdiagnosticcontainer-matcher.h eventspy.cpp eventspy.h diff --git a/tests/unit/unittest/cppprojectpartchooser-test.cpp b/tests/unit/unittest/cppprojectpartchooser-test.cpp deleted file mode 100644 index 308b493b6ef..00000000000 --- a/tests/unit/unittest/cppprojectpartchooser-test.cpp +++ /dev/null @@ -1,356 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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 -#include -#include - -using CppTools::Internal::ProjectPartChooser; -using CppTools::ProjectPart; -using CppTools::ProjectPartInfo; -using CppTools::Language; - -using testing::Eq; - -namespace { - -class ProjectPartChooser : public ::testing::Test -{ -protected: - void SetUp() override; - const ProjectPartInfo choose() const; - - static QList createProjectPartsWithDifferentProjects(); - static QList createCAndCxxProjectParts(); - -protected: - QString filePath; - ProjectPart::Ptr currentProjectPart{new ProjectPart}; - ProjectPartInfo currentProjectPartInfo{currentProjectPart, - {currentProjectPart}, - ProjectPartInfo::NoHint}; - QString preferredProjectPartId; - const ProjectExplorer::Project *activeProject = nullptr; - Language languagePreference = Language::Cxx; - bool projectsChanged = false; - ::ProjectPartChooser chooser; - - QList projectPartsForFile; - QList projectPartsFromDependenciesForFile; - ProjectPart::Ptr fallbackProjectPart; -}; - -TEST_F(ProjectPartChooser, ChooseManuallySet) -{ - ProjectPart::Ptr p1(new ProjectPart); - ProjectPart::Ptr p2(new ProjectPart); - p2->projectFile = preferredProjectPartId = "someId"; - projectPartsForFile += {p1, p2}; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(p2)); -} - -TEST_F(ProjectPartChooser, IndicateManuallySet) -{ - ProjectPart::Ptr p1(new ProjectPart); - ProjectPart::Ptr p2(new ProjectPart); - p2->projectFile = preferredProjectPartId = "someId"; - projectPartsForFile += {p1, p2}; - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsPreferredMatch); -} - -TEST_F(ProjectPartChooser, IndicateManuallySetForFallbackToProjectPartFromDependencies) -{ - ProjectPart::Ptr p1(new ProjectPart); - ProjectPart::Ptr p2(new ProjectPart); - p2->projectFile = preferredProjectPartId = "someId"; - projectPartsFromDependenciesForFile += {p1, p2}; - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsPreferredMatch); -} - -TEST_F(ProjectPartChooser, DoNotIndicateNotManuallySet) -{ - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_FALSE(hints & ProjectPartInfo::IsPreferredMatch); -} - -TEST_F(ProjectPartChooser, ForMultipleChooseFromActiveProject) -{ - const QList projectParts = createProjectPartsWithDifferentProjects(); - const ProjectPart::Ptr secondProjectPart = projectParts.at(1); - projectPartsForFile += projectParts; - activeProject = secondProjectPart->project; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(secondProjectPart)); -} - -TEST_F(ProjectPartChooser, ForMultiplePreferSelectedForBuilding) -{ - const ProjectPart::Ptr firstProjectPart{new ProjectPart}; - const ProjectPart::Ptr secondProjectPart{new ProjectPart}; - firstProjectPart->selectedForBuilding = false; - secondProjectPart->selectedForBuilding = true; - projectPartsForFile += firstProjectPart; - projectPartsForFile += secondProjectPart; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(secondProjectPart)); -} - -TEST_F(ProjectPartChooser, ForMultipleFromDependenciesChooseFromActiveProject) -{ - const QList projectParts = createProjectPartsWithDifferentProjects(); - const ProjectPart::Ptr secondProjectPart = projectParts.at(1); - projectPartsFromDependenciesForFile += projectParts; - activeProject = secondProjectPart->project; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(secondProjectPart)); -} - -TEST_F(ProjectPartChooser, ForMultipleCheckIfActiveProjectChanged) -{ - const QList projectParts = createProjectPartsWithDifferentProjects(); - const ProjectPart::Ptr firstProjectPart = projectParts.at(0); - const ProjectPart::Ptr secondProjectPart = projectParts.at(1); - projectPartsForFile += projectParts; - currentProjectPartInfo.projectPart = firstProjectPart; - activeProject = secondProjectPart->project; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(secondProjectPart)); -} - -TEST_F(ProjectPartChooser, ForMultipleAndAmbigiousHeaderPreferCProjectPart) -{ - languagePreference = Language::C; - projectPartsForFile = createCAndCxxProjectParts(); - const ProjectPart::Ptr cProjectPart = projectPartsForFile.at(0); - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(cProjectPart)); -} - -TEST_F(ProjectPartChooser, ForMultipleAndAmbigiousHeaderPreferCxxProjectPart) -{ - languagePreference = Language::Cxx; - projectPartsForFile = createCAndCxxProjectParts(); - const ProjectPart::Ptr cxxProjectPart = projectPartsForFile.at(1); - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(cxxProjectPart)); -} - -TEST_F(ProjectPartChooser, IndicateMultiple) -{ - const ProjectPart::Ptr p1{new ProjectPart}; - const ProjectPart::Ptr p2{new ProjectPart}; - projectPartsForFile += { p1, p2 }; - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsAmbiguousMatch); -} - -TEST_F(ProjectPartChooser, IndicateMultipleForFallbackToProjectPartFromDependencies) -{ - const ProjectPart::Ptr p1{new ProjectPart}; - const ProjectPart::Ptr p2{new ProjectPart}; - projectPartsFromDependenciesForFile += { p1, p2 }; - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsAmbiguousMatch); -} - -TEST_F(ProjectPartChooser, ForMultipleChooseNewIfPreviousIsGone) -{ - const ProjectPart::Ptr newProjectPart{new ProjectPart}; - projectPartsForFile += newProjectPart; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(newProjectPart)); -} - -TEST_F(ProjectPartChooser, FallbackToProjectPartFromDependencies) -{ - const ProjectPart::Ptr fromDependencies{new ProjectPart}; - projectPartsFromDependenciesForFile += fromDependencies; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(fromDependencies)); -} - -TEST_F(ProjectPartChooser, FallbackToProjectPartFromModelManager) -{ - fallbackProjectPart.reset(new ProjectPart); - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(fallbackProjectPart)); -} - -TEST_F(ProjectPartChooser, ContinueUsingFallbackFromModelManagerIfProjectDoesNotChange) -{ - // ...without re-calculating the dependency table. - fallbackProjectPart.reset(new ProjectPart); - currentProjectPartInfo.projectPart = fallbackProjectPart; - currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; - projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart); - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(fallbackProjectPart)); -} - -TEST_F(ProjectPartChooser, StopUsingFallbackFromModelManagerIfProjectChanges1) -{ - fallbackProjectPart.reset(new ProjectPart); - currentProjectPartInfo.projectPart = fallbackProjectPart; - currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; - const ProjectPart::Ptr addedProject(new ProjectPart); - projectPartsForFile += addedProject; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(addedProject)); -} - -TEST_F(ProjectPartChooser, StopUsingFallbackFromModelManagerIfProjectChanges2) -{ - fallbackProjectPart.reset(new ProjectPart); - currentProjectPartInfo.projectPart = fallbackProjectPart; - currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch; - const ProjectPart::Ptr addedProject(new ProjectPart); - projectPartsFromDependenciesForFile += addedProject; - projectsChanged = true; - - const ProjectPart::Ptr chosen = choose().projectPart; - - ASSERT_THAT(chosen, Eq(addedProject)); -} - -TEST_F(ProjectPartChooser, IndicateFallbacktoProjectPartFromModelManager) -{ - fallbackProjectPart.reset(new ProjectPart); - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsFallbackMatch); -} - -TEST_F(ProjectPartChooser, IndicateFromDependencies) -{ - projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart); - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_TRUE(hints & ProjectPartInfo::IsFromDependenciesMatch); -} - -TEST_F(ProjectPartChooser, DoNotIndicateFromDependencies) -{ - projectPartsForFile += ProjectPart::Ptr(new ProjectPart); - - const ProjectPartInfo::Hints hints = choose().hints; - - ASSERT_FALSE(hints & ProjectPartInfo::IsFromDependenciesMatch); -} - -void ProjectPartChooser::SetUp() -{ - chooser.setFallbackProjectPart([&]() { - return fallbackProjectPart; - }); - chooser.setProjectPartsForFile([&](const QString &) { - return projectPartsForFile; - }); - chooser.setProjectPartsFromDependenciesForFile([&](const QString &) { - return projectPartsFromDependenciesForFile; - }); -} - -const ProjectPartInfo ProjectPartChooser::choose() const -{ - return chooser.choose(filePath, - currentProjectPartInfo, - preferredProjectPartId, - activeProject, - languagePreference, - projectsChanged); -} - -QList ProjectPartChooser::createProjectPartsWithDifferentProjects() -{ - QList projectParts; - - const ProjectPart::Ptr p1{new ProjectPart}; - p1->project = reinterpret_cast(1 << 0); - projectParts.append(p1); - const ProjectPart::Ptr p2{new ProjectPart}; - p2->project = reinterpret_cast(1 << 1); - projectParts.append(p2); - - return projectParts; -} - -QList ProjectPartChooser::createCAndCxxProjectParts() -{ - QList projectParts; - - // Create project part for C - const ProjectPart::Ptr cprojectpart{new ProjectPart}; - cprojectpart->languageVersion = Utils::LanguageVersion::C11; - projectParts.append(cprojectpart); - - // Create project part for CXX - const ProjectPart::Ptr cxxprojectpart{new ProjectPart}; - cxxprojectpart->languageVersion = Utils::LanguageVersion::CXX98; - projectParts.append(cxxprojectpart); - - return projectParts; -} - -} // anonymous namespace diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index a0d678a17b5..cfa3c5b1a41 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -58,7 +58,6 @@ SOURCES += \ clientserveroutsideprocess-test.cpp \ cppprojectfilecategorizer-test.cpp \ cppprojectinfogenerator-test.cpp \ - cppprojectpartchooser-test.cpp \ fakeprocess.cpp \ gtest-creator-printing.cpp \ gtest-qt-printing.cpp \ diff --git a/tests/unit/unittest/unittest.qbs b/tests/unit/unittest/unittest.qbs index 9ea0be3cbda..a2d34d1a7c0 100644 --- a/tests/unit/unittest/unittest.qbs +++ b/tests/unit/unittest/unittest.qbs @@ -176,7 +176,6 @@ Project { "conditionally-disabled-tests.h", "cppprojectfilecategorizer-test.cpp", "cppprojectinfogenerator-test.cpp", - "cppprojectpartchooser-test.cpp", "createtablesqlstatementbuilder-test.cpp", "dummyclangipcclient.h", "dynamicastmatcherdiagnosticcontainer-matcher.h",