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

[Carla Sella]

Autopilot test for calendar-app with conflicts resolved.

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

53. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-19

Launchpad automatic translations update.

[Olivier Tilloy (osomon)]

205 - "/usr/share/calendar-app/calendar.qml",
206 + "/usr/share/ubuntu-calendar-app/calendar.qml",

please revert this change

review: Needs Fixing

[Olivier Tilloy (osomon)]

270 + #check that "create event" window opens
271 + #create_event_page = self.main_window.get_create_event_page()
272 + #self.assertThat(lambda: self.main_window.get_create_event_page(), Eventually(Equals("True")))

Why is this commented out? Is it not working?

[Olivier Tilloy (osomon)]

266 + def test_new_event(self):

This method looks good overall, however it’s not really testing that the event has been effectively created, it might be interesting to test that the event appears in the timeline after it’s been created.

[Nicholas Skaggs (nskaggs)]

> 270 + #check that "create event" window opens
> 271 + #create_event_page = self.main_window.get_create_event_page()
> 272 + #self.assertThat(lambda: self.main_window.get_create_event_page(),
> Eventually(Equals("True")))
>
> Why is this commented out? Is it not working?

Yes, it's an un-needed assert, but it doesn't work. I would remove it completely.

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

54. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-20

Launchpad automatic translations update.

55. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-21

Launchpad automatic translations update.

[Carla Sella (carla-sella)]

I fixed what you asked.
Resubmitting for merge.

review: Needs Resubmitting (for merging)

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

56. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-22

Launchpad automatic translations update.

57. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-23

Launchpad automatic translations update.

58. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-24

Launchpad automatic translations update.

59. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-25

Launchpad automatic translations update.

60. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-06-27

Launchpad automatic translations update.

61. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-07-04

Launchpad automatic translations update.

62. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-07-06

Launchpad automatic translations update.

63. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2013-07-08

Launchpad automatic translations update.

64. By Kunal Parmar on 2013-07-10

YearView implemented
Reusable MonthView component created ( needs to use it with yearview and monthview)
Reusable PathViewBase created ( needs to use it with timeline view, weekview ).

Approved by Michael Hall, Ubuntu Phone Apps Jenkins Bot.

65. By Carla Sella on 2013-07-10

add event autopilot test.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall, Nicholas Skaggs.

=== modified file 'tests/autopilot/calendar_app/emulators/main_window.py'
--- tests/autopilot/calendar_app/emulators/main_window.py	2013-05-29 16:38:15 +0000
+++ tests/autopilot/calendar_app/emulators/main_window.py	2013-06-21 18:12:26 +0000
@@ -16,25 +16,6 @@
     def __init__(self, app):
         self.app = app
 
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_panel(self):
-        return self.app.select_single("Toolbar")
-
-    def get_toolbar_button(self, button_idx):
-        toolbar = self.app.select_single("Toolbar")
-        row = toolbar.select_single("QQuickRow")
-        buttons = row.select_many("Button")
-        return buttons[button_idx]
-
-    def get_toolbar_new_event_button(self):
-        return self.get_toolbar_button(1)
-
-    def get_toolbar_timeline_button(self):
-        return self.get_toolbar_button(2)
-
     def get_create_event_page(self):
         return self.app.select_single("NewEvent")
 
@@ -60,3 +41,6 @@
 
     def get_event_view(self):
         return self.app.select_single("EventView")
+
+    def get_title_label(self, title):
+        return self.app.select_many("Label", text=title)
 
=== added file 'tests/autopilot/calendar_app/emulators/ubuntusdk.py'
--- tests/autopilot/calendar_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/calendar_app/emulators/ubuntusdk.py	2013-06-21 18:12:26 +0000
@@ -0,0 +1,154 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 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/>.
+#
+# Authored by: Nicholas Skaggs <[e-mail]>
+
+from testtools.matchers import Equals, NotEquals, Not, Is
+from autopilot.matchers import Eventually
+
+class ubuntusdk(object):
+    """An emulator class that makes it easy to interact with the ubuntu sdk applications."""
+
+    def __init__(self, autopilot, app):
+        self.app = app
+        self.autopilot = autopilot
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+        return self.app.select_single("QQuickView")
+
+    def get_object(self, typeName, name):
+        """Get a specific object"""
+        return self.app.select_single(typeName, objectName=name)
+
+    def get_objects(self, typeName, name):
+        """Get more than one object"""
+        return self.app.select_many(typeName, objectName=name)
+
+    def switch_to_tab(self, tab):
+        """Switch to the specified tab number"""
+        tabs = self.get_tabs()
+        currentTab = tabs.selectedTabIndex
+
+        #perform operations until tab == currentTab
+        while tab != currentTab:
+            if tab > currentTab:
+                self._previous_tab()
+            if tab < currentTab:
+                self._next_tab()
+            currentTab = tabs.selectedTabIndex
+
+    def toggle_toolbar(self):
+        """Toggle the toolbar between revealed and hidden"""
+        #check and see if the toolbar is open or not
+        if self.get_toolbar().opened:
+            self.hide_toolbar()
+        else:
+            self.open_toolbar()
+
+    def get_toolbar(self):
+        """Returns the toolbar in the main events view."""
+        return self.app.select_single("Toolbar")
+
+    def get_toolbar_button(self, buttonLabel):
+        """Returns the toolbar button at position index"""
+        toolbar = self.get_toolbar()
+        if not toolbar.opened:
+            self.open_toolbar()
+        row = toolbar.select_single("QQuickRow")
+        loaderList = row.select_many("QQuickLoader")
+        for loader in loaderList:
+            buttonList = loader.select_many("Button")
+            for button in buttonList:
+                if button.text == buttonLabel:
+                    return button
+
+    def click_toolbar_button(self, buttonLabel):
+        """Clicks the toolbar button with buttonLabel"""
+        #The toolbar button is assumed to be the following format
+        #ToolbarActions {
+        #           Action {
+        #               objectName: "name"
+        #                text: value
+        button = self.get_toolbar_button(buttonLabel)
+        self.autopilot.pointing_device.click_object(button)
+
+    def open_toolbar(self):
+        """Open the toolbar"""
+        qmlView = self.get_qml_view()
+
+        lineX = qmlView.x + qmlView.width * 0.50
+        startY = qmlView.y + qmlView.height - 1
+        stopY = qmlView.y + qmlView.height * 0.95
+
+        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
+
+    def hide_toolbar(self):
+        """Hide the toolbar"""
+        qmlView = self.get_qml_view()
+
+        lineX = qmlView.x + qmlView.width * 0.50
+        startY = qmlView.y + qmlView.height * 0.95
+        stopY = qmlView.y + qmlView.height - 1
+
+        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
+
+    def set_popup_value(self, popover, button, value):
+        """Changes the given popover selector to the request value
+        At the moment this only works for values that are currently visible. To
+        access the remaining items, a help method to drag and recheck is needed."""
+        #The popover is assumed to be the following format
+        #    Popover {
+        #        Column {
+        #            ListView {
+        #                delegate: Standard {
+        #                    objectName: "name"
+        #                    text: value
+
+        self.autopilot.pointing_device.click_object(button)
+        #we'll get all matching objects, incase the popover is reused between buttons
+        itemList = lambda: self.get_objects("Standard", popover)
+
+        for item in itemList():
+            if item.get_properties()['text'] == value:
+                self.autopilot.pointing_device.click_object(item)
+
+    def get_tabs(self):
+        """Return all tabs"""
+        return self.get_object("Tabs", "rootTabs")
+
+    def _previous_tab(self):
+        """Switch to the previous tab"""
+        qmlView = self.get_qml_view()
+
+        startX = qmlView.x + qmlView.width * 0.35
+        stopX = qmlView.x + qmlView.width * 0.50
+        lineY = qmlView.y + qmlView.height * 0.05
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
+
+    def _next_tab(self):
+        """Switch to the next tab"""
+        qmlView = self.get_qml_view()
+
+        startX = qmlView.x + qmlView.width * 0.50
+        stopX = qmlView.x + qmlView.width * 0.35
+        lineY = qmlView.y + qmlView.height * 0.05
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.click()
 
=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2013-06-12 15:47:15 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2013-06-21 18:12:26 +0000
@@ -16,6 +16,7 @@
 from testtools.matchers import Equals
 
 from calendar_app.emulators.main_window import MainWindow
+from calendar_app.emulators.ubuntusdk import ubuntusdk
 
 
 class CalendarTestCase(AutopilotTestCase):
@@ -52,16 +53,10 @@
             "--desktop_file_hint=/usr/share/applications/calendar-app.desktop",
             app_type='qt')
 
-    def reveal_toolbar(self):
-        toolbar = self.main_window.get_panel()
-
-        x, y, w, h = toolbar.globalRect
-        tx = x + (w / 2)
-        ty = y + (h - 2)
-
-        self.pointing_device.drag(tx, ty, tx, ty - h)
-        self.assertThat(toolbar.state, Eventually(Equals("spread")))
-
     @property
     def main_window(self):
         return MainWindow(self.app)
+
+    @property
+    def ubuntusdk(self):
+        return ubuntusdk(self, self.app)
 
=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2013-06-12 15:47:15 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2013-06-21 18:12:26 +0000
@@ -10,28 +10,78 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 
 from calendar_app.tests import CalendarTestCase
 
+import time
 
 class TestMainWindow(CalendarTestCase):
 
     def setUp(self):
         super(TestMainWindow, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.ubuntusdk.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestMainWindow, self).tearDown()
 
     def test_timeline_view_shows(self):
-        timeline_button = self.main_window.get_toolbar_timeline_button()
-        event_view = self.main_window.get_event_view()
-        self.reveal_toolbar()
-
-        self.assertThat(event_view.eventViewType, Eventually(Equals("DiaryView.qml")))
-        self.pointing_device.click_object(timeline_button)
-        self.assertThat(event_view.eventViewType, Eventually(Equals("TimeLineView.qml")))
-        self.pointing_device.click_object(timeline_button)
-        self.assertThat(event_view.eventViewType, Eventually(Equals("DiaryView.qml")))
+        event_view = lambda: self.main_window.get_event_view().eventViewType
+
+        self.ubuntusdk.click_toolbar_button('Timeline')
+        self.assertThat(event_view, Eventually(Equals("TimeLineView.qml")))
+        self.ubuntusdk.click_toolbar_button('Diary')
+        self.assertThat(event_view, Eventually(Equals("DiaryView.qml")))
+        self.ubuntusdk.click_toolbar_button('Timeline')
+        self.assertThat(event_view, Eventually(Equals("TimeLineView.qml")))
+
+    def test_new_event(self):
+        #click on new event button
+        self.ubuntusdk.click_toolbar_button('New Event')
+
+        #grab all the fields
+        #event_view = self.main_window.get_event_view()
+        event_name_field = self.main_window.get_new_event_name_input_box()
+        start_time_field = self.main_window.get_event_start_time_field()
+        end_time_field = self.main_window.get_event_end_time_field()
+        location_field = self.main_window.get_event_location_field()
+        people_field = self.main_window.get_event_people_field()
+        save_button = self.main_window.get_event_save_button()
+
+        #input a new event name
+        eventTitle = "Test event" + str(time.time())
+
+        self.pointing_device.click_object(event_name_field)
+        self.keyboard.type(eventTitle)
+        self.assertThat(event_name_field.text, Eventually(Equals(eventTitle)))
+
+        #input start time
+        self.pointing_device.click_object(start_time_field)
+        self.keyboard.press_and_release("Ctrl+a")
+        self.keyboard.type("11")
+        self.assertThat(start_time_field.text, Eventually(Equals("11")))
+
+        #input end time
+        self.pointing_device.click_object(end_time_field)
+        self.keyboard.press_and_release("Ctrl+a")
+        self.keyboard.type("00")
+        self.assertThat(end_time_field.text, Eventually(Equals("00")))
+
+        #input location
+        self.pointing_device.click_object(location_field)
+        self.keyboard.type("My location")
+        self.assertThat(location_field.text, Eventually(Equals("My location")))
+
+        #input people
+        self.pointing_device.click_object(people_field)
+        self.keyboard.type("Me")
+        self.assertThat(people_field.text, Eventually(Equals("Me")))
+
+        #click save button
+        self.pointing_device.click_object(save_button)
+
+        #verify that the event has been created in timeline
+        title_label = lambda: self.main_window.get_title_label(eventTitle)
+        self.assertThat(title_label, Eventually(NotEquals(None)))
+