Merge lp:~kissiel/checkbox/checkbox-touch-cleanup into lp:checkbox

[Maciej Kisielewski]

This MR removes some unused bits from the Checkbox-Touch.

6827eae checkbox-touch: remove FakeCheckboxTouchApplication
2d4d959 checkbox-touch: remove HelloComponent
8504c0f checkbox-touch: remove screens preview page

[Zygmunt Krynicki (zyga)]

+1, thanks

review: Approve

[Daniel Manrique (roadmr)]

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in checkbox-touch/py/checkbox_touch.py

[Maciej Kisielewski (kissiel)]

Self-approving, as the only change after Zygmunt's review was a simple rebase.

[Daniel Manrique (roadmr)]

The attempt to merge lp:~kissiel/checkbox/checkbox-touch-cleanup into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.06user 0.01system 0:05.22elapsed 1%CPU (0avgtext+0avgdata 7848maxresident)k
[precise] (timing) 0inputs+32outputs (0major+7529minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 46.65user 14.74system 1:39.52elapsed 61%CPU (0avgtext+0avgdata 52404maxresident)k
[precise] (timing) 0inputs+19176outputs (0major+6475307minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[precise-testing] container-tests-checkbox-gui-build: PASS
[precise-testing] (timing) 28.25user 2.14system 0:30.71elapsed 98%CPU (0avgtext+0avgdata 116644maxresident)k
[precise-testing] (timing) 0inputs+4264outputs (0major+478500minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.64user 0.14system 0:00.83elapsed 94%CPU (0avgtext+0avgdata 42864maxresident)k
[precise-testing] (timing) 0inputs+1528outputs (0major+21620minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 16.97user 0.16system 0:17.61elapsed 97%CPU (0avgtext+0avgdata 84236maxresident)k
[precise-testing] (timing) 0inputs+1312outputs (0major+31841minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.00system 0:00.03elapsed 53%CPU (0avgtext+0avgdata 2044maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2383minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.34user 0.09system 0:01.47elapsed 97%CPU (0avgtext+0avgdata 49672maxresident)k
[precise-testing] (timing) 0inputs+40outputs (0major+15020minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.15user 0.03system 0:00.20elapsed 92%CPU (0avgtext+0avgdata 10588maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+5046minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 32.86user 1.26system 0:34.46elapsed 99%CPU (0avgtext+0avgdata 134856maxresident)k
[precise-testing] (timing) 0inputs+3016outputs (0major+161950minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (t...

[lp:~kissiel/checkbox/checkbox-touch-cleanup]

3825. By Maciej Kisielewski on 2015-06-08

checkbox-touch: remove HelloComponent

This patch removes boilerplate component that was generated by SDK's wizard.
It's about time :)

Signed-off-by: Maciej Kisielewski <email address hidden>

3826. By Maciej Kisielewski on 2015-06-08

checkbox-touch: remove screens preview page

This patch removes 'alternative' way of lunching the app, where user could see
individual components. This component - ScreensPreviewPage got stale and no one
used it, so this commit ends its existance.

Signed-off-by: Maciej Kisielewski <email address hidden>

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

=== removed file 'checkbox-touch/components/HelloComponent.qml'
--- checkbox-touch/components/HelloComponent.qml	2014-08-11 12:29:41 +0000
+++ checkbox-touch/components/HelloComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-UbuntuShape {
-    width: 200
-    height: width
-
-    property alias text : myText.text
-
-    Label {
-        id: myText
-        anchors.centerIn: parent
-    }
-}
-

=== removed file 'checkbox-touch/components/ScreensPreviewPage.qml'
--- checkbox-touch/components/ScreensPreviewPage.qml	2014-09-29 19:18:47 +0000
+++ checkbox-touch/components/ScreensPreviewPage.qml	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-/*
- * This file is part of Checkbox
- *
- * Copyright 2014 Canonical Ltd.
- *
- * Authors:
- * - Maciej Kisielewski <[e-mail]>
- *
- * 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.0
-import Ubuntu.Components 1.1
-import QtQuick.Layouts 1.1
-
-Page {
-    id: screensPreviewPage
-    title: i18n.tr("Screens preview")
-    visible: false
-
-    Flickable {
-        anchors.fill: parent
-        contentHeight: column.height
-        contentWidth: column.width
-        anchors.margins: units.gu(1)
-        ColumnLayout {
-            id: column
-            spacing: units.gu(3)
-            Label {
-                fontSize: "x-large"
-                Layout.alignment: Qt.AlignHCenter
-                Layout.fillWidth: true
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: i18n.tr("This is a developer screen that allows you to preview particular part of the app.\nSelect which screen to preview")
-            }
-            Button {
-                text: i18n.tr("Welcome page")
-                onClicked: {
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("WelcomePage.qml")).createObject();
-                    newPage.welcomeText = i18n.tr("This application is under development.\nThere is nothing beyond this screen yet");
-                    newPage.startTestingTriggered.connect(function() { pageStack.pop() })
-                    pageStack.push(newPage);
-                }
-            }
-            Button {
-                text: i18n.tr("Automated test page")
-                onClicked: {
-                    var test = {
-                        "name": "memory/info",
-                        "description": "This test checks the amount of memory which is reporting \
-in meminfo against the size of the memory modules detected by DMI."
-                    };
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("AutomatedTestPage.qml")).createObject();
-                    newPage.test = test;
-                    pageStack.push(newPage);
-                }
-            }
-            Button {
-                text: i18n.tr("User-Interact-Verify test page")
-                onClicked: {
-                    var test = {
-                        "name": "Headphones playback",
-                        "description": "This test will check that headphones connector works correctly.\n\
-STEPS:\n\
-  1. Connect a pair of headphones to your audio device\n\
-  2. Click the Test button to play a sound to your audio device"
-                    };
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("InteractIntroPage.qml")).createObject();
-                    newPage.test = test;
-                    newPage.testStarted.connect(userInteractVerifyTestStarted);
-                    newPage.testDone.connect(testDone);
-                    //Triggering of timer should change the state on intro page
-                    interactIntroTimer.triggered.connect(newPage.stopActivity)
-                    pageStack.push(newPage);
-                }
-            }
-            Button {
-                objectName: "resumeSessionPageButton"
-                text: i18n.tr("Resume session page")
-                onClicked: {
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("ResumeSessionPage.qml")).createObject();
-                    newPage.resumeText = "Checkbox did not finish completely.\n\n\
-Do you want to rerun the last test, continue to the next test, or restart from the beginning?";
-                    newPage.rerunLast.connect(function() {
-                        console.log("Rerun last test selected");
-                        replaceOnPageStack(screensPreviewPage);
-                    });
-                    newPage.continueSession.connect(function() {
-                        console.log("Continue session selected");
-                        replaceOnPageStack(screensPreviewPage);
-                    });
-                    newPage.restartSession.connect(function() {
-                        console.log("Restart session selected");
-                        replaceOnPageStack(screensPreviewPage);
-                    });
-                    replaceOnPageStack(newPage);
-                }
-            }
-            Button {
-                objectName: "manualIntroPageButton"
-                text: i18n.tr("Manual test page")
-                onClicked: {
-                    var test = {
-                        "name": "Volume Down Key",
-                        "description": "PURPOSE:\n    This test will test the volume down key\n\
-STEPS:\n    1. Click the volume down key of your phone",
-                        "verificationDescription": "Did the volume go down when you pressed the volume down key?"
-                    };
-
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("ManualIntroPage.qml")).createObject();
-                    newPage.testDone.connect(testDone);
-                    newPage.test = test;
-                    newPage.continueClicked.connect(function() {
-                        var verificationPage = Qt.createComponent(Qt.resolvedUrl("TestVerificationPage.qml")).createObject();
-                        verificationPage.test = test;
-                        verificationPage.testDone.connect(testDone);
-                        pageStack.push(verificationPage);
-                    });
-                    pageStack.push(newPage);
-                }
-            }
-            Row {
-                spacing: units.gu(3)
-                Button {
-                    text: i18n.tr("User-Interact test page")
-                    onClicked: {
-                        var test = {
-                            "name": "Finger Expand",
-                            "description": "PURPOSE:\n    Check touchscreen expand gesture for zoom\n\
-    STEPS:\n\
-      1. Press the Test button\n\
-      2. Using 2 fingers, resize the blue square until it turns green, then release it."
-                        };
-
-                        var newPage = Qt.createComponent(Qt.resolvedUrl("InteractIntroPage.qml")).createObject();
-                        newPage.test = test;
-                        newPage.testDone.connect(testDone);
-                        newPage.testStarted.connect(userInteractTestStarted);
-                        interactIntroTimer.triggered.connect(newPage.stopActivity)
-                        pageStack.push(newPage);
-                    }
-                }
-                Label {
-                    text: "Should pass?"
-                }
-
-                Switch {
-                    id: userInteractShouldFail
-                }
-            }
-            Button {
-                id: verificationPageButton
-                text: i18n.tr("Test verification page")
-                onClicked: {
-                    var test = {
-                        "name": "Headphones playback",
-                        "verificationDescription": "Did you hear a sound through the headphones and did the sound \
-play without any distortion, clicks or other strange noises from your headphones?"
-                    };
-
-                    interactIntroTimer.triggered.disconnect(verificationPageButton.clicked);
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("TestVerificationPage.qml")).createObject();
-                    newPage.test = test;
-                    newPage.testDone.connect(testDone);
-                    pageStack.push(newPage);
-                }
-            }
-            Button {
-                text: i18n.tr("Results page")
-                onClicked: {
-                    var newPage = Qt.createComponent(Qt.resolvedUrl("ResultsPage.qml")).createObject();
-                    newPage.results = {"totalPassed": 15, "totalFailed": 3, "totalSkipped": 5};
-                    pageStack.push(newPage);
-                }
-            }
-            LatchButton {
-                objectName: "latchButton"
-                text: "Latch button"
-            }
-        }
-    }
-    /*
-      This timer emulates running test.
-    */
-    Timer {
-        id: interactIntroTimer
-        interval: 2000; running: false; repeat: false
-    }
-
-    function testDone(test) {
-        console.log("Test finished with result: " + test["outcome"]);
-        unwindStack();
-    }
-
-    function replaceOnPageStack(newPage) {
-        pageStack.pop();
-        pageStack.push(newPage);
-    }
-    function userInteractVerifyTestStarted() {
-        interactIntroTimer.triggered.connect(verificationPageButton.clicked);
-        interactIntroTimer.start();
-    }
-    function showUserInteractSummaryPage() {
-        interactIntroTimer.triggered.disconnect(showUserInteractSummaryPage)
-        var newPage = Qt.createComponent(Qt.resolvedUrl("UserInteractSummaryPage.qml")).createObject();
-        var test = {
-            "name": "Finger Expand",
-            "outcome": (userInteractShouldFail.checked == true) ? "pass" : "fail"
-        }
-        newPage.test = test
-        newPage.testDone.connect(testDone);
-        pageStack.push(newPage);
-    }
-    function userInteractTestStarted() {
-        interactIntroTimer.triggered.connect(showUserInteractSummaryPage);
-        interactIntroTimer.start();
-    }
-    function unwindStack() {
-        /*
-            This function pops pages of from the stack until we're on screensPreviewPage
-            Ordinary pageStack.pop() would'n work as there might be 1 or 2 pages on stack
-        */
-        while(pageStack.currentPage!=screensPreviewPage) {
-            pageStack.pop();
-        }
-    }
-}

=== removed file 'checkbox-touch/preview.qml'
--- checkbox-touch/preview.qml	2014-12-03 15:05:34 +0000
+++ checkbox-touch/preview.qml	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * This file is part of Checkbox
- *
- * Copyright 2014 Canonical Ltd.
- *
- * Authors:
- * - Maciej Kisielewski <[e-mail]>
- *
- * 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.0
-import Ubuntu.Components 1.1
-import "components"
-
-/*!
-    \brief MainView with a Label and Button elements.
-*/
-
-MainView {
-    // objectName for functional testing purposes (autopilot-qt5)
-    objectName: "mainView"
-
-    // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "com.ubuntu.checkbox"
-
-    /*
-     This property enables the application to change orientation
-     when the device is rotated. The default is false.
-    */
-    //automaticOrientation: true
-
-    width: units.gu(100)
-    height: units.gu(75)
-
-    useDeprecatedToolbar: false
-
-    // High-level object representing the full checkbox testing stack
-    CheckboxStack {
-        onStackReady: {
-            console.log("Pyotherside version " + pyothersideVersion);
-            console.log("Python version " + pythonVersion);
-            console.log("Plainbox version " + plainboxVersion);
-            console.log("Checkbox version " + applicationVersion);
-        }
-    }
-
-    PageStack {
-        id: pageStack
-        objectName: "pageStack"
-        Component.onCompleted: {
-            var newPage = Qt.createComponent(Qt.resolvedUrl("components/ScreensPreviewPage.qml")).createObject();
-            push(newPage);
-        }
-    }
-}

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2015-05-29 14:45:19 +0000
+++ checkbox-touch/py/checkbox_touch.py	2015-06-08 08:21:58 +0000
@@ -136,116 +136,6 @@
     return b not in a
 
 
-class FakeCheckboxTouchApplication(PlainboxApplication):
-
-    __version__ = (1, 1, 3, 'final', 0)
-
-    def __init__(self):
-        if plainbox.__version__ < (0, 21):
-            raise SystemExit("plainbox 0.21 required, you have {}".format(
-                ToolBase.format_version_tuple(plainbox.__version__)))
-        # adjust_logging(logging.INFO, ['checkbox.touch'], True)
-        self.index = 0
-        self.max_tests = 50
-        self.max_categories = 30
-
-    def __repr__(self):
-        return "fake-app"
-
-    @view
-    def get_version_pair(self):
-        return {
-            'plainbox_version': ToolBase.format_version_tuple(
-                plainbox.__version__),
-            'application_version': ToolBase.format_version_tuple(
-                self.__version__)
-        }
-
-    @view
-    def start_session(self):
-        return {
-            'session_id': 'fake'
-        }
-
-    @view
-    def get_testplans(self):
-        return {
-            'testplan_info_list': [{
-                "mod_id": "id-{}".format(i),
-                "mod_name": "name-{}".format(i),
-                "mod_selected": True,
-            } for i in range(self.max_categories)]
-        }
-
-    @view
-    def remember_testplan(self):
-        pass
-
-    @view
-    def get_categories(self):
-        return {
-            'category_info_list': [{
-                "mod_id": "id-{}".format(i),
-                "mod_name": "name-{}".format(i),
-                "mod_selected": True,
-            } for i in range(self.max_categories)]
-        }
-
-    @view
-    def remember_categories(self, selected_id_list):
-        pass
-
-    @view
-    def get_available_tests(self):
-        return {
-            'test_info_list': sorted([
-                {
-                    "mod_id": "id-{}".format(i),
-                    "mod_name": "name-{}".format(i),
-                    "mod_group": "group-{}".format(i % 3),
-                    "mod_selected": True,
-                } for i in range(self.max_tests)],
-                key=lambda item: item['mod_group'])
-        }
-
-    @view
-    def remember_tests(self, selected_id_list):
-        pass
-
-    @view
-    def get_next_test(self):
-        if self.index < self.max_tests:
-            result = {
-                "id": "id-{}".format(self.index),
-                "name": 'name-{}'.format(self.index),
-                "description": 'description-{}'.format(self.index),
-                "verificationDescription": "Verification",
-                "plugin": "manual",
-                "command": "command"
-            }
-            self.index += 1
-            return result
-        else:
-            return {}
-
-    @view
-    def register_test_result(self, test):
-        pass
-
-    @view
-    def run_test_activity(self, test):
-        test['outcome'] = 'pass'
-        return test
-
-    @view
-    def get_results(self):
-        return {
-            'totalPassed': 31,
-            'totalFailed': 9,
-            'totalSkipped': 10
-        }
-
-
 class CheckboxTouchApplication(PlainboxApplication):
     """
     Class implementing the whole checkbox-touch application logic.

=== removed file 'checkbox-touch/tests/unit/tst_hellocomponent.qml'
--- checkbox-touch/tests/unit/tst_hellocomponent.qml	2014-08-11 12:29:41 +0000
+++ checkbox-touch/tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 0.1
-import "../../components"
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-// Execute tests with:
-//   qmltestrunner
-
-Item {
-    // The objects
-    HelloComponent {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "HelloComponent"
-
-        function init() {
-            console.debug(">> init");
-            compare("",objectUnderTest.text,"text was not empty on init");
-            console.debug("<< init");
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-
-        function test_canReadAndWriteText() {
-            var expected = "Hello World";
-
-            objectUnderTest.text = expected;
-
-            compare(expected,objectUnderTest.text,"expected did not equal result");
-        }
-    }
-}
-