forked from qt-creator/qt-creator
6d7e5eb8d1
The code was pushing an additional QFutureInterface through the whole chain of functions, which was used for canceling. But since it was never started (and never finished, and never used for reporting results), calling waitForFinshed on it never had any effect with Qt5 and locks up with Qt6. Instead of using a separate QFutureInterface, use the actual QFuture that is available and intended for it. Fixes: QTCREATORBUG-24902 Change-Id: I5a49bcecc9cf70fbffa93aee4293004f9369df58 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
133 lines
4.1 KiB
C++
133 lines
4.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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 "modelmanagertesthelper.h"
|
|
|
|
#include "cpptoolstestcase.h"
|
|
#include "cppworkingcopy.h"
|
|
#include "projectinfo.h"
|
|
|
|
#include <QtTest>
|
|
|
|
#include <cassert>
|
|
|
|
using namespace CppTools::Internal;
|
|
using namespace CppTools::Tests;
|
|
|
|
TestProject::TestProject(const QString &name, QObject *parent) :
|
|
ProjectExplorer::Project("x-binary/foo", Utils::FilePath()),
|
|
m_name(name)
|
|
{
|
|
setParent(parent);
|
|
setId(Utils::Id::fromString(name));
|
|
setDisplayName(name);
|
|
qRegisterMetaType<QSet<QString> >();
|
|
}
|
|
|
|
ModelManagerTestHelper::ModelManagerTestHelper(QObject *parent,
|
|
bool testOnlyForCleanedProjects)
|
|
: QObject(parent)
|
|
, m_testOnlyForCleanedProjects(testOnlyForCleanedProjects)
|
|
|
|
{
|
|
CppModelManager *mm = CppModelManager::instance();
|
|
connect(this, &ModelManagerTestHelper::aboutToRemoveProject,
|
|
mm, &CppModelManager::onAboutToRemoveProject);
|
|
connect(this, &ModelManagerTestHelper::projectAdded,
|
|
mm, &CppModelManager::onProjectAdded);
|
|
connect(mm, &CppModelManager::sourceFilesRefreshed,
|
|
this, &ModelManagerTestHelper::sourceFilesRefreshed);
|
|
connect(mm, &CppModelManager::gcFinished,
|
|
this, &ModelManagerTestHelper::gcFinished);
|
|
|
|
cleanup();
|
|
QVERIFY(Tests::VerifyCleanCppModelManager::isClean(m_testOnlyForCleanedProjects));
|
|
}
|
|
|
|
ModelManagerTestHelper::~ModelManagerTestHelper()
|
|
{
|
|
cleanup();
|
|
QVERIFY(Tests::VerifyCleanCppModelManager::isClean(m_testOnlyForCleanedProjects));
|
|
}
|
|
|
|
void ModelManagerTestHelper::cleanup()
|
|
{
|
|
CppModelManager *mm = CppModelManager::instance();
|
|
QList<ProjectInfo> pies = mm->projectInfos();
|
|
foreach (const ProjectInfo &pie, pies)
|
|
emit aboutToRemoveProject(pie.project().data());
|
|
|
|
if (!pies.isEmpty())
|
|
waitForFinishedGc();
|
|
}
|
|
|
|
ModelManagerTestHelper::Project *ModelManagerTestHelper::createProject(const QString &name)
|
|
{
|
|
auto tp = new TestProject(name, this);
|
|
emit projectAdded(tp);
|
|
return tp;
|
|
}
|
|
|
|
QSet<QString> ModelManagerTestHelper::updateProjectInfo(const CppTools::ProjectInfo &projectInfo)
|
|
{
|
|
resetRefreshedSourceFiles();
|
|
CppModelManager::instance()->updateProjectInfo(projectInfo).waitForFinished();
|
|
QCoreApplication::processEvents();
|
|
return waitForRefreshedSourceFiles();
|
|
}
|
|
|
|
void ModelManagerTestHelper::resetRefreshedSourceFiles()
|
|
{
|
|
m_lastRefreshedSourceFiles.clear();
|
|
m_refreshHappened = false;
|
|
}
|
|
|
|
QSet<QString> ModelManagerTestHelper::waitForRefreshedSourceFiles()
|
|
{
|
|
while (!m_refreshHappened)
|
|
QCoreApplication::processEvents();
|
|
|
|
return m_lastRefreshedSourceFiles;
|
|
}
|
|
|
|
void ModelManagerTestHelper::waitForFinishedGc()
|
|
{
|
|
m_gcFinished = false;
|
|
|
|
while (!m_gcFinished)
|
|
QCoreApplication::processEvents();
|
|
}
|
|
|
|
void ModelManagerTestHelper::sourceFilesRefreshed(const QSet<QString> &files)
|
|
{
|
|
m_lastRefreshedSourceFiles = files;
|
|
m_refreshHappened = true;
|
|
}
|
|
|
|
void ModelManagerTestHelper::gcFinished()
|
|
{
|
|
m_gcFinished = true;
|
|
}
|