git.iko.soy/unity8
on xenial help sign in
Mock ApplicationManager: add application only after deciding its stage
3efba52Gerry Boland
tests/mocks/Unity/Application/ApplicationManager.cpp+2−2
compare with xenial
unifiedsplit
@@ -144,7 +144,7 @@ ApplicationManager::FormFactorHint ApplicationManager::formFactorHint() const
144ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
144ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
145 const QStringList &arguments)
145 const QStringList &arguments)
146{
146{
147− return this->startApplication(appId, NoFlag, arguments);
147+ return startApplication(appId, NoFlag, arguments);
148}
148}
149
149
150ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
150ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
@@ -164,11 +164,11 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
164 if (!application)
164 if (!application)
165 return 0;
165 return 0;
166
166
167− add(application);
168 if (flags.testFlag(ApplicationManager::ForceMainStage)
167 if (flags.testFlag(ApplicationManager::ForceMainStage)
169 && application->stage() == ApplicationInfo::SideStage) {
168 && application->stage() == ApplicationInfo::SideStage) {
170 application->setStage(ApplicationInfo::MainStage);
169 application->setStage(ApplicationInfo::MainStage);
171 }
170 }
171+ add(application);
172
172
173 focusApplication(application->appId());
173 focusApplication(application->appId());
174 Q_EMIT focusedApplicationIdChanged();
174 Q_EMIT focusedApplicationIdChanged();