Merge lp:~gerboland/unity-api/appManVersion2 into lp:~unity-team/unity-api/qtMirCompositor

[Gerry Boland]

Revised ApplicationManager and ApplicationInfo APIs for QtMirCompositor project

Revised ApplicationManager and ApplicationInfo APIs for QtMirCompositor project

[lp:~gerboland/unity-api/appManVersion2]

133. By Gerry Boland on 2014-05-01

Revert last commit

134. By Gerry Boland on 2014-05-01

Bump version number of unity::shell::application api

[Michael Zanetti (mzanetti)]

Here's a couple of comments of things we should think of. Not necessarily disagreeing with them, just worth a though/discussion imo:

====

20 + Q_PROPERTY(Stages supportedStages READ supportedStages NOTIFY supportedStagesChanged)

Do we assume that if an app claims support for both stages, all of its surfaces will support them? Probably yes.

====

31 + * Holds the current application focus state. True if a surface of this application is focused, false otherwise.

Really needed? what would we gain with this information? Wouldn't it make more sense to obtain it the other was round? For instance:

var focusedApp = SurfaceManager.appId(SurfaceManager.focusedSurfaceId)

====

78 + Q_INVOKABLE virtual bool suspend() = 0;
89 + Q_INVOKABLE virtual bool resume() = 0;

Where would you call this from? I'm not sure if we should expose this to unity but rather handle this stuff internally in the applicationmanager. We might add something like inhibitSuspension() at a later point if we want to give the user control over it.

Also it doesn't really match with the existing API, given that we have startApplication() and stopApplication() in ApplicationManager (not ApplicationInfo) such things should be at the same place. If we decide to expose this to the shell, I'm not opposed to have them in both places (ApplicationManager::suspendApplication(appId) and ApplicationInfo::suspend()).

====

301 void setFocused(bool focused);

What would this do?

review: Needs Information

[Michał Sawicz (saviq)]

On 01.05.2014 15:11, Michael Zanetti wrote:
> ====
>
> 20 + Q_PROPERTY(Stages supportedStages READ supportedStages NOTIFY supportedStagesChanged)
>
> Do we assume that if an app claims support for both stages, all of its surfaces will support them? Probably yes.

When thinking about stages, we're only considering single-surface apps.
So yes.

[Gerry Boland (gerboland)]

> Here's a couple of comments of things we should think of. Not necessarily
> disagreeing with them, just worth a though/discussion imo:
Sure. I'm just making up stuff as I go along

> 20 + Q_PROPERTY(Stages supportedStages READ supportedStages NOTIFY
> supportedStagesChanged)
> Do we assume that if an app claims support for both stages, all of its
> surfaces will support them? Probably yes.
Yes. This is property of an application. If it claims to support a stage, then its surface can be resized to suit that stage, and it can't stop that. One app can't have surfaces on both stage either. Note also that "stage" is a property shell will have to save when the app is closed, so user preference is retained.

> 31 + * Holds the current application focus state. True if a surface of
> this application is focused, false otherwise.
> Really needed? what would we gain with this information? Wouldn't it make more
> sense to obtain it the other was round? For instance:
I kept this as I thought it would make the job of the launcher easier. I can remove if you don't think it's worth it.

> 78 + Q_INVOKABLE virtual bool suspend() = 0;
> 89 + Q_INVOKABLE virtual bool resume() = 0;
>
> Where would you call this from? I'm not sure if we should expose this to unity
> but rather handle this stuff internally in the applicationmanager. We might
> add something like inhibitSuspension() at a later point if we want to give the
> user control over it.
>
> Also it doesn't really match with the existing API, given that we have
> startApplication() and stopApplication() in ApplicationManager (not
> ApplicationInfo) such things should be at the same place. If we decide to
> expose this to the shell, I'm not opposed to have them in both places
> (ApplicationManager::suspendApplication(appId) and
> ApplicationInfo::suspend()).

