Merge lp:~om26er/ubuntu-calendar-app/robust_test into lp:~pkunal-parmar/ubuntu-calendar-app/newtabs_dayview

[Omer Akram]

fixes the failing test for the calendar app

fastens the tests, does not fix it. I have tried hard but cannot fix it the test. The calendar app needs to expose the properties of the newly created event so that we could test.

[Kunal Parmar (pkunal-parmar)]

looks good,

Can you check, what's wrong with following

Here, timeline_base.eventCount is always returning 0, where in QML is gets updates after sometime.
Is there way to overcome this ?

    def event_count_for_dayview(self):
        #retuns event count for dayview
        day_view = self.main_view.get_day_view()
        self.assertThat(lambda: day_view, Eventually(Not(Is(None))))

        path_base = day_view.select_single("PathViewBase",
                                           objectName="DayViewPathBase")
        current_index = path_base.currentIndex
        com_name = "DayComponent-" + str(current_index)
        #print("Comp Name:" , com_name)
        day_component = path_base.select_single("DayComponent",
                                                objectName=com_name)
        self.assertThat(lambda: day_component, Eventually(Not(Is(None))))

        timeline_base = day_component.select_single("TimeLineBase",
                                                    objectName="timeLineBase")
        self.assertThat(lambda: timeline_base, Eventually(Not(Is(None))))

        print("Event count:", timeline_base.eventCount)
        return (timeline_base.eventCount)

review: Approve

[Omer Akram (om26er)]

fixed the test now, It seems I just needed a fresh day to start with :) You need to manually merge this branch into your branch.

[lp:~om26er/ubuntu-calendar-app/robust_test]

99. By Omer Akram on 2013-08-24

fix the failing test

[Kunal Parmar (pkunal-parmar)]

ok, thanks, I was waiting that it will merge by itself.

[Kunal Parmar (pkunal-parmar)]

Anyway, Just for information.

Can you tell me how to resolve above problem with getting eventCount ?

print("Event count:", timeline_base.eventCount)

[Omer Akram (om26er)]

Can you show the complete source code where you have created event_count_for_dayview() since I believe you must have added other changes to the app as well for this method to work, like objectNames for a few things.

[Kunal Parmar (pkunal-parmar)]

I removed the source code which I was refering, as you fix the original problem. I will create another branch to reproduce this.

=== modified file 'DayView.qml'
--- DayView.qml	2013-08-24 03:41:04 +0000
+++ DayView.qml	2013-08-24 12:04:26 +0000
@@ -85,6 +85,7 @@
 
         delegate: DayComponent {
             id: timeLineView
+            objectName: "day"
 
             objectName: "DayComponent-"+index
 

=== modified file 'tests/autopilot/calendar_app/emulators/main_view.py'
--- tests/autopilot/calendar_app/emulators/main_view.py	2013-08-24 03:41:04 +0000
+++ tests/autopilot/calendar_app/emulators/main_view.py	2013-08-24 12:04:26 +0000
@@ -26,7 +26,7 @@
         return self.select_single("DayView")
 
     def get_title_label(self, title):
-        return self.select_single("Label", text=title)
+        return self.select_many("Label", text=title)[0]
 
     def get_new_event(self):
         return self.select_single("NewEvent")

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2013-08-24 03:41:04 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2013-08-24 12:04:26 +0000
@@ -14,6 +14,7 @@
 from testtools.matchers import Equals, Not, Is
 
 import time
+import datetime
 
 from calendar_app.tests import CalendarTestCase
 
@@ -62,6 +63,9 @@
 
     def test_new_event(self):
         """test add new event """
+        now = datetime.datetime.now()
+        hour = now.hour
+        minute = now.minute
 
         count_before_insert = self.event_count_for_dayview()
 
@@ -84,7 +88,7 @@
         self.assertThat(self.main_view.get_time_picker,
                         Eventually(Not(Is(None))))
         picker = self.main_view.get_time_picker()
-        self.scroll_time_picker_to_time(picker, 10, 15)
+        self.scroll_time_picker_to_time(picker, hour, minute+2)
         ok = picker.select_single("Button", objectName="TimePickerOKButton")
         self.pointing_device.click_object(ok)
         self.assertThat(self.main_view.get_time_picker, Eventually(Is(None)))
@@ -95,7 +99,7 @@
         self.assertThat(self.main_view.get_time_picker,
                         Eventually(Not(Is(None))))
         picker = self.main_view.get_time_picker()
-        self.scroll_time_picker_to_time(picker, 11, 45)
+        self.scroll_time_picker_to_time(picker, hour+1, minute+2)
         ok = picker.select_single("Button", objectName="TimePickerOKButton")
         self.pointing_device.click_object(ok)
         self.assertThat(self.main_view.get_time_picker, Eventually(Is(None)))