Merge lp:~aacid/unity8/revert_session_screenshotter into lp:unity8

[Albert Astals Cid]

Revert Session Screenshotter

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Seems the new UI isn't as we wanted

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1850
http://jenkins.qa.ubuntu.com/job/unity8-ci/6020/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/313/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/259
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/221/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21789

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6020/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

as much as it could

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2015-04-24 11:06:05 +0000
+++ debian/unity8-private.install	2015-07-10 15:57:32 +0000
@@ -8,7 +8,6 @@
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/ScreenGrabber
 usr/lib/*/unity8/qml/SessionBroadcast
-usr/lib/*/unity8/qml/SessionGrabber
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2015-04-24 11:06:05 +0000
+++ plugins/CMakeLists.txt	2015-07-10 15:57:32 +0000
@@ -18,7 +18,6 @@
 add_subdirectory(Dash)
 add_subdirectory(Powerd)
 add_subdirectory(SessionBroadcast)
-add_subdirectory(SessionGrabber)
 add_subdirectory(ScreenGrabber)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)

=== removed directory 'plugins/SessionGrabber'
=== removed file 'plugins/SessionGrabber/CMakeLists.txt'
--- plugins/SessionGrabber/CMakeLists.txt	2015-04-28 11:24:24 +0000
+++ plugins/SessionGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-add_library(SessionGrabber-qml MODULE sessiongrabber.cpp plugin.cpp)
-qt5_use_modules(SessionGrabber-qml Qml Gui Quick Concurrent)
-
-add_unity8_plugin(SessionGrabber 0.1 SessionGrabber TARGETS SessionGrabber-qml)

=== removed file 'plugins/SessionGrabber/SessionGrabber.qmltypes'
--- plugins/SessionGrabber/SessionGrabber.qmltypes	2015-04-28 11:24:24 +0000
+++ plugins/SessionGrabber/SessionGrabber.qmltypes	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-import QtQuick.tooling 1.1
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -notrelocatable SessionGrabber 0.1 plugins'
-
-Module {
-    Component {
-        name: "SessionGrabber"
-        prototype: "QObject"
-        exports: ["SessionGrabber/SessionGrabber 0.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "appId"; type: "string" }
-        Property { name: "path"; type: "string"; isReadonly: true }
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Signal { name: "appIdChanged" }
-        Signal { name: "screenshotTaken" }
-        Method { name: "take" }
-        Method { name: "removeScreenshot" }
-    }
-}

=== removed file 'plugins/SessionGrabber/plugin.cpp'
--- plugins/SessionGrabber/plugin.cpp	2015-04-24 11:06:05 +0000
+++ plugins/SessionGrabber/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "plugin.h"
-#include "sessiongrabber.h"
-
-#include <QtQml/qqml.h>
-
-void SessionGrabberPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("SessionGrabber"));
-    qmlRegisterType<SessionGrabber>(uri, 0, 1, "SessionGrabber");
-}

=== removed file 'plugins/SessionGrabber/plugin.h'
--- plugins/SessionGrabber/plugin.h	2015-04-24 11:06:05 +0000
+++ plugins/SessionGrabber/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef SESSIONGRABBER_PLUGIN_H
-#define SESSIONGRABBER_PLUGIN_H
-
-#include <QtQml/QQmlExtensionPlugin>
-
-class SessionGrabberPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif

=== removed file 'plugins/SessionGrabber/qmldir'
--- plugins/SessionGrabber/qmldir	2015-04-24 13:27:09 +0000
+++ plugins/SessionGrabber/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module SessionGrabber
-plugin SessionGrabber-qml
-typeinfo SessionGrabber.qmltypes