Not a bad point. I thought it a good idea to have shell decide when to suspend/resume apps, as only shell really knows what is visible or not, and shell implements the policy (on phone/tablet, all non-visible apps suspended, on desktop can be more flexible, maybe apps can opt-in to being suspended). I've been trying to make AppMan device independent, because I fear having some policy in AppMan, and some in shell, will end up with conflicts.

Another way this could be done by shell setting the surface visible flags, and if all an app's surfaces are hidden, it can be suspended. But then we tie rendering control to lifecycle control, which I don't like.

You're right, the API is not consistent. Will look more.

> ====
>
> 301 void setFocused(bool focused);
>
> What would this do?
That was in the Mock before. I dunno why it's there. I can remove

[Michael Zanetti (mzanetti)]

> > 31 + * Holds the current application focus state. True if a surface of
> > this application is focused, false otherwise.
> > Really needed? what would we gain with this information? Wouldn't it make
> more
> > sense to obtain it the other was round? For instance:
> I kept this as I thought it would make the job of the launcher easier. I can
> remove if you don't think it's worth it.

Right... Works for me. Thanks for caring about the Launcher :)

>
>
>
> > 78 + Q_INVOKABLE virtual bool suspend() = 0;
> > 89 + Q_INVOKABLE virtual bool resume() = 0;
> >
> > Where would you call this from? I'm not sure if we should expose this to
> unity
> > but rather handle this stuff internally in the applicationmanager. We might
> > add something like inhibitSuspension() at a later point if we want to give
> the
> > user control over it.
> >
> > Also it doesn't really match with the existing API, given that we have
> > startApplication() and stopApplication() in ApplicationManager (not
> > ApplicationInfo) such things should be at the same place. If we decide to
> > expose this to the shell, I'm not opposed to have them in both places
> > (ApplicationManager::suspendApplication(appId) and
> > ApplicationInfo::suspend()).
>
> Not a bad point. I thought it a good idea to have shell decide when to
> suspend/resume apps, as only shell really knows what is visible or not, and
> shell implements the policy (on phone/tablet, all non-visible apps suspended,
> on desktop can be more flexible, maybe apps can opt-in to being suspended).
> I've been trying to make AppMan device independent, because I fear having some
> policy in AppMan, and some in shell, will end up with conflicts.

You're right... Makes more sense in the shell. I was still thinking too much like the old approach. But now that focused is something that's only available in QML this obviously doesn't work the old way any more.

>
> Another way this could be done by shell setting the surface visible flags, and
> if all an app's surfaces are hidden, it can be suspended. But then we tie
> rendering control to lifecycle control, which I don't like.

Yeah... doesn't sound much better than the above.

>
> You're right, the API is not consistent. Will look more.

Jup... Again, I'm fine with having them in both. We need to keep startApplication() in AppMan which makes it natural to have stopApplication() there too, and with it suspend/resume. But I can see how it would be convenient to have that as an ApplicationInfo object's property in QML.

So I'd probably go for
ApplicationManager:
startApplication()
stopApplication()
suspendApplication()
resumeApplication()

and ApplicationInfo:
stop()
Q_PROPERTY(suspended)

We can even implement and test those in the abstract interface so there's little risk an implementation would get them out of sync.

[kevin gunn (kgunn72)]

> > Here's a couple of comments of things we should think of. Not necessarily
> > disagreeing with them, just worth a though/discussion imo:
> Sure. I'm just making up stuff as I go along
>
>
> > 20 + Q_PROPERTY(Stages supportedStages READ supportedStages NOTIFY
> > supportedStagesChanged)
> > Do we assume that if an app claims support for both stages, all of its
> > surfaces will support them? Probably yes.
> Yes. This is property of an application. If it claims to support a stage, then
> its surface can be resized to suit that stage, and it can't stop that. One app
> can't have surfaces on both stage either. Note also that "stage" is a property
> shell will have to save when the app is closed, so user preference is
> retained.
>

