Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/combobutton-tests into lp:ubuntu-ui-toolkit

[Sergio Cazzolato]

Test cases added to cover the ComboButton object

[Christopher Lee (veebers)]

As per inline comments I think the tests should be split out into individual tests and the scenario removed.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1188
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/ubuntu-ui-toolkit/combobutton-tests/+merge/259054/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2798/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2796/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2203/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/combobutton-tests]

1189. By Sergio Cazzolato on 2015-05-14

Test cases added to cover the ComboButton object

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1189
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2819/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2817/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2204/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Lee (veebers)]

One minor comment, but otherwise looks great :-)

review: Needs Fixing

[Vincent Ladeuil (vila)]

One minor comment, but otherwise looks great :-)

Err, yeah, well, I agree with Chris but my minor comment is different ;)

review: Needs Fixing

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/combobutton-tests]

1190. By Sergio Cazzolato on 2015-05-15

Test cases added to cover the ComboButton object

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1190
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2206/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2851/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2849/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2206/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Lee (veebers)]

Good catch @vila.

LGTM.

review: Approve

[Christian Dywan (kalikiana)]

This MR needs to target lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

review: Needs Fixing

Unmerged revisions

1190. By Sergio Cazzolato on 2015-05-15

Test cases added to cover the ComboButton object

1189. By Sergio Cazzolato on 2015-05-14

Test cases added to cover the ComboButton object

1188. By Sergio Cazzolato on 2015-05-13

Basic combobutton test cases

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-03-03 13:47:48 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-05-15 20:09:53 +0000
@@ -100,7 +100,7 @@
 
             ComboButton {
                 text: "Press me"
-                objectName: "combobutton_collapsed"
+                objectName: "collapsed"
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
@@ -115,6 +115,7 @@
 
             ComboButton {
                 iconSource: "call.png"
+                objectName: "collapsed_icon"
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
@@ -129,6 +130,7 @@
 
             ComboButton {
                 text: "Answer"
+                objectName: "collapsed_icon_and_text"
                 iconSource: "call.png"
                 comboList:  UbuntuListView {
                     model: 10
@@ -143,10 +145,11 @@
 
             ComboButton {
                 text: "Press me"
-                objectName: "combobutton_expanded"
+                objectName: "expanded"
                 expanded: true
                 comboList:  UbuntuListView {
                     model: 10
+                    objectName: "expanded_list"
                     delegate: Standard {
                         text: "item #" + modelData
                     }

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_combobuttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_combobuttons.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_combobuttons.py	2015-05-15 20:09:53 +0000
@@ -0,0 +1,74 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the Ubuntu UI Toolkit Gallery - ComboButton component"""
+
+import testscenarios
+
+from fixtures import EnvironmentVariable
+
+from ubuntuuitoolkit.tests import gallery
+from ubuntuuitoolkit import ubuntu_scenarios
+
+
+class ComboButtonsTestCase(gallery.GalleryTestCase):
+
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
+    def setUp(self):
+        super().setUp()
+        self.useFixture(EnvironmentVariable('LANGUAGE', 'en'))
+
+    def test_collapsed_combo_button_has_text(self):
+        self.open_page('buttonsElement')
+
+        combo_button = self.app.select_single('ComboButton', objectName='collapsed')
+
+        self.assertIsNot(combo_button, None)
+        self.assertEquals('Press me', combo_button.text)
+        self.assertFalse(combo_button.expanded)
+
+    def test_collapsed_combo_button_has_icon(self):
+        self.open_page('buttonsElement')
+
+        combo_button = self.app.select_single('ComboButton', objectName='collapsed_icon')
+
+        self.assertIsNot(combo_button, None)
+        self.assertTrue(combo_button.iconSource.endswith('call.png'))
+        self.assertFalse(combo_button.expanded)
+
+    def test_collapsed_combo_button_has_icon_and_text(self):
+        self.open_page('buttonsElement')
+
+        combo_button = self.app.select_single('ComboButton', objectName='collapsed_icon_and_text')
+
+        self.assertIsNot(combo_button, None)
+        self.assertTrue(combo_button.iconSource.endswith('call.png'))
+        self.assertEquals('Answer', combo_button.text)
+        self.assertFalse(combo_button.expanded)
+
+    def test_expanded_combo_button_has_text_and_correct_size(self):
+        self.open_page('buttonsElement')
+
+        combo_button = self.app.select_single('ComboButton', objectName='expanded')
+        self.assertIsNot(combo_button, None)
+        self.assertEquals('Press me', combo_button.text)
+        self.assertTrue(combo_button.expanded)
+        self.assertEquals(combo_button.expandedHeight, combo_button.height)
+
+        combo_list = self.app.select_single(objectName='expanded_list')
+        self.assertIsNot(combo_list, None)
+        self.assertEquals(10, combo_list.count)