=== removed file 'plugins/SessionGrabber/sessiongrabber.cpp'
--- plugins/SessionGrabber/sessiongrabber.cpp	2015-04-30 13:40:42 +0000
+++ plugins/SessionGrabber/sessiongrabber.cpp	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "sessiongrabber.h"
-
-#include <QDebug>
-#include <QQuickItem>
-#include <QQuickItemGrabResult>
-#include <QtConcurrent>
-
-static QString cacheFolder()
-{
-    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/app_shots/";
-}
-
-static QString cachePath(const QString &appId)
-{
-    return cacheFolder() + appId + ".png";
-}
-
-SessionGrabber::SessionGrabber(QObject *parent)
-    : QObject(parent)
-    , m_target(nullptr)
-    , m_watcher(nullptr)
-{
-}
-
-QString SessionGrabber::appId() const
-{
-    return m_appId;
-}
-
-void SessionGrabber::setAppId(const QString &appId)
-{
-    if (appId != m_appId) {
-        m_appId = appId;
-        const QString path = cachePath(appId);
-        if (QFile::exists(path)) {
-            setPath(path);
-        }
-    }
-}
-
-QQuickItem *SessionGrabber::target() const
-{
-    return m_target;
-}
-
-void SessionGrabber::setTarget(QQuickItem *target)
-{
-    if (target != m_target) {
-        m_target = target;
-        Q_EMIT targetChanged();
-    }
-}
-
-QString SessionGrabber::path() const
-{
-    return m_path;
-}
-
-void SessionGrabber::setPath(const QString &path)
-{
-    if (path != m_path) {
-        m_path = path;
-        Q_EMIT pathChanged();
-    }
-}
-
-static QString saveScreenshot(const QString &appId, const QSharedPointer<QQuickItemGrabResult> grabResult)
-{
-    const QImage image = grabResult->image();
-    const QString cPath = cacheFolder();
-    QDir d;
-    d.mkpath(cPath);
-    const QString path = cachePath(appId);
-    if (image.save(path)) {
-        return path;
-    } else {
-        return QString();
-    }
-}
-
-void SessionGrabber::grab()
-{
-    if (!m_grabResult.isNull()) {
-        qWarning() << "Asked to grab a screenshot when there's one already being grabbed, ignoring";
-        return;
-    }
-
-    if (m_target && !m_appId.isEmpty()) {
-        // grabToImage runs in a separate thread
-        m_grabResult = m_target->grabToImage();
-        connect(m_grabResult.data(), &QQuickItemGrabResult::ready, this, &SessionGrabber::grabReady);
-    } else {
-        qWarning() << "Can't grab screnshot: appId:" << m_appId << " target:" << m_target;
-    }
-}
-
-void SessionGrabber::removeScreenshot()
-{
-    const QString path = cachePath(m_appId);
-    QFile::remove(path);
-}
-
-void SessionGrabber::grabReady()
-{
-    QFuture<QString> f = QtConcurrent::run(saveScreenshot, m_appId, m_grabResult);
-    m_watcher = new QFutureWatcher<QString>(this);
-    m_watcher->setFuture(f);
-    connect(m_watcher, &QFutureWatcher<QString>::finished, this, &SessionGrabber::saveFinished);
-}
-
-void SessionGrabber::saveFinished()
-{
-    setPath(m_watcher->future().result());
-    delete m_watcher;
-    m_watcher = nullptr;
-    m_grabResult.clear();
-    Q_EMIT screenshotGrabbed();
-}

=== removed file 'plugins/SessionGrabber/sessiongrabber.h'
--- plugins/SessionGrabber/sessiongrabber.h	2015-04-30 09:03:40 +0000
+++ plugins/SessionGrabber/sessiongrabber.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef SESSIONGRABBER_H
-#define SESSIONGRABBER_H
-
-#include <QObject>
-#include <QSharedPointer>
-#include <QFutureWatcher>
-
-class QQuickItem;
-class QQuickItemGrabResult;
-
-/**
- * SessionGrabber saves to disk screenshots of the given item.
- * Images are saved into $HOME/.cache/app_shots/appId.png
- * It also handles giving back the screenshot path if it already exists (e.g. because a reboot)
- */
-class SessionGrabber : public QObject
-{
-    Q_OBJECT
-
-    /// appId is the key of the screenshot name.
-    Q_PROPERTY(QString appId READ appId WRITE setAppId NOTIFY appIdChanged)
-
-    /// path where the screenshot is saved, can be empty if no screenshot has been grabbed yet.
-    Q_PROPERTY(QString path READ path NOTIFY pathChanged)
-
-    /// target item for the screenshot grabbing.
-    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)
-
-public:
-    explicit SessionGrabber(QObject *parent = 0);
-
-    QString appId() const;
-    void setAppId(const QString &appId);
-
-    QQuickItem *target() const;
-    void setTarget(QQuickItem *target);
-
-    QString path() const;
-
-    /// Starts grabbing a screenshot. Emits screenshotGrabbed when ready.
-    Q_INVOKABLE void grab();
-
-    /// Removes the existing screenshot
-    Q_INVOKABLE void removeScreenshot();
-
-Q_SIGNALS:
-    void appIdChanged();
-    void targetChanged();
-    void pathChanged();
-
-    /// Signals screenshot grabbing has finished.
-    void screenshotGrabbed();
-
-private Q_SLOTS:
-    void grabReady();
-    void saveFinished();
-
-private:
-    void setPath(const QString &path);
-
-    QString m_appId;
-    QString m_path;
-    QQuickItem *m_target;
-    QFutureWatcher<QString> *m_watcher;
-    QSharedPointer<QQuickItemGrabResult> m_grabResult;
-};
-
-#endif

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-06-22 09:37:50 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-07-10 15:57:32 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
 import Unity.Application 0.1