So my comment/question might be irrelevant. But I could foresee that trusted sessions might create a case where an app could be open on mainstage but invoked for a second surface within the trust session on side stage (or vice versa). Would your assumptions/implementation preclude this ?

[Michał Sawicz (saviq)]

On 01.05.2014 20:30, kevin gunn wrote:
> So my comment/question might be irrelevant. But I could foresee that trusted sessions might create a case where an app could be open on mainstage but invoked for a second surface within the trust session on side stage (or vice versa). Would your assumptions/implementation preclude this ?

The second surface will not be an app, it will be just a surface, from a
separate process, it will be part of the original "invoking" app.

So no, everything's good here.

[Gerry Boland (gerboland)]

> Jup... Again, I'm fine with having them in both. We need to keep
> startApplication() in AppMan which makes it natural to have stopApplication()
> there too, and with it suspend/resume. But I can see how it would be
> convenient to have that as an ApplicationInfo object's property in QML.
>
> So I'd probably go for
> ApplicationManager:
> startApplication()
> stopApplication()
> suspendApplication()
> resumeApplication()

Ok, I can do those

> and ApplicationInfo:
> Q_PROPERTY(suspended)

This one I'm not so sure about. We already use 'state' to get the process state, so adding the "suspended" property duplicates info. I also dislike it as some apps are excluded from lifecycle, so shell setting myApp.suspended=true is just incorrect.

I prefer just using the first part of your proposal - with {suspend,resume}Application() returning bool, so that shell knows if asking an app to suspend was actually acted upon or not.

I don't think shell really needs to know if an app is lifecycle-exempt, but it would care if suspendApplication returns false. Main use-case I can think of is there's no need for shell to save a screenshot to disk for a lifecycle-exempt app's surface, as there's no way that app will be killed.

> stop()
I might leave this out for the time being, just for ease of implementation, if you don't mind.

Also maybe just putting the process control methods (start/stop/suspend/resume) in AppManager is enough for a start.

[Michael Zanetti (mzanetti)]

ack. works for me

[lp:~gerboland/unity-api/appManVersion2]

135. By Gerry Boland on 2014-05-09

Implement API adjustments suggested by mzanetti

136. By Gerry Boland on 2014-05-09

whitespace

137. By Gerry Boland on 2014-05-10

Add role for StagesSupported

138. By Gerry Boland on 2014-05-10

Update comment to reflect new API

139. By Gerry Boland on 2014-05-10

Oops forgot the test, but this breaks the compile

140. By Gerry Boland on 2014-05-10

QVariant does not know about QFlags by default, but as enum just an int anyway, cast it to keep QVariant happy

[Michael Zanetti (mzanetti)]

The stages and State enums are not tested. Can you please add a test that checks for all the values, but also that Stages are flags and can be used as such in QML?

===

Now that Stages are flags, we need to define their values explicitly in the enum definition. Now we have 0 and 1. ORing them loses information about 0.

===

Otherwise I think we're good now in terms of the API itself.

review: Needs Fixing

[lp:~gerboland/unity-api/appManVersion2]

141. By Gerry Boland on 2014-05-13

Stages are flags now, set enum values so they can be ORed

142. By Gerry Boland on 2014-05-13

Add tests to verify state & stage enums

143. By Gerry Boland on 2014-05-13

Add test for flags operator |

[Michael Zanetti (mzanetti)]

I guess we should bump the package version too

review: Needs Fixing

[lp:~gerboland/unity-api/appManVersion2]

144. By Gerry Boland on 2014-05-13

Bump debian version

145. By Gerry Boland on 2014-05-13

Resolve conflict

146. By Gerry Boland on 2014-05-20

Restore the Application screenshot API for now

147. By Gerry Boland on 2014-06-19

Merge trunk

148. By Gerry Boland on 2014-06-19

Update changelog

149. By Gerry Boland on 2014-06-19

