Ubuntu UI Toolkit

Merge lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1 into lp:ubuntu-ui-toolkit/staging

clean_gallery_tests1
Merge into staging

Proposed by Leo Arias on 2014-05-16

Status:	Merged
Approved by:	Cris Dywan on 2014-05-23
Approved revision:	1063
Merged at revision:	1074
Proposed branch:	lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~elopio/ubuntu-ui-toolkit/swipe_into_view
Diff against target:	143 lines (+47/-80) 1 file modified tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+47/-80)
To merge this branch:	bzr merge lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-05-23
Cris Dywan		2014-05-16	Approve on 2014-05-23
Chris Gagnon (community)			Approve on 2014-05-23
Review via email: mp+219792@code.launchpad.net

Commit message

Rewrite OptionSelector tests using new helpers.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/238/rebuild

review: Needs Fixing (continuous-integration)

lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1 updated on 2014-05-21

1061. By Leo Arias on 2014-05-21: Merged with staging.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/264/rebuild

review: Needs Fixing (continuous-integration)

lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1 updated on 2014-05-22

1062. By Leo Arias on 2014-05-22: Merged with staging.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/270/rebuild

review: Approve (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-05-23:

LGTM

review: Approve

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-05-23:

+ def test_select_option_from_exptanded_optionselector(self):

Typo, should say "expanded"

Maybe more explicitly say something like "Rewrite OptionSelector tests using new helpers", clean up is going to be rather meaningless in the commit log.

Looks good otherwise.

review: Needs Fixing

lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1 updated on 2014-05-23

1063. By Leo Arias on 2014-05-23: Fixed typo.

Revision history for this message

Leo Arias (elopio) wrote on 2014-05-23:

Fixed, thanks!

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-05-23:

Thanks!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/274/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Leo Arias

Tom Mirmar

Ubuntu SDK team

 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2013-11-08 09:19:02 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-05-23 09:50:56 +0000
@@ -1,6 +1,6 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+ #
--# Copyright (C) 2012, 2013 Canonical Ltd.
++# Copyright (C) 2012, 2013, 2014 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
@@ -14,85 +14,52 @@
  # 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 - OptionSelector component"""
--import time
--from autopilot.matchers import Eventually
--from testtools.matchers import Equals
--from ubuntuuitoolkit.tests import FlickDirection
++"""Tests for the Ubuntu UI Toolkit Gallery - OptionSelector component."""
++
++import ubuntuuitoolkit
  from ubuntuuitoolkit.tests.gallery import GalleryTestCase
--class OptionSelectorTests(GalleryTestCase):
--    """Generic tests for the Gallery"""
--
--    def test_optionselector_collapsed(self):
--        item = "Option Selector"
--        self.loadItem(item)
--        self.checkPageHeader(item)
--        collapsed = self.getObject("optionselector_collapsed")
--        styleditem = collapsed.select_single('StyledItem',
--                                             objectName='listContainer')
--
--        self.assertThat(collapsed.selectedIndex, Equals(0))
--        self.pointing_device.click_object(collapsed)
--        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(True)))
--        #try to search the following list entry few times
--        #as it may not be available immediately.
--        for t in range(0, 9):
--            try:
--                selectedValue = collapsed.select_single('Label',
--                                                        text='Value 4')
--                self.assertIsNotNone(selectedValue)
--            except:
--                time.sleep(1)
--
--        self.pointing_device.click_object(selectedValue)
--        self.assertThat(collapsed.selectedIndex, Eventually(Equals(3)))
--        self.assertThat(styleditem.currentlyExpanded,
--                        Eventually(Equals(False)))
--
--    def test_optionselector_expanded(self):
--        item = "Option Selector"
--        self.loadItem(item)
--        self.checkPageHeader(item)
--        expanded = self.getObject("optionselector_expanded")
--
--        self.assertThat(expanded.selectedIndex, Equals(0))
--        selectedValue = expanded.select_single('Label', text='Value 4')
--        self.assertIsNotNone(selectedValue)
--        self.pointing_device.click_object(selectedValue)
--        self.assertThat(expanded.selectedIndex, Eventually(Equals(3)))
--
--        selectedValue = expanded.select_single('Label', text='Value 1')
--        self.assertIsNotNone(selectedValue)
--        self.pointing_device.click_object(selectedValue)
--        self.assertThat(expanded.selectedIndex, Eventually(Equals(0)))
--
--    def test_optionselector_custommodel(self):
--        item = "Option Selector"
--        self.loadItem(item)
--        self.checkPageHeader(item)
--
--        custommodel = self.getObject("optionselector_custommodel")
--        flickable = self.main_view.select_single('QQuickFlickable')
--        self.assertIsNotNone(flickable)
--
--        #Flick upward to reveal the hidden ui element.
--        self.reveal_item_by_flick(custommodel, flickable, FlickDirection.UP)
--        self.assertThat(flickable.flicking, Eventually(Equals(False)))
--
--        self.assertThat(custommodel.selectedIndex, Equals(0))
--        selectedValue = custommodel.select_single('Label', text='Name 4')
--        self.assertIsNotNone(selectedValue)
--        self.pointing_device.click_object(selectedValue)
--        self.assertThat(custommodel.selectedIndex, Eventually(Equals(3)))
--
--        selectedValue = custommodel.select_single('Label', text='Name 1')
--        self.assertIsNotNone(selectedValue)
--        self.pointing_device.click_object(selectedValue)
--        self.assertThat(custommodel.selectedIndex, Eventually(Equals(0)))
--
--        #scroll the page downward now.
--        collapsed = self.getObject("optionselector_collapsed")
--        self.reveal_item_by_flick(collapsed, flickable, FlickDirection.DOWN)
--        self.assertThat(flickable.flicking, Eventually(Equals(False)))
++class OptionSelectorTestCase(GalleryTestCase):
++
++    def setUp(self):
++        super(OptionSelectorTestCase, self).setUp()
++        item = "Option Selector"
++        self.loadItem(item)
++        self.checkPageHeader(item)
++
++    def test_select_option_from_collapsed_optionselector(self):
++        collapsed_option_selector = self.main_view.select_single(
++            ubuntuuitoolkit.OptionSelector,
++            objectName='optionselector_collapsed')
++
++        self.assertEqual(
++            collapsed_option_selector.get_selected_text(), 'Value 1')
++
++        collapsed_option_selector.select_option('Label', text='Value 4')
++        self.assertEqual(collapsed_option_selector.get_selected_index(), 3)
++
++    def test_select_option_from_expanded_optionselector(self):
++        expanded_option_selector = self.main_view.select_single(
++            ubuntuuitoolkit.OptionSelector,
++            objectName='optionselector_expanded')
++
++        self.assertEqual(
++            expanded_option_selector.get_selected_text(), 'Value 1')
++
++        expanded_option_selector.select_option('Label', text='Value 4')
++        self.assertEqual(expanded_option_selector.get_selected_index(), 3)
++
++    def test_select_option_from_optionselector_with_custom_model(self):
++        option_selector_with_custom_model = self.main_view.select_single(
++            ubuntuuitoolkit.OptionSelector,
++            objectName='optionselector_custommodel')
++        option_selector_with_custom_model.swipe_into_view()
++
++        self.assertEqual(
++            option_selector_with_custom_model.get_selected_index(), 0)
++
++        option_selector_with_custom_model.select_option(
++            'Label', text='Name 4')
++        self.assertEqual(
++            option_selector_with_custom_model.get_selected_index(), 3)

Ubuntu UI Toolkit

Merge lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests1 into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers