Merge lp:~mihirsoni/ubuntu-calendar-app/dateSelectNewEventTest into lp:ubuntu-calendar-app

[Mihir Soni]

Datepicker helper implementation AP

There was no way to select date while creating an event for Autopilot test.

Now this MP will enable AP to select date object.

[lp:~mihirsoni/ubuntu-calendar-app/dateSelectNewEventTest]

529. By Mihir Soni on 2014-10-23

removing next day from this MP

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

FAILED: Continuous integration, rev:529
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/975/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1234/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/533/console

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

review: Needs Fixing (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/dateSelectNewEventTest]

530. By Mihir Soni on 2014-10-23

pep8 errors

531. By Mihir Soni on 2014-10-23

pep8 fixes

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

FAILED: Continuous integration, rev:530
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/976/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1235/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/534/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:531
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/977/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1237
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/535

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

review: Needs Fixing (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/dateSelectNewEventTest]

532. By Mihir Soni on 2014-10-24

Added time picker

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

FAILED: Continuous integration, rev:532
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/978/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1243/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/536/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:532
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1023/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/117/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/20/console

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

There are some pep8 fails

[Mihir Soni (mihirsoni)]

keeping in WIP as will come back to this soon.

Unmerged revisions

532. By Mihir Soni on 2014-10-24

Added time picker

531. By Mihir Soni on 2014-10-23

pep8 fixes

530. By Mihir Soni on 2014-10-23

pep8 errors

529. By Mihir Soni on 2014-10-23

removing next day from this MP

528. By Mihir Soni on 2014-10-23

Date select while creating new event

527. By Mihir Soni on 2014-10-23