changelog correction

150. By Gerry Boland on 2014-06-23

Merge trunk

151. By Gerry Boland on 2014-06-24

debian: package version 7.90

Unmerged revisions

151. By Gerry Boland on 2014-06-24

debian: package version 7.90

150. By Gerry Boland on 2014-06-23

Merge trunk

149. By Gerry Boland on 2014-06-19

changelog correction

148. By Gerry Boland on 2014-06-19

Update changelog

147. By Gerry Boland on 2014-06-19

Merge trunk

146. By Gerry Boland on 2014-05-20

Restore the Application screenshot API for now

145. By Gerry Boland on 2014-05-13

Resolve conflict

144. By Gerry Boland on 2014-05-13

Bump debian version

143. By Gerry Boland on 2014-05-13

Add test for flags operator |

142. By Gerry Boland on 2014-05-13

Add tests to verify state & stage enums

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-28 17:28:16 +0000
+++ debian/changelog	2014-05-13 16:18:07 +0000
@@ -1,3 +1,9 @@
+unity-api (7.80.8) UNRELEASED; urgency=medium
+
+  * Alter ApplicationManager and ApplicationInfo APIs in preparation for QtCompositor
+
+ -- Gerry Boland <[e-mail]>  Tue, 13 May 2014 17:10:33 +0100
+
 unity-api (7.80.7+14.10.20140428.1-0ubuntu1) utopic; urgency=medium
 
   [ Michal Hruby ]

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2013-12-11 11:04:11 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2014-05-13 16:18:07 +0000
@@ -45,6 +45,7 @@
 
     Q_ENUMS(Stage)
     Q_ENUMS(State)
+    Q_FLAGS(Stages)
 
     /**
      * @brief The appId of the application.
@@ -84,6 +85,13 @@
     Q_PROPERTY(Stage stage READ stage NOTIFY stageChanged)
 
     /**
+     * @brief The stages the application supports.
+     *
+     * OR-combination of Stage enum values denoting the stages this application supports.
+     */
+    Q_PROPERTY(Stages supportedStages READ supportedStages NOTIFY supportedStagesChanged)
+
+    /**
      * @brief The application's state.
      *
      * Holds the current application state.
@@ -93,16 +101,10 @@
     /**
      * @brief The application's focus state.
      *
-     * Holds the current application focus state. True if focused, false otherwise.
+     * Holds the current application focus state. True if a surface of this application is focused, false otherwise.
      */
     Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
 
-    /**
-     * @brief The URL of the app's screenshot to be used with the image provider.
-     *
-     * Holds the URL for the app's screenshot. This URL will change whenever the screenshot updates.
-     */
-    Q_PROPERTY(QUrl screenshot READ screenshot NOTIFY screenshotChanged)
 
 protected:
     /// @cond
@@ -119,9 +121,10 @@
      * applications.
      */
     enum Stage {
-        MainStage,
-        SideStage
+        MainStage = 0x01,
+        SideStage = 0x02,
     };
+    Q_DECLARE_FLAGS(Stages, Stage)
 
     /**
      * @brief An application's state.
@@ -150,20 +153,29 @@
     virtual QString comment() const = 0;
     virtual QUrl icon() const = 0;
     virtual Stage stage() const = 0;
+    virtual Stages supportedStages() const = 0;
     virtual State state() const = 0;
     virtual bool focused() const = 0;
-    virtual QUrl screenshot() const = 0;
     /// @endcond
 
+    /**
+     * @brief Set stage
+     *
+     * Applications may not support all stages, so this method only returns true if the stage is supported.
+     * @returns true if stage supported so value set, false if not supported.
+     */
+    Q_INVOKABLE virtual bool setStage(const Stage) = 0;
+
+
 Q_SIGNALS:
     /// @cond
     void nameChanged(const QString &name);
     void commentChanged(const QString &comment);
     void iconChanged(const QUrl &icon);
