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

[Carla Sella]

Calendar app autopilot new event test

Calendar app autopilot new event test

[Nicholas Skaggs (nskaggs)]

Going to give this a whirl on a device -- if anyone can try it on a galaxy nexus or nexus 4, that would be great. I'll try on the nexus 10.

[Olivier Tilloy (osomon)]

101 +## @unittest.skip("Adding a new event is broken, needs fixing. "
102 +## "See http://pad.lv/1206048.")

Instead of commented out, the skip decorator should be removed altogether, as bug #1206048 is now fixed.

[Olivier Tilloy (osomon)]

30 + objectName: "OKButton"

That’s a very generic name, probably too generic. If in the future the app gets more popups, there will probably be several "OK buttons".

[Olivier Tilloy (osomon)]

84 +from time import sleep

This import is unused, can you please remove it?

[Olivier Tilloy (osomon)]

79 +import math

Same for this import, it seems it is unused.

[Olivier Tilloy (osomon)]

148 + self.pointing_device.drag(x_Hscroller+(width_Hscroller/4),
149 + (y_Hscroller+((height_Hscroller/4)*3)),
150 + x_Hscroller+(width_Hscroller/4),
151 + (y_Hscroller+((height_Hscroller/4)*2)))

You should ensure you always pass integers as parameters to .drag(…), so you need to surround each parameter with int(…).

review: Needs Fixing

[Olivier Tilloy (osomon)]

182 + #---> TODO input end time

So this MR is not complete yet, is it? If not complete, please set its status to "Work in progress", and set it back to "Needs review" once it is actually ready. Thanks!

[Carla Sella (carla-sella)]

The test is complete for now even if it can be improved, but for the moment we want to run it as it is.

[Carla Sella (carla-sella)]

review: Needs Resubmitting

[Nicholas Skaggs (nskaggs)]

A minor nitpick; I would add eventually to these lines:

self.assertThat(title_label, NotEquals(None))

and

self.assertThat(save_button, NotEquals(None))

[Carla Sella (carla-sella)]

If I add eventually to the two lines you suggested, I get this error: TypeError: Eventually is only usable with attributes that have a wait_for function or callable objects.

[Olivier Tilloy (osomon)]

172 + save_button = self.main_window.get_event_save_button()
173 + self.assertThat(lambda: save_button, Eventually(NotEquals(None)))

179 + title_label = self.main_window.get_title_label(eventTitle)
180 + self.assertThat(lambda: title_label, Eventually(NotEquals(None)))

This is not doing what you think it does: because 'save_button' and 'title_label' are assigned before defining the lambda function, they contain static values, so the lambda is useless. For it to be useful, you need to use it like that:

    lambda: self.main_window.get_event_save_button()
    lambda: self.main_window.get_title_label(eventTitle)

And since you’re comparing to None, instead of using Equals (or NotEquals), you should use the identity matcher, Is, like that:

    self.assertThat(…, Eventually(Not(Is(None))))

review: Needs Fixing

[Carla Sella (carla-sella)]

Thanks Olivier, I fixed the two asserts, hope they are ok now.

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

42 - def get_month_view(self):
43 - return self.app.select_single("MonthView")

Removing this breaks all the other existing tests. Please revert this change.

review: Needs Fixing

[Olivier Tilloy (osomon)]

92 - @unittest.skip("Adding a new event is broken, needs fixing. "
93 - "See http://pad.lv/1206048.")

Now that you removed this decorator, the "import unittest" line should be removed from tests/autopilot/calendar_app/tests/test_calendar.py.

review: Needs Fixing

[Olivier Tilloy (osomon)]

pyflakes reports 4 warnings, all of them easily fixable by just removing unused code:

tests/autopilot/calendar_app/tests/test_calendar.py:17: 'unittest' imported but unused
tests/autopilot/calendar_app/tests/test_calendar.py:47: local variable 'end_time_field' is assigned to but never used
tests/autopilot/calendar_app/tests/test_calendar.py:82: local variable 'minutesBeforeChange' is assigned to but never used
tests/autopilot/calendar_app/tests/test_calendar.py:120: local variable 'title_label' is assigned to but never used

[Carla Sella (carla-sella)]

Hope everything's fine now :p.
Thanks Olilvier.

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

> 42 - def get_month_view(self):
> 43 - return self.app.select_single("MonthView")
>
> Removing this breaks all the other existing tests. Please revert this change.

This one still needs to be fixed, all the other autopilot tests are currently failing because of this removal.

[Carla Sella (carla-sella)]

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