datePickerTest

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-10-22 02:42:42 +0000
+++ NewEvent.qml	2014-10-24 12:55:52 +0000
@@ -327,6 +327,7 @@
 
             NewEventTimePicker{
                 id: startDateTimeInput
+                objectName : "fromPicker"
                 header: i18n.tr("From")
                 showTimePicker: !allDayEventCheckbox.checked
                 anchors {
@@ -340,6 +341,7 @@
 
             NewEventTimePicker{
                 id: endDateTimeInput
+                objectName : "toPicker"
                 header: i18n.tr("To")
                 showTimePicker: !allDayEventCheckbox.checked
                 anchors {

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2014-10-22 21:27:04 +0000
+++ tests/autopilot/calendar_app/__init__.py	2014-10-24 12:55:52 +0000
@@ -23,7 +23,7 @@
 import ubuntuuitoolkit
 from autopilot import exceptions
 from dateutil import tz
-
+import datetime
 from calendar_app import data
 
 
@@ -570,6 +570,16 @@
         """
         # TODO fill start date and end date, is all day event, recurrence and
         # reminders. --elopio - 2014-06-26
+        # self._fill_from_date()
+        # self._fill_to_date()
+        if event_information.startDate is not None:
+            self._fill_date(event_information.startDate, 'fromPicker')
+        if event_information.startTime is not None:
+            self._fill_time(event_information.startTime, 'fromPicker')
+        if event_information.endDate is not None:
+            self._fill_date(event_information.endDate, 'toPicker')
+        if event_information.endTime is not None:
+            self._fill_time(event_information.endTime, 'toPicker')
         if event_information.calendar is not None:
             self._select_calendar(event_information.calendar)
         if event_information.name is not None:
@@ -581,6 +591,33 @@
         if event_information.guests is not None:
             self._fill_guests(event_information.guests)
 
+    def _fill_date(self, date, object_name):
+        picker = self.select_single(
+            "NewEventTimePicker",
+            objectName=object_name)
+        dateButton = picker.select_single(
+            NewEventEntryField,
+            objectName="dateInput")
+        self.pointing_device.click_object(dateButton)
+        main_view = self.get_root_instance().select_single(MainView)
+        picker = main_view.wait_select_single("DatePicker")
+        date_to_pick = datetime.date(date.year, date.month, date.day)
+        picker.pick_date(date_to_pick)
+        self.pointing_device.click_object(dateButton)
+    def _fill_time(self, date, object_name):
+        picker = self.select_single(
+            "NewEventTimePicker",
+            objectName=object_name)
+        timeButton = picker.select_single(
+            NewEventEntryField,
+            objectName="timeInput")
+        self.pointing_device.click_object(timeButton)
+        main_view = self.get_root_instance().select_single(MainView)
+        picker = main_view.wait_select_single("DatePicker")
+        time_to_pick = datetime.time(date.hour,date.minute)
+        picker.pick_time(time_to_pick)
+        self.pointing_device.click_object(timeButton)
+
     def _fill_name(self, value):
         self._ensure_entry_field_visible_and_write('newEventName', value)
 
@@ -589,7 +626,12 @@
         self._ensure_visible_and_write(name_text_field, value)
 
     def _get_new_event_entry_field(self, object_name):
-        return self.select_single(NewEventEntryField, objectName=object_name)
+        picker = self.select_single(
+            "NewEventTimePicker",
+            objectName=object_name)
+        return picker.select_single(
+            NewEventEntryField,
+            objectName="dateInput")
 
     def _get_text_box(self, object_name):
         return self.select_single(
@@ -641,7 +683,10 @@
         for guest in guests:
             guest_names.append(guest.text)
         return guest_names
-
+    def get_start_date(self):
+        return self._get_new_event_entry_field("fromPicker").text
+    def get_end_date(self):
+        return self._get_new_event_entry_field("toPicker").text
     def get_calendar_name(self):
         return self._get_calendar().get_current_label().text
 
@@ -657,12 +702,14 @@
     def _get_form_values(self):
         # TODO get start date and end date, is all day event, recurrence and
         # reminders. --elopio - 2014-06-26
+        startDate = self.get_start_date()
+        endDate = self.get_end_date()
         calendar = self.get_calendar_name()
         name = self.get_event_name()
         description = self.get_description_text()
         location = self.get_location_name()
         guests = self._get_guests()
-        return data.Event(calendar, name, description, location, guests)
+        return data.Event(startDate, endDate, calendar, name, description, location, guests)
 
     @autopilot.logging.log_action(logger.info)
     def _save(self):
@@ -712,12 +759,17 @@
 
     def get_event_information(self):
         """Return the information of the event."""
+        startDate = self.get_date()
+        endDate = self.get_date()
         calendar = self._get_calendar()
         name = self._get_name()
         description = self._get_description()
         location = self._get_location()
         guests = self._get_guests()
-        return data.Event(calendar, name, description, location, guests)
+        return data.Event(startDate, endDate, calendar, name, description, location, guests)
+
+    def get_date(self):
+        return self._get_label_text("dateLabel")
 
     def _get_calendar(self):
         return self._get_label_text('calendarName').split(" ")[0]

=== modified file 'tests/autopilot/calendar_app/data.py'
--- tests/autopilot/calendar_app/data.py	2014-07-30 21:45:13 +0000
+++ tests/autopilot/calendar_app/data.py	2014-10-24 12:55:52 +0000
@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import uuid
+import datetime
+from datetime import timedelta
 
 
 class DataMixin(object):
@@ -36,10 +38,24 @@
 
     """Event data object for user acceptance tests."""
 
-    def __init__(self, calendar, name, description, location, guests):
+    def __init__(
+            self,
+            startDate,
+            startTime,
+            endDate,
+            endTime,
+            calendar,
+            name,
+            description,
+            location,
+            guests):
         # TODO add start date and end date, is all day event, recurrence and
         # reminders. --elopio - 2014-06-26
         super(Event, self).__init__()
+        self.startDate = startDate
+        self.startTime = startTime
+        self.endDate = endDate
+        self.endTime = endTime
         self.calendar = calendar
         self.name = name
         self.description = description
@@ -51,9 +67,22 @@
         """Return a unique event."""
         if unique_id is None:
             unique_id = str(uuid.uuid1())
+        startDate = datetime.datetime.now()
+        startTime = datetime.datetime.now()
+        endDate = datetime.datetime.now()
+        endTime = datetime.datetime.now() + timedelta(hours=1)
         calendar = 'Personal'
         name = 'Test event {}'.format(unique_id)
         description = 'Test description {}.'.format(unique_id)
         location = 'Test location {}'.format(unique_id)
         guests = ['UX User']
-        return cls(calendar, name, description, location, guests)
+        return cls(
+            startDate,
+            startTime,
+            endDate,
+            endTime,
+            calendar,
+            name,
+            description,
+            location,
+            guests)

=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
--- tests/autopilot/calendar_app/tests/test_new_event.py	2014-09-04 23:08:13 +0000
+++ tests/autopilot/calendar_app/tests/test_new_event.py	2014-10-24 12:55:52 +0000
@@ -49,10 +49,6 @@
         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)))
-
         return test_event
 
     def _edit_event(self, event_name):