-    void stageChanged(Stage stage);
-    void stateChanged(State state);
-    void focusedChanged(bool focused);
-    void screenshotChanged(const QUrl &screenshot);
+    void stageChanged(const Stage stage);
+    void supportedStagesChanged(const Stages stages);
+    void stateChanged(const State state);
+    void focusedChanged(const bool focused);
     /// @endcond
 };
 
@@ -171,4 +183,6 @@
 } // namespace shell
 } // namespace unity
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(unity::shell::application::ApplicationInfoInterface::Stages)
+
 #endif // UNITY_SHELL_APPLICATIONMANAGER_APPLICATIONINFOINTERFACE_H

=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
--- include/unity/shell/application/ApplicationManagerInterface.h	2014-03-10 12:40:25 +0000
+++ include/unity/shell/application/ApplicationManagerInterface.h	2014-05-13 16:18:07 +0000
@@ -53,9 +53,7 @@
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
     /**
-     * @brief The currently focused application.
-     *
-     * Use focusApplication() and unfocusCurrentApplication() to modify this.
+     * @brief The app ID of the currently focused application.
      */
     Q_PROPERTY(QString focusedApplicationId READ focusedApplicationId NOTIFY focusedApplicationIdChanged)
 
@@ -75,9 +73,9 @@
         m_roleNames.insert(RoleComment, "comment");
         m_roleNames.insert(RoleIcon, "icon");
         m_roleNames.insert(RoleStage, "stage");
+        m_roleNames.insert(RoleSupportedStages, "supportedStages");
         m_roleNames.insert(RoleState, "state");
         m_roleNames.insert(RoleFocused, "focused");
-        m_roleNames.insert(RoleScreenshot, "screenshot");
 
         connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), SIGNAL(countChanged()));
         connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)), SIGNAL(countChanged()));
@@ -98,9 +96,9 @@
         RoleComment,
         RoleIcon,
         RoleStage,
+        RoleSupportedStages,
         RoleState,
         RoleFocused,
-        RoleScreenshot,
     };
 
     /// @cond
@@ -142,33 +140,6 @@
     Q_INVOKABLE virtual unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const = 0;
 
     /**
-     * @brief Request to focus a given application
-     *
-     * This will request the shell to focus the given application.
-     *
-     * @param appId The appId of the app to be focused.
-     * @returns True if the request will processed, false if it was discarded (i.e. the given appid could not be found)
-     */
-    Q_INVOKABLE virtual bool requestFocusApplication(const QString &appId) = 0;
-
-    /**
-     * @brief Focus the given application.
-     *
-     * This will immediately focus the given application. Usually you should not use this
-     * but instead call requestFocusApplication() in order to allow the shell to prepare
-     * for the upcoming animation or even block the focus request (e.g. focus stealing prevention)
-     *
-     * @param appId The application to be focused.
-     * @returns True if appId found and application focused, else false.
-     */
-    Q_INVOKABLE virtual bool focusApplication(const QString &appId) = 0;
-
-    /**
-     * @brief Unfocus the currently focused application.
-     */
-    Q_INVOKABLE virtual void unfocusCurrentApplication() = 0;
-
-    /**
      * @brief Start an application.
      *
      * @param appId The appId for the application to be spawned.
@@ -186,16 +157,28 @@
     Q_INVOKABLE virtual bool stopApplication(const QString &appId) = 0;
 
     /**
-     * @brief Update the screenshot for an application.
-     *
-     * NOTE: Normally the ApplicationManager will update screenshots unfocusing or focusing apps,
-     * However, in cases where you need to show the screenshot while the application is still focused,
-     * you can request the ApplicationManager to update it now.
-     *
-     * @param appId The application for which the screenshot should be updated.
-     * @returns True if the screenshot update operation was scheduled successfully, false otherwise (i.e. the given appId could not be found)
-     */
-    Q_INVOKABLE virtual bool updateScreenshot(const QString &appId) = 0;
+     * @brief Request the application suspends
+     *
+     * If application supports lifecycling and is in a running state, calling this method notifies the
+     * app of pending suspension and a few seconds later suspends the app, updating the "state" property
+     * to "Suspended". Method is non-blocking.
+     * @param appId The application to be stopped.
+     * @returns True if app is running and supports lifecycle suspension, false otherwise.
+     */
+    Q_INVOKABLE virtual bool suspendApplication(const QString &appId) = 0;
+
+    /**
+     * @brief Request the application resumes from suspends
+     *
+     * If application supports lifecycling and is in a suspended state, calling this method resumes it
+     * updating the "state" property to "Running". If application was stopped, it will be relaunched and
+     * will restore its internal state - the state property set to "Running" only when app ready. Method
+     * is non-blocking.
+     * @param appId The application to be stopped.
+     * @returns true if app is lifecycle suspended, false otherwise.
+     */
+    Q_INVOKABLE virtual bool resumeApplication(const QString &appId) = 0;
+
 
 Q_SIGNALS:
     /// @cond
