[AFV] Fixed context unittest that was broken by audio context changes

This commit is contained in:
Mat Sutcliffe
2019-10-06 16:40:04 +01:00
parent b90855d393
commit ec0a20b1d1
3 changed files with 6 additions and 2 deletions

View File

@@ -18,7 +18,8 @@ namespace BlackCore
QString CActionBind::registerAction(const QString &action, const QPixmap &icon) 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); const QString a = CActionBind::normalizeAction(action);
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");
@@ -34,6 +35,8 @@ namespace BlackCore
void CActionBind::unbind() void CActionBind::unbind()
{ {
if (m_index < 0) { return; } if (m_index < 0) { return; }
if (sApp->getApplicationInfo().isUnitTest()) { return; }
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");
sApp->getInputManager()->unbind(m_index); sApp->getInputManager()->unbind(m_index);
m_index = -1; m_index = -1;

View File

@@ -39,6 +39,7 @@ namespace BlackCore
{ {
// workaround if a binding is taking place in an empty context // workaround if a binding is taking place in an empty context
if (!sApp || sApp->isShuttingDown()) { return; } if (!sApp || sApp->isShuttingDown()) { return; }
if (sApp->getApplicationInfo().isUnitTest()) { return; }
const QString a = CActionBind::registerAction(action, icon); const QString a = CActionBind::registerAction(action, icon);
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager"); Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");

View File

@@ -1369,7 +1369,7 @@ namespace BlackCore
} }
const QStringList verifyErrors = CDirectoryUtils::verifyRuntimeDirectoriesAndFiles(); const QStringList verifyErrors = CDirectoryUtils::verifyRuntimeDirectoriesAndFiles();
if (!verifyErrors.isEmpty()) if (!verifyErrors.isEmpty() && !m_applicationInfo.isUnitTest())
{ {
this->cmdLineErrorMessage("Missing runtime directories/files: " + verifyErrors.join(", ")); this->cmdLineErrorMessage("Missing runtime directories/files: " + verifyErrors.join(", "));
return false; return false;