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

Squish: Store opened suites into session

Browse Source 
Opened test suites will now be stored into the session
and re-opened automatically when the session is loaded.

Change-Id: I5b7e55bf511918cb2e9eeec6f943cc7baced0a8f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2022-09-29 16:06:46 +02:00
parent 4c1f410881
commit 9ac0ac9ca1
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/squish/squishfilehandler.cpp
View File

@@ -12,6 +12,8 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/session.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QDir> #include <QDir>
@@ -22,12 +24,17 @@
namespace Squish { namespace Squish {
namespace Internal { namespace Internal {
static const char SK_OpenSuites[] = "SquishOpenSuites";
static SquishFileHandler *m_instance = nullptr; static SquishFileHandler *m_instance = nullptr;
SquishFileHandler::SquishFileHandler(QObject *parent) SquishFileHandler::SquishFileHandler(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
m_instance = this; m_instance = this;
auto sessionManager = ProjectExplorer::SessionManager::instance();
connect(sessionManager, &ProjectExplorer::SessionManager::sessionLoaded,
this, &SquishFileHandler::onSessionLoaded);
} }
SquishFileHandler *SquishFileHandler::instance() SquishFileHandler *SquishFileHandler::instance()
@@ -191,6 +198,7 @@ void SquishFileHandler::openTestSuites()
} }
} }
emit suitesOpened(); emit suitesOpened();
ProjectExplorer::SessionManager::setValue(SK_OpenSuites, m_suites.values());
} }
void SquishFileHandler::openTestSuite(const Utils::FilePath &suitePath, bool isReopen) void SquishFileHandler::openTestSuite(const Utils::FilePath &suitePath, bool isReopen)
@@ -221,6 +229,7 @@ void SquishFileHandler::openTestSuite(const Utils::FilePath &suitePath, bool isR
m_suites.insert(suiteName, suitePathStr); m_suites.insert(suiteName, suitePathStr);
emit testTreeItemCreated(item); emit testTreeItemCreated(item);
} }
ProjectExplorer::SessionManager::setValue(SK_OpenSuites, m_suites.values());
} }
void SquishFileHandler::closeTestSuite(const QString &suiteName) void SquishFileHandler::closeTestSuite(const QString &suiteName)
@@ -232,9 +241,16 @@ void SquishFileHandler::closeTestSuite(const QString &suiteName)
// TODO remove file watcher // TODO remove file watcher
m_suites.remove(suiteName); m_suites.remove(suiteName);
emit suiteTreeItemRemoved(suiteName); emit suiteTreeItemRemoved(suiteName);
ProjectExplorer::SessionManager::setValue(SK_OpenSuites, m_suites.values());
} }
void SquishFileHandler::closeAllTestSuites() void SquishFileHandler::closeAllTestSuites()
{
closeAllInternal();
ProjectExplorer::SessionManager::setValue(SK_OpenSuites, m_suites.values());
}
void SquishFileHandler::closeAllInternal()
{ {
// TODO close respective editors if there are any // TODO close respective editors if there are any
// TODO remove file watcher // TODO remove file watcher
@@ -395,5 +411,21 @@ void SquishFileHandler::openObjectsMap(const QString &suiteName)
} }
} }
void SquishFileHandler::onSessionLoaded()
{
// remove currently opened "silently" (without storing into session)
closeAllInternal();
const QVariant variant = ProjectExplorer::SessionManager::value(SK_OpenSuites);
const Utils::FilePaths suitePaths = Utils::transform(variant.toStringList(),
&Utils::FilePath::fromString);
// open suites of the old session
for (const Utils::FilePath &fp : suitePaths) {
if (fp.exists())
openTestSuite(fp);
}
}
} // namespace Internal } // namespace Internal
} // namespace Squish } // namespace Squish

3
src/plugins/squish/squishfilehandler.h
View File

@@ -40,6 +40,9 @@ signals:
void suitesOpened(); void suitesOpened();
private: private:
void closeAllInternal();
void onSessionLoaded();
QMap<QString, QString> m_suites; QMap<QString, QString> m_suites;
QStringList m_sharedFolders; QStringList m_sharedFolders;