@@ -203,14 +186,6 @@
     /// @endcond
 
     /**
-     * @brief Will be emitted right before the focused application changes.
-     *
-     * This can be used to prepare for an upcoming focus change. For example starting
-     * an animation.
-     */
-    void focusRequested(const QString &appId);
-
-    /**
      * @brief Will be emitted whenever the focused application changes.
      */
     void focusedApplicationIdChanged();

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2014-03-04 10:50:44 +0000
+++ include/unity/shell/application/CMakeLists.txt	2014-05-13 16:18:07 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 2)
+set(VERSION 3)
 set(PKGCONFIG_NAME "unity-shell-appliction")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2013-12-11 11:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2014-05-13 16:18:07 +0000
@@ -54,23 +54,24 @@
     return m_icon;
 }
 
-QUrl MockApplicationInfo::screenshot() const
-{
-    return m_screenshot;
-}
-
 ApplicationInfoInterface::Stage MockApplicationInfo::stage() const
 {
     return m_stage;
 }
 
-void MockApplicationInfo::setStage(ApplicationInfoInterface::Stage stage)
+bool MockApplicationInfo::setStage(ApplicationInfoInterface::Stage stage)
 {
     if (m_stage != stage)
     {
         m_stage = stage;
         Q_EMIT stageChanged(m_stage);
     }
+    return true;
+}
+
+ApplicationInfoInterface::Stages MockApplicationInfo::supportedStages() const
+{
+    return ApplicationInfoInterface::MainStage | ApplicationInfoInterface::SideStage;
 }
 
 ApplicationInfoInterface::State MockApplicationInfo::state() const

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2013-12-11 11:28:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2014-05-13 16:18:07 +0000
@@ -32,19 +32,20 @@
 public:
     MockApplicationInfo(const QString &appId, const QString& name, const QString& comment, const QUrl& icon, QObject* parent = 0);
 
-    QString appId() const;
-    QString name() const;
-    QString comment() const;
-    QUrl icon() const;
-    QUrl screenshot() const;
-
-    ApplicationInfoInterface::Stage stage() const;
-    void setStage(ApplicationInfoInterface::Stage stage);
-
-    ApplicationInfoInterface::State state() const;
-    void setState(ApplicationInfoInterface::State state);
-
-    bool focused() const;
+    QString appId() const override;
+    QString name() const override;
+    QString comment() const override;
+    QUrl icon() const override;
+
+    ApplicationInfoInterface::Stage stage() const override;
+    bool setStage(const ApplicationInfoInterface::Stage stage) override;
+
+    ApplicationInfoInterface::Stages supportedStages() const override;
+
+    ApplicationInfoInterface::State state() const override;
+    void setState(const ApplicationInfoInterface::State state);
+
+    bool focused() const override;
     void setFocused(bool focused);
 
 private:
