Merge lp:~carla-sella/ubuntu-calendar-app/calendar-management-tests into lp:ubuntu-calendar-app

[Carla Sella]

New Calendar App management tests.

New Calendar App management tests.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:631
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1144/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2603
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/615
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/141

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1144/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Looks good. A few comments, including requests for more tests (can't help myself!). I wouldn't hold this for the test enhancements, but I'd like to see the other issues fixed.

review: Needs Fixing

[lp:~carla-sella/ubuntu-calendar-app/calendar-management-tests]

632. By Carla Sella on 2015-04-17

Implemented improvements asked by Nicholas.

[Nicholas Skaggs (nskaggs)]

LGTM!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:632
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1147/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2621
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/618
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/144

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1147/rebuild

review: Approve (continuous-integration)

=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2014-11-08 11:26:37 +0000
+++ CalendarChoicePopup.qml	2015-04-17 19:50:54 +0000
@@ -24,7 +24,7 @@
 
 Page {
     id: root
-
+    objectName: "calendarchoicepopup"
     property var model;
 
     signal collectionUpdated();
@@ -67,6 +67,7 @@
             width: aadCalendar.width
             Button {
                 id:aadCalendar
+                objectName: "aadCalendar"
                 text: i18n.tr("Add new Calendar")
                 anchors.top :parent.top
                 anchors.topMargin:units.gu(2)
@@ -80,9 +81,11 @@
         model : root.model.getCollections();
         delegate: ListItem.Standard {
             id: delegateComp
+            objectName: "calendarItem"
 
             Rectangle {
                 id: calendarColorCode
+                objectName: "calendarColorCode"
 
                 width: parent.height - units.gu(2)
                 height: width
@@ -111,6 +114,7 @@
             }
 
             Label{
+                objectName: "calendarName"
                 text: modelData.name
                 elide: Text.ElideRight
                 opacity: checkBox.checked ? 1.0 : 0.8
@@ -125,6 +129,7 @@
 
             control: CheckBox {
                 id: checkBox
+                objectName: "checkBox"
                 checked: modelData.extendedMetaData("collection-selected")
                 enabled:  !root.isInEditMode
                 onCheckedChanged: {
 
=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml	2014-09-19 08:46:30 +0000
+++ ColorPickerDialog.qml	2015-04-17 19:50:54 +0000
@@ -21,6 +21,7 @@
 
 Dialog {
     id: root
+    objectName: "colorPickerDialog"
     title: i18n.tr("Select Color")
     signal accepted(var color)
     signal rejected()
@@ -34,6 +35,7 @@
             Repeater{
                 model: ["#2C001E","#333333","#DD4814","#DF382C","#EFB73E","#19B6EE","#38B44A","#001F5C"];
                 delegate:Rectangle{
+                    objectName: "color" + index
                     width: parent.width/5
                     height: width
                     color: modelData
 
=== modified file 'EventActions.qml'
--- EventActions.qml	2015-03-20 14:25:01 +0000
+++ EventActions.qml	2015-04-17 19:50:54 +0000
@@ -55,6 +55,7 @@
 
     Action{
         id: _showCalendarAction
+        objectName: "calendarsbutton"
         iconName: "calendar"
         text: i18n.tr("Calendars")
         onTriggered: {
 
=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2015-04-10 19:33:42 +0000
+++ tests/autopilot/calendar_app/__init__.py	2015-04-17 19:50:54 +0000
@@ -142,6 +142,18 @@
         header.click_action_button('neweventbutton')
         return self.wait_select_single(NewEvent, objectName='newEventPage')
 
+    @autopilot.logging.log_action(logger.info)
+    def go_to_calendar_choice_popup(self):
+        """Open the calendar chioce popup.
+
+        :return: CalendaChoicePopup.
+
+        """
+        header = self.get_header()
+        header.click_action_button('calendarsbutton')
+        return self.wait_select_single(
+            CalendarChoicePopup, objectName="calendarchoicepopup")
+
     def set_picker(self, field, mode, value):
         # open picker
         self.pointing_device.click_object(field)
@@ -285,6 +297,16 @@
         header = self.get_header()
         header.click_action_button('todaybutton')
 
+    @autopilot.logging.log_action(logger.info)
+    def get_color_picker_dialog(self):
+        return self.wait_select_single(
+            "ColorPickerDialog", objectName="colorPickerDialog")
+
+    @autopilot.logging.log_action(logger.info)
+    def press_header_custombackbutton(self):
+        header = self.get_header()
+        header.click_custom_back_button()
+
 
 class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -1003,3 +1025,57 @@
         delete_button = self.select_single(
             'Button', objectName='deleteEventButton')
         self.pointing_device.click_object(delete_button)
+
+
+class CalendarChoicePopup(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Calendar Choice Popup."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def press_check_box_button(self):
+        """ press check box button to select or unselect it """
+        calendar = self._get_calendar()
+        check_box = calendar.wait_select_single(
+            "CheckBox", objectName="checkBox")
+        self.pointing_device.click_object(check_box)
+        check_box.checked.wait_for(False)
+
+    def _get_calendar(self):
+        calendarItems = self.select_many("Standard", objectName="calendarItem")
+        for item in calendarItems:
+            if item.select_single(
+                    "Label", objectName="calendarName").text == "Personal":
+                    return item
+
+    @autopilot.logging.log_action(logger.debug)
+    def get_checkbox_status(self):
+        """ press check box button to select or unselect it """
+        calendar = self._get_calendar()
+        return calendar.wait_select_single(
+            "CheckBox", objectName="checkBox").checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def get_calendar_color(self):
+        """ get calendar color """
+        calendar = self._get_calendar()
+        return calendar.select_single(
+            "QQuickRectangle", objectName="calendarColorCode").color
+
+    @autopilot.logging.log_action(logger.debug)
+    def open_color_picker_dialog(self):
+        """ press color rectangle to open calendar color picker"""
+        calendar = self._get_calendar()
+        color_rectangle = calendar.wait_select_single(
+            "QQuickRectangle", objectName="calendarColorCode")
+        self.pointing_device.click_object(color_rectangle)
+
+
+class ColorPickerDialog(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for the Color Picker Dialog."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def change_calendar_color(self, new_color):
+        new_color_circle = self.wait_select_single(
+            "QQuickRectangle", objectName=new_color)
+        self.pointing_device.click_object(new_color_circle)
 
=== added file 'tests/autopilot/calendar_app/tests/test_management.py'
--- tests/autopilot/calendar_app/tests/test_management.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/calendar_app/tests/test_management.py	2015-04-17 19:50:54 +0000
@@ -0,0 +1,82 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# 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/>.
+
+"""
+Calendar app autopilot tests calendar management.
+"""
+
+
+from testtools.matchers import NotEquals, Equals
+from autopilot.matchers import Eventually
+
+from calendar_app import data
+
+from calendar_app.tests import CalendarAppTestCaseWithVcard
+
+
+class TestManagement(CalendarAppTestCaseWithVcard):
+
+    def test_change_calendar_color(self):
+        """ Test changing calendar color   """
+        calendar_choice_popup = \
+            self.app.main_view.go_to_calendar_choice_popup()
+        original_calendar_color = \
+            calendar_choice_popup.get_calendar_color()
+        calendar_choice_popup.open_color_picker_dialog()
+        colorPickerDialog = self.app.main_view.get_color_picker_dialog()
+        colorPickerDialog.change_calendar_color("color6")
+
+        final_calendar_color = \
+            calendar_choice_popup.get_calendar_color()
+
+        self.assertThat(
+            original_calendar_color, NotEquals(final_calendar_color))
+
+    def test_unselect_calendar(self):
+        """ Test unselecting calendar
+
+          First adding an Event to then check it no longer appears after
+          deselecting the Personal calendar  """
+        test_event = data.Event.make_unique()
+        new_event_page = self.app.main_view.go_to_new_event()
+        new_event_page.add_event(test_event)
+
+        self.assertThat(lambda: self._event_exists(test_event.name),
+                        Eventually(Equals(True)))
+
+        calendar_choice_popup = \
+            self.app.main_view.go_to_calendar_choice_popup()
+        original_checbox_status = \
+            calendar_choice_popup.get_checkbox_status()
+        calendar_choice_popup.press_check_box_button()
+
+        self.assertThat(
+            original_checbox_status,
+            NotEquals(calendar_choice_popup.get_checkbox_status()))
+
+        self.app.main_view.press_header_custombackbutton()
+        self.app.main_view.go_to_day_view()
+
+        self.assertThat(lambda: self._event_exists(test_event.name),
+                        Eventually(Equals(False)))
+
+    def _event_exists(self, event_name):
+        try:
+            day_view = self.app.main_view.go_to_day_view()
+            day_view.get_event(event_name, True)
+        except Exception:
+            return False
+        return True