-import SessionGrabber 0.1
 
 FocusScope {
     id: root
@@ -31,16 +30,11 @@
     property QtObject application
     property int surfaceOrientationAngle
 
-    function removeScreenshot() {
-        sessionGrabber.removeScreenshot();
-    }
-
     QtObject {
         id: d
 
         // helpers so that we don't have to check for the existence of an application everywhere
         // (in order to avoid breaking qml binding due to a javascript exception)
-        readonly property string appId: root.application ? root.application.appId : ""
         readonly property string name: root.application ? root.application.name : ""
         readonly property url icon: root.application ? root.application.icon : ""
         readonly property int applicationState: root.application ? root.application.state : -1
@@ -56,11 +50,11 @@
         property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
 
         property bool needToTakeScreenshot:
-            sessionContainer.surface && d.surfaceInitialized
-            && (d.applicationState === ApplicationInfoInterface.Stopped || d.applicationState === ApplicationInfoInterface.Suspended)
+            sessionContainer.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
+            && d.applicationState === ApplicationInfoInterface.Stopped
         onNeedToTakeScreenshotChanged: {
             if (needToTakeScreenshot) {
-                sessionGrabber.grab();
+                screenshotImage.take();
             }
         }
 
@@ -92,9 +86,27 @@
         onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }
     }
 
+    Image {
+        id: screenshotImage
+        objectName: "screenshotImage"
+        source: d.defaultScreenshot
+        anchors.fill: parent
+        antialiasing: !root.interactive
+
+        function take() {
+            // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"
+            // eg: "image://application/calculator-app/123456"
+            var timeMs = new Date().getTime();
+            source = "image://application/" + root.application.appId + "/" + timeMs;
+        }
+
+        // Save memory by using a half-resolution (thus quarter size) screenshot
+        sourceSize.width: root.width / 2
+        sourceSize.height: root.height / 2
+    }
+
     Loader {
         id: splashLoader
-        objectName: "splashLoader"
         visible: active
         active: false
         anchors.fill: parent
@@ -108,46 +120,10 @@
                 backgroundColor: d.splashColor
                 headerColor: d.splashColorHeader
                 footerColor: d.splashColorFooter
-                activeSpinner: d.applicationState === ApplicationInfoInterface.Starting ||
-                               d.applicationState === ApplicationInfoInterface.Running
             }
         }
     }
 
-    Image {
-        id: screenshotImage
-        objectName: "screenshotImage"
-        source: sessionGrabber.path || d.defaultScreenshot
-        anchors.fill: parent
-        antialiasing: !root.interactive
-        cache: false
-        asynchronous: true
-
-        // Save memory by using a half-resolution (thus quarter size) screenshot
-        sourceSize.width: root.width / 2
-        sourceSize.height: root.height / 2
-
-        ActivityIndicator {
-            id: activityIndicator
-            anchors.centerIn: parent
-            visible: running
-            running: stateGroup.state == "screenshot" &&
-                     (d.applicationState === ApplicationInfoInterface.Starting || d.applicationState === ApplicationInfoInterface.Running)
-        }
-    }
-
-    SessionGrabber {
-        id: sessionGrabber
-        appId: d.appId
-        target: root
-
-        onScreenshotGrabbed: {
-            // Need to reset to "" and back since it may be the same path with new content
-            screenshotImage.source = "";
-            screenshotImage.source = sessionGrabber.path;
-        }
-    }
-
     SessionContainer {
         id: sessionContainer
         // A fake application might not even have a session property.

=== modified file 'qml/Stages/Splash.qml'
--- qml/Stages/Splash.qml	2015-04-22 13:10:18 +0000
+++ qml/Stages/Splash.qml	2015-07-10 15:57:32 +0000
@@ -31,7 +31,6 @@
     property url icon
     property alias title: header.title
     property alias showHeader: header.visible
-    property alias activeSpinner: activityIndicator.running
 
     Ambiance.Palette {
         id: ambiancePalette
@@ -145,7 +144,6 @@
     }
 
     ActivityIndicator {
-        id: activityIndicator
         anchors.centerIn: header.visible ? parent : undefined
         anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
 

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-06-22 09:37:50 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-07-10 15:57:32 +0000
@@ -397,7 +397,6 @@
                 if (!running) {
                     dragArea.moving = false;
                     if (requestClose) {
-                        appWindow.removeScreenshot();
                         root.closed();
                     } else {
                         dragArea.distance = 0;

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2015-04-24 11:06:05 +0000
+++ tests/plugins/CMakeLists.txt	2015-07-10 15:57:32 +0000
@@ -2,7 +2,6 @@
 add_subdirectory(Greeter)
 add_subdirectory(LightDM)
 add_subdirectory(Dash)
-add_subdirectory(SessionGrabber)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== removed directory 'tests/plugins/SessionGrabber'
=== removed file 'tests/plugins/SessionGrabber/CMakeLists.txt'
--- tests/plugins/SessionGrabber/CMakeLists.txt	2015-06-30 11:41:26 +0000
+++ tests/plugins/SessionGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-add_executable(SessionGrabberTestExec
-    sessiongrabbertest.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber/sessiongrabber.cpp
-    )
-qt5_use_modules(SessionGrabberTestExec Core Quick Test Concurrent)
-
-add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber
-    )
-
-add_unity8_uitest(SessionGrabber SessionGrabberTestExec)

=== removed file 'tests/plugins/SessionGrabber/sessiongrabbertest.cpp'
--- tests/plugins/SessionGrabber/sessiongrabbertest.cpp	2015-04-28 11:24:24 +0000
+++ tests/plugins/SessionGrabber/sessiongrabbertest.cpp	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtTestGui>
-#include <QQuickItem>
-#include <QQuickView>
-#include <QSignalSpy>
-
-#include "sessiongrabber.h"
-
-class SessionGrabberTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void init()
-    {
-        view = new QQuickView();
-        view->setSource(QUrl::fromLocalFile(CURRENT_SOURCE_DIR "/sessiongrabbertest.qml"));
-        view->show();
-        QTest::qWaitForWindowExposed(view);
-    }
-
-    void testSessionGrabber()
-    {
-        SessionGrabber s;
-        s.setAppId("test-app-id");
-        s.setTarget(view->rootObject());
-        QSignalSpy spy(&s, &SessionGrabber::screenshotGrabbed);
-
-        QVERIFY(!QFile::exists(s.path()));
-
-        view->rootObject()->setProperty("color", "red");
-        s.grab();
-        spy.wait();
-
-        QVERIFY(QFile::exists(s.path()));
-        QImage image(s.path());
-        QCOMPARE(image.pixel(0, 0), qRgb(255, 0, 0));
-
-        view->rootObject()->setProperty("color", "blue");
-        s.grab();
-        spy.wait();
-
-        QVERIFY(QFile::exists(s.path()));
-        image = QImage(s.path());
-        QCOMPARE(image.pixel(0, 0), qRgb(0, 0, 255));
-
-        s.removeScreenshot();
-
-        QVERIFY(!QFile::exists(s.path()));
-    }
-
-    void cleanup()
-    {
-        delete view;
-    }
-
-private:
-    QQuickView *view;
-};
-
-QTEST_MAIN(SessionGrabberTest)
-
-#include "sessiongrabbertest.moc"

=== removed file 'tests/plugins/SessionGrabber/sessiongrabbertest.qml'
--- tests/plugins/SessionGrabber/sessiongrabbertest.qml	2015-04-24 11:06:05 +0000
+++ tests/plugins/SessionGrabber/sessiongrabbertest.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-Rectangle {
-    width: 100
-    height: 100
-}

=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-06-22 09:37:50 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-07-10 15:57:32 +0000
@@ -35,9 +35,6 @@
         root.fakeApplication.manualSurfaceCreation = true;
         root.fakeApplication.setState(ApplicationInfoInterface.Starting);
     }
-    Component.onDestruction: {
-        applicationWindowLoader.item.removeScreenshot();
-    }
     property QtObject fakeApplication: null
     readonly property var fakeSession: fakeApplication ? fakeApplication.session : null
 
@@ -334,40 +331,6 @@
             tryCompare(screenshotImage, "status", Image.Null);
         }
 
-        function test_suspendrestartApp() {
-            var screenshotImage = findChild(applicationWindowLoader.item, "screenshotImage");
-
-            initSession();
-            setApplicationState(appRunning);
-            tryCompare(stateGroup, "state", "surface");
-            waitUntilTransitionsEnd();
-
-            setApplicationState(appSuspended);
-
-            cleanupSession();
-
-            tryCompare(stateGroup, "state", "screenshot");
-            waitUntilTransitionsEnd();
-            tryCompare(fakeApplication, "session", null);
-
-            // and restart it
-            setApplicationState(appStarting);
-
-            waitUntilTransitionsEnd();
-            verify(stateGroup.state === "screenshot");
-            verify(fakeSession === null);
-
-            setApplicationState(appRunning);
-
-            waitUntilTransitionsEnd();
-            verify(stateGroup.state === "screenshot");
-
-            initSession();
-
-            tryCompare(stateGroup, "state", "surface");
-            tryCompare(screenshotImage, "status", Image.Null);
-        }
-
         function test_appCrashed() {
             initSession();
             setApplicationState(appRunning);
@@ -445,12 +408,5 @@
             applicationWindowLoader.item.interactive = true;
             compare(fakeSession.surface.activeFocus, true);
         }
-
-        function test_no_spinner_if_stopped() {
-            setApplicationState(appStopped);
-            tryCompare(stateGroup, "state", "splashScreen");
-            var splashLoader = findChild(applicationWindowLoader.item, "splashLoader");
-            verify(!splashLoader.item.activeSpinner);
-        }
     }
 }