@@ -52,7 +53,6 @@
     QString m_name;
     QString m_comment;
     QUrl m_icon;
-    QUrl m_screenshot;
     ApplicationInfoInterface::Stage m_stage;
     ApplicationInfoInterface::State m_state;
     bool m_focused;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-03-10 12:34:16 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-05-13 16:18:07 +0000
@@ -62,12 +62,12 @@
         return item->icon();
     case RoleStage:
         return item->stage();
+    case RoleSupportedStages:
+        return static_cast<int>(item->supportedStages());
     case RoleState:
         return item->state();
     case RoleFocused:
         return item->focused();
-    case RoleScreenshot:
-        return item->screenshot();
     }
 
     return QVariant();
@@ -110,22 +110,6 @@
     Q_UNUSED(suspended)
 }
 
-bool MockApplicationManager::requestFocusApplication(const QString &appId)
-{
-    Q_UNUSED(appId)
-    return true;
-}
-
-bool MockApplicationManager::focusApplication(const QString &appId)
-{
-    Q_UNUSED(appId)
-    return true;
-}
-
-void MockApplicationManager::unfocusCurrentApplication()
-{
-}
-
 unity::shell::application::ApplicationInfoInterface *MockApplicationManager::startApplication(const QString &appId, const QStringList &arguments)
 {
     Q_UNUSED(arguments)
@@ -139,7 +123,13 @@
     return true;
 }
 
-bool MockApplicationManager::updateScreenshot(const QString &appId)
+bool MockApplicationManager::suspendApplication(const QString &appId)
+{
+    Q_UNUSED(appId)
+    return true;
+}
+
+bool MockApplicationManager::resumeApplication(const QString &appId)
 {
     Q_UNUSED(appId)
     return true;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-03-10 12:34:16 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-05-13 16:18:07 +0000
@@ -34,30 +34,25 @@
     MockApplicationManager(QObject* parent = 0);
     ~MockApplicationManager();
 
-    int rowCount(const QModelIndex& parent) const;
-
-    QVariant data(const QModelIndex& index, int role) const;
-
-    QString focusedApplicationId() const;
-
-    bool suspended() const;
-    void setSuspended(bool suspended);
-
-    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const;
-
-    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const;
-
-    Q_INVOKABLE bool requestFocusApplication(const QString &appId);
-
-    Q_INVOKABLE bool focusApplication(const QString &appId);
-
-    Q_INVOKABLE void unfocusCurrentApplication();
-
-    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *startApplication(const QString &appId, const QStringList &arguments);
-
-    Q_INVOKABLE bool stopApplication(const QString &appId);
-
-    Q_INVOKABLE bool updateScreenshot(const QString &appId);
+    int rowCount(const QModelIndex& parent) const override;
+
+    QVariant data(const QModelIndex& index, int role) const override;
+
+    QString focusedApplicationId() const override;
+
+    bool suspended() const override;
+    void setSuspended(bool suspended) override;
+
+    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const override;
+
+    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const override;
+
+    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface
+                    *startApplication(const QString &appId, const QStringList &arguments) override;
+
+    Q_INVOKABLE bool stopApplication(const QString &appId) override;
+    Q_INVOKABLE bool suspendApplication(const QString &appId) override;
+    Q_INVOKABLE bool resumeApplication(const QString &appId) override;
 
 private:
     QList<MockApplicationInfo*> m_list;

=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
--- test/qmltest/unity/shell/application/tst_Application.qml	2014-03-10 12:34:16 +0000
+++ test/qmltest/unity/shell/application/tst_Application.qml	2014-05-13 16:18:07 +0000
@@ -67,9 +67,9 @@
                         { enum: "RoleComment" },
                         { enum: "RoleIcon" },
                         { enum: "RoleStage" },
+                        { enum: "RoleSupportedStages"},
                         { enum: "RoleState" },
                         { enum: "RoleFocused" },
-                        { enum: "RoleScreenshot" },
                     ];
         }
 
@@ -87,9 +87,9 @@
                         { tag: "ApplicationManager.roles[comment]", role: "comment", type: "string" },
                         { tag: "ApplicationManager.roles[icon]", role: "icon", type: "object" },
                         { tag: "ApplicationManager.roles[stage]", role: "stage", type: "number" },
+                        { tag: "ApplicationManager.roles[supportedStages]", role: "supportedStages", type: "number" },
                         { tag: "ApplicationManager.roles[state]", role: "state", type: "number" },
                         { tag: "ApplicationManager.roles[focused]", role: "focused", type: "boolean" },
-                        { tag: "ApplicationManager.roles[screenshot]", role: "screenshot", type: "object" },
                     ];
         }
 
@@ -108,12 +108,10 @@
             return [
                 { tag: "ApplicationManager.methods[get]", method: "get" },
                 { tag: "ApplicationManager.methods[findApplication]", method: "findApplication" },
-                { tag: "ApplicationManager.methods[requestFocusApplication]", method: "requestFocusApplication" },
-                { tag: "ApplicationManager.methods[focusApplication]", method: "focusApplication" },
-                { tag: "ApplicationManager.methods[unfocusCurrentApplication]", method: "unfocusCurrentApplication" },
                 { tag: "ApplicationManager.methods[startApplication]", method: "startApplication" },
                 { tag: "ApplicationManager.methods[stopApplication]", method: "stopApplication" },
-                { tag: "ApplicationManager.methods[updateScreenshot]", method: "updateScreenshot" },
+                { tag: "ApplicationManager.methods[suspendApplication]", method: "suspendApplication" },
+                { tag: "ApplicationManager.methods[resumeApplication]", method: "resumeApplication" },
             ];
         }
 
@@ -144,9 +142,9 @@
                 { tag: "ApplicationInfo.properties[comment]", property: "comment", type: "string" },
                 { tag: "ApplicationInfo.properties[icon]", property: "icon", type: "object" },
                 { tag: "ApplicationInfo.properties[stage]", property: "stage", type: "number" },
+                { tag: "ApplicationInfo.properties[supportedStages]", property: "supportedStages", type: "number" },
                 { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" },
                 { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" },
-                { tag: "ApplicationInfo.properties[screenshot]", property: "screenshot", type: "object" },
             ];
         }
 
@@ -161,5 +159,65 @@
 
             verifyData(data)
         }
+
+        function test_item_methods_data() {
+            return [
+                { tag: "ApplicationInfo.methods[setStage]", method: "setStage" },
+            ];
+        }
+
+        function test_item_methods(data) {
+            name = "ApplicationInfo";
+            try {
+                object = ApplicationManager.get(0)
+            } catch(err) {
+                object = undefined;
+                print(err)
+            }
+            verifyData(data);
+        }
+
+        function test_item_stage_flags_data() {
+            return [
+                        { enum: "MainStage" },
+                        { enum: "SideStage" },
+                   ];
+        }
+
+        function test_item_stage_flags(data) {
+            name = "Application";
+            try {
+                object = ApplicationInfo
+            } catch(err) {
+                object = undefined;
+                print(err)
+            }
+            verifyData(data);
+        }
+
+        function test_item_stage_flags_operator() {
+            // check that flags operator functional
+            verify(ApplicationInfo.MainStage | ApplicationInfo.SideStage, 0x003)
+        }
+
+        function test_item_state_enum_data() {
+            return [
+                        { enum: "Starting" },
+                        { enum: "Running" },
+                        { enum: "Suspended" },
+                        { enum: "Stopped" },
+                   ];
+        }
+
+        function test_item_state_enum(data) {
+            name = "Application";
+            try {
+                object = ApplicationInfo
+            } catch(err) {
+                object = undefined;
+                print(err)
+            }
+            verifyData(data);
+        }
     }
 }