From ec0a20b1d10c63e89a8e5fe5f4e1801e9584d3aa Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sun, 6 Oct 2019 16:40:04 +0100 Subject: [PATCH] [AFV] Fixed context unittest that was broken by audio context changes --- src/blackcore/actionbind.cpp | 5 ++++- src/blackcore/actionbind.h | 1 + src/blackcore/application.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/blackcore/actionbind.cpp b/src/blackcore/actionbind.cpp index e11f501e4..a1de0e162 100644 --- a/src/blackcore/actionbind.cpp +++ b/src/blackcore/actionbind.cpp @@ -18,7 +18,8 @@ namespace BlackCore QString CActionBind::registerAction(const QString &action, const QPixmap &icon) { - if (!sApp || sApp->isShuttingDown()) return {}; + if (!sApp || sApp->isShuttingDown()) { return {}; } + if (sApp->getApplicationInfo().isUnitTest()) { return {}; } const QString a = CActionBind::normalizeAction(action); Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); @@ -34,6 +35,8 @@ namespace BlackCore void CActionBind::unbind() { if (m_index < 0) { return; } + if (sApp->getApplicationInfo().isUnitTest()) { return; } + Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); sApp->getInputManager()->unbind(m_index); m_index = -1; diff --git a/src/blackcore/actionbind.h b/src/blackcore/actionbind.h index 3f4a194ce..b1b5c4537 100644 --- a/src/blackcore/actionbind.h +++ b/src/blackcore/actionbind.h @@ -39,6 +39,7 @@ namespace BlackCore { // workaround if a binding is taking place in an empty context if (!sApp || sApp->isShuttingDown()) { return; } + if (sApp->getApplicationInfo().isUnitTest()) { return; } const QString a = CActionBind::registerAction(action, icon); Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 8118f556c..3dd663908 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -1369,7 +1369,7 @@ namespace BlackCore } const QStringList verifyErrors = CDirectoryUtils::verifyRuntimeDirectoriesAndFiles(); - if (!verifyErrors.isEmpty()) + if (!verifyErrors.isEmpty() && !m_applicationInfo.isUnitTest()) { this->cmdLineErrorMessage("Missing runtime directories/files: " + verifyErrors.join(", ")); return false;