Merge lp:~nskaggs/ubuntu-rssreader-app/fix-my-horrible-prints into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Add support for testing via click packages

Add support for testing via click packages
fix my horrible print statements

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

FAILED: Continuous integration, rev:74
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/56/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/518
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/56

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-rssreader-app/fix-my-horrible-prints]

75. By Nicholas Skaggs on 2013-09-27

fix logger issues

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

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/57/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/527
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/57

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-26 08:44:17 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-27 16:22:38 +0000
@@ -44,6 +44,8 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../rssreader-app.qml"
+    installed_location = "/usr/share/rssreader-app/rssreader-app.qml"
+
     sqlite_dir = os.path.expanduser(
         "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
     backup_dir = sqlite_dir + ".backup"
@@ -62,8 +64,10 @@
 
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        else:
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
+        else:
+            self.launch_test_click()
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -75,11 +79,13 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/rssreader-app/rssreader-app.qml",
+            self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "rssreader-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+    def launch_test_click(self):
+        self.app = self.launch_click_package("com.ubuntu.rssreader-app", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):
         if os.path.exists(self.backup_dir):
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-09-11 18:43:33 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-09-27 16:22:38 +0000
@@ -17,11 +17,15 @@
 
 from autopilot.introspection.dbus import StateNotFoundError
 from ubuntu_rssreader_app.tests import RssReaderAppTestCase
+import logging
 
 from time import sleep
 
 class TestMainWindow(RssReaderAppTestCase):
 
+    global logger
+    logger = logging.getLogger(__name__)
+
     def setUp(self):
         super(TestMainWindow, self).setUp()
 
@@ -33,142 +37,142 @@
 
     def _add_feed_and_topic(self, feed, topicName):
         """test add feed and topic"""
-        print "starting test add feed and topic"
+        logger.debug("starting test add feed and topic")
         #open toolbar
-        print "opening toolbar"
+        logger.debug("opening toolbar")
         toolbar = self.main_view.open_toolbar()
 
         #click on add reads toolbar button
-        print "clicking addreadsbutton"
+        logger.debug("clicking addreadsbutton")
         toolbar.click_button("addreadsbutton")
 
         #click on add feeds popover action
-        print "clicking + Add feeds"
+        logger.debug("clicking + Add feeds")
         addReadsPopover = self.main_view.get_action_popover()
         self.main_view.run_action(addReadsPopover, "+ Add feeds")
 
         #verify Append Feed  page is open
-        print "asserting append page"
+        logger.debug("asserting append page")
         appendpage = lambda: self.main_view.get_append_page().visible
         self.assertThat(appendpage, Eventually(Equals(True)))
 
         #type feed in input field
-        print "inputting feed"
+        logger.debug("inputting feed")
         self._input_new_feed(feed)
 
         #click on checkbox to confirm feed
-        print "asserting checkbox"
+        logger.debug("asserting checkbox")
         self.assertThat(self.main_view.get_append_page_feed, Eventually(Not(Is(None))))
-        print "grabbing checkbox"
+        logger.debug("grabbing checkbox")
         checkboxBtn = self.main_view.get_append_page_feed()
-        print "clicking checkbox"
+        logger.debug("clicking checkbox")
         self.pointing_device.click_object(checkboxBtn)
-        print "asserting checkbox checked"
+        logger.debug("asserting checkbox checked")
         self.assertThat(checkboxBtn.checked, Eventually(Equals(True)))
 
         #click on Next button
-        print "asserting next"
+        logger.debug("asserting next")
         self.assertThat(self.main_view.get_next_button, Eventually(Not(Is(None))))
-        print "grabbing next"
+        logger.debug("grabbing next")
         nextButton = self.main_view.get_next_button()
-        print "clicking next"
+        logger.debug("clicking next")
         self.pointing_device.click_object(nextButton)
 
         #verify choose topic page has opened
-        print "asserting choose topic page"
+        logger.debug("asserting choose topic page")
         chossetopicpage = lambda: self.main_view.get_topics_page().visible
         self.assertThat(chossetopicpage, Eventually(Equals(True)))
 
         #get current topics
-        print "grabbing topics"
+        logger.debug("grabbing topics")
         topics = self.main_view.get_choose_topics_items()
         numTopics = len(topics)
-        print "found " + str(numTopics) + " topics"
+        logger.debug("found " + str(numTopics) + " topics")
         for topic in topics:
-            print "Topic: " + str(topic.text)
+            logger.debug("Topic: " + str(topic.text))
 
         #add a new topic
-        print "input topic"
+        logger.debug("input topic")
         self._input_new_topic(topicName)
 
         #A new topic is now automatically selected as the topic
         #select new topic
-        #print "assert new topic"
+        #logger.debug("assert new topic")
         #newNumTopics = len(self.main_view.get_choose_topics_items)
         #self.assertThat(newNumTopics, Eventually(Equals(numTopics + 1)))
-        #print "grab new topic"
+        #logger.debug("grab new topic")
         #topics = self.main_view.get_choose_topics_items()
         #numTopics = len(topics)
-        #print "found " + str(numTopics) + " topics"
+        #logger.debug("found " + str(numTopics) + " topics")
         #for topic in topics:
-        #    print "Topic: " + str(topic.text)
+        #    logger.debug("Topic: ") + str(topic.text)
         #newTopic = self.main_view.get_choose_topics_items()[-1]
         #newTopic = topics[-1]
-        #print "click new topic, " + str(newTopic.text)
+        #logger.debug("click new topic, ") + str(newTopic.text)
         #self.pointing_device.click_object(newTopic)
-        #print "topic clicked"
+        #logger.debug("topic clicked")
 
         #wait for any updates to finish before beginning tests
         #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
-        #print "check for network updates"
+        #logger.debug("check for network updates")
         #self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
-        #print "assert no network updates"
+        #logger.debug("assert no network updates")
         #self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
-        #print "assert we're back on main view"
+        #logger.debug("assert we're back on main view")
         #self.assertThat(self.main_view.visible, Eventually(Equals(True)))
-        #print "finished with add_feed_topic"
+        #logger.debug("finished with add_feed_topic")
 
     def _remove_feed(self, feedName, topicName):
-        print "removing feed"
+        logger.debug("removing feed")
         #open toolbar
-        print "opening toolbar"
+        logger.debug("opening toolbar")
         toolbar = self.main_view.open_toolbar()
 
         #click on back toolbar Button
-        print "clicking edit topics"
+        logger.debug("clicking edit topics")
         toolbar.click_button("edittopicsbutton")
 
         #verify we are on the Management page
-        print "assert feedlist page"
+        logger.debug("assert feedlist page")
         feedlistpage = lambda: self.main_view.get_feed_management_page().visible
         self.assertThat(feedlistpage, Eventually(Equals(True)))
 
         #select topic
-        print "grabbing topic"
+        logger.debug("grabbing topic")
         self._get_topic(topicName)
 
         #select feed
-        print "assert feed"
+        logger.debug("assert feed")
         self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName), Eventually(Not(Is(None))))