Looks good, thanks Carla!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/23/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/348/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/18/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/22/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/22/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/18/console

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Apparently the builder is now considering pep8 warnings as errors…
I’ll fix all the warnings in trunk in a separate branch and we’ll get it merged first, so that you have to address only those that are related to your changes in this branch.

[Olivier Tilloy (osomon)]

> Apparently the builder is now considering pep8 warnings as errors…
> I’ll fix all the warnings in trunk in a separate branch and we’ll get it
> merged first, so that you have to address only those that are related to your
> changes in this branch.

In fact it appears all the pep8 warnings were introduced by your changes, the trunk is "clean".
To get a list of all the warnings, simply install 'pep8' on your machine, and from within your branch, run `pep8 tests`.
This will print out a list of warnings, usually self-explanatory on how to fix them.

[Carla Sella (carla-sella)]

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

I’m still getting 20 pep8 warnings:

$ pep8 tests
tests/autopilot/calendar_app/tests/test_calendar.py:78:50: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:78:67: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:79:51: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:79:70: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:79:73: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:80:50: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:80:67: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:81:51: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:81:70: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:81:73: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:94:50: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:94:67: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:95:51: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:95:70: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:95:73: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:96:50: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:96:67: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:97:51: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:97:70: E225 missing whitespace around operator
tests/autopilot/calendar_app/tests/test_calendar.py:97:73: E225 missing whitespace around operator

If you add whitespaces around the "+" operator, this should fix it.

[Carla Sella (carla-sella)]

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

Yes, looks like all the warnings are fixed now! Thanks for your patience Carla :)

review: Approve

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

review: Approve (continuous-integration)

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

88. By Carla Sella on 2013-08-15

Calendar app autopilot new event test.

Approved by Ubuntu Phone Apps Jenkins Bot, Olivier Tilloy.

89. By Carla Sella on 2013-08-16

Added asserts for error on location field in new event test.

90. By Carla Sella on 2013-08-16

Added a couple of minor fixes.

91. By Carla Sella on 2013-08-19

Work in progress for fixing new event test.

92. By Carla Sella on 2013-08-19

Fixed code on animation fields, except the time picker.

Unmerged revisions

92. By Carla Sella on 2013-08-19

Fixed code on animation fields, except the time picker.

91. By Carla Sella on 2013-08-19

Work in progress for fixing new event test.

90. By Carla Sella on 2013-08-16

Added a couple of minor fixes.

89. By Carla Sella on 2013-08-16

Added asserts for error on location field in new event test.

=== modified file 'TimePicker.qml'
--- TimePicker.qml	2013-07-11 13:26:41 +0000
+++ TimePicker.qml	2013-08-15 12:37:20 +0000
@@ -40,18 +40,21 @@
             height: units.gu(24)
             Scroller {
                 id: hourScroller
+                objectName: "hourScroller"
                 anchors {
                     top: parent.top
                     bottom: parent.bottom
                 }
                 width: parent.width / 2
                 labelText: i18n.tr("Hour")
+
                 min: 00
                 max: 23
                 currentIndex: priv.now.getHours()
             }
             Scroller {
                 id: minuteScroller
+                objectName: "minuteScroller"
                 anchors {
                     top: parent.top
                     bottom: parent.bottom
@@ -75,6 +78,7 @@
                 width: (parent.width - parent.spacing) / 2
             }
             Button {
+                objectName: "TimePickerOKButton"
                 text: i18n.tr("OK")
                 color: "#dd4814"
 

=== modified file 'tests/autopilot/calendar_app/emulators/main_window.py'
--- tests/autopilot/calendar_app/emulators/main_window.py	2013-07-19 14:15:17 +0000
+++ tests/autopilot/calendar_app/emulators/main_window.py	2013-08-15 12:37:20 +0000
@@ -19,5 +19,35 @@
     def get_event_view(self):
         return self.app.select_single("EventView")
 
+    def get_new_event(self):
+        return self.app.select_single("NewEvent")
+
+    def get_new_event_name_input_box(self):
+        return self.app.select_single("TextField", objectName="newEventName")
+
+    def get_event_start_time_field(self):
+        return self.app.select_single("Button", objectName="startTimeInput")
+
+    def get_event_end_time_field(self):
+        return self.app.select_single("Button", objectName="endTimeInput")
+
+    def get_event_location_field(self):
+        return self.app.select_single(
+            "TextField", objectName="eventLocationInput")
+
+    def get_event_people_field(self):
+        return self.app.select_single(
+            "TextField", objectName="eventPeopleInput")
+
     def get_month_view(self):
         return self.app.select_single("MonthView")
+
+    def get_time_picker_ok_button(self):
+        return self.app.select_single(
+            "Button", objectName="TimePickerOKButton")
+
+    def get_event_save_button(self):
+        return self.app.select_single("Button", objectName="eventSaveButton")
+
+    def get_title_label(self, title):
+        return self.app.select_many("Label", text=title)

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2013-08-05 08:37:43 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2013-08-15 12:37:20 +0000
@@ -14,7 +14,6 @@
 from testtools.matchers import Equals, NotEquals
 
 import time
-import unittest
 
 from calendar_app.tests import CalendarTestCase
 
@@ -22,6 +21,8 @@
 class TestMainWindow(CalendarTestCase):
 
     def test_timeline_view_shows(self):
+        """test timeline view"""
+
         event_view = self.main_window.get_event_view()
 
         self.assertThat(
@@ -33,9 +34,9 @@
         self.assertThat(
             event_view.eventViewType, Eventually(Equals("DiaryView.qml")))
 
-    @unittest.skip("Adding a new event is broken, needs fixing. "
-                   "See http://pad.lv/1206048.")
     def test_new_event(self):
+        """test add new event """
+
         #click on new event button
         self.ubuntusdk.click_toolbar_button('New Event')
 
@@ -43,12 +44,13 @@
         #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
+        self.assertThat(
+            self.main_window.get_new_event().visible, Eventually(Equals(True)))
         eventTitle = "Test event" + str(time.time())
 
         self.pointing_device.click_object(event_name_field)
@@ -56,16 +58,56 @@
         self.assertThat(event_name_field.text, Eventually(Equals(eventTitle)))
 
         #input start time
+        self.assertThat(
+            lambda: self.main_window.get_event_start_time_field(),
+            Eventually(NotEquals(None)))
         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")))
+
+        #change hour
+        timePicker = self.app.select_single("TimePicker")
+        self.assertThat(timePicker.visible, Eventually(Equals(True)))
+
+        hourScroller = self.ubuntusdk.get_object("Scroller", "hourScroller")
+        self.assertThat(hourScroller.visible, Eventually(Equals(True)))
+
+        y_Hscroller = hourScroller.globalRect[1]
+        height_Hscroller = hourScroller.globalRect[3]
+        x_Hscroller = hourScroller.globalRect[0]
+        width_Hscroller = hourScroller.globalRect[2]
+
+        self.pointing_device.drag(
+            int(x_Hscroller + (width_Hscroller / 4)),
+            int((y_Hscroller + ((height_Hscroller / 4) * 3))),
+            int(x_Hscroller + (width_Hscroller / 4)),
+            int((y_Hscroller + ((height_Hscroller / 4) * 2))))
+
+        #change minutes
+        minuteScroller = self.ubuntusdk.get_object(
+            "Scroller", "minuteScroller")
+        self.assertThat(
+            minuteScroller.visible, Eventually(Equals(True)))
+
+        y_Mscroller = minuteScroller.globalRect[1]
+        height_Mscroller = minuteScroller.globalRect[3]
+        x_Mscroller = minuteScroller.globalRect[0]
+        width_Mscroller = minuteScroller.globalRect[2]
+
+        self.pointing_device.drag(
+            int(x_Mscroller + (width_Mscroller / 4)),
+            int((y_Mscroller + ((height_Mscroller / 4) * 3))),
+            int(x_Mscroller + (width_Mscroller / 4)),
+            int((y_Mscroller + ((height_Mscroller / 4) * 2))))
+
+        #click ok button
+        timepicker_ok_button = self.main_window.get_time_picker_ok_button()
+        self.assertThat(
+            lambda: self.main_window.get_time_picker_ok_button(),
+            Eventually(NotEquals(None)))
+        self.pointing_device.click_object(timepicker_ok_button)
+
+        self.assertThat(
+            lambda: self.main_window.get_new_event().visible,
+            Eventually(Equals(True)))
 
         #input location
         self.pointing_device.click_object(location_field)
@@ -77,9 +119,14 @@
         self.keyboard.type("Me")
         self.assertThat(people_field.text, Eventually(Equals("Me")))
 
-        #click save button
+       #click save button
+        save_button = self.main_window.get_event_save_button()
+        self.assertThat(
+            lambda: self.main_window.get_event_save_button(),
+            Eventually(NotEquals(None)))
         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)))
+        self.assertThat(
+            lambda: self.main_window.get_title_label(eventTitle),
+            Eventually(NotEquals(None)))