-        print "grabbing feed"
+        logger.debug("grabbing feed")
         feed = self.main_view.get_feedlist_feed(feedName)
-        print "clicking feed"
+        logger.debug("clicking feed")
         self.pointing_device.click_object(feed)
 
         #verify we are on the Edit Feed page
-        print "assert editfeedpage"
+        logger.debug("assert editfeedpage")
         editFeedPage = self.main_view.get_edit_feed_page()
         self.assertThat(editFeedPage.visible, Eventually(Equals(True)))
 
         #press delete button
-        print "assert delete button"
+        logger.debug("assert delete button")
         self.assertThat(self.main_view.get_delete_button, Eventually(Not(Is(None))))
-        print "grab delete button"
+        logger.debug("grab delete button")
         deleteButton = self.main_view.get_delete_button()
-        print "click delete button"
+        logger.debug("click delete button")
         self.pointing_device.click_object(deleteButton)
 
         #verify we are on the Management page
-        print "assert feedlistpage"
+        logger.debug("assert feedlistpage")
         feedlistpage = lambda: self.main_view.get_feed_management_page().visible
         self.assertThat(feedlistpage, Eventually(Equals(True)))
 
         #check topic
-        print "assert topic remains"
+        logger.debug("assert topic remains")
         self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName), Eventually(Not(Is(None))))
 
         #check feed has been removed
-        print "assert removed feed"
+        logger.debug("assert removed feed")
         self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName), Eventually(Equals(None)))
 
     def _remove_topic(self, topicName):
@@ -231,15 +235,15 @@
         return inputField
 
     def _get_topic(self, topicName, timeout = 10):
-        print "_get_topic: assert topics"
+        logger.debug("_get_topic: assert topics")
         self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName), Eventually(Not(Is(None))))
-        print "_get_topic: grab topic"
+        logger.debug("_get_topic: grab topic")
         topic = self.main_view.get_feedlist_topic(topicName)
-        print "_get_topic: click topic"
+        logger.debug("_get_topic: click topic")
 
         poll = 0
         while topic.isExpended == False and poll < timeout:
-            print "_get_topic: loop click topic"
+            logger.debug("_get_topic: loop click topic")
             self.pointing_device.click_object(topic)
             sleep(1)
             poll += 1
@@ -257,7 +261,7 @@
         self._add_feed_and_topic(feed, topicName)
 
         #remove added feed
-        print "starting remove feed"
+        logger.debug("starting remove feed")
         #12 sept 2013,
         #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
         #self._remove_feed(feedName, topicName)