Merge lp:~chris.gagnon/ubuntu-ui-toolkit/ap_testcases_for_picker_with_setup into lp:~iahmad/ubuntu-ui-toolkit/ap_testcases_for_picker

[Chris Gagnon]

[I Ahmad (iahmad)]

Thanks...:)

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py	2013-10-21 18:14:05 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_picker.py	2013-10-21 18:48:21 +0000
@@ -32,11 +32,13 @@
 class PickerTests(GalleryTestCase):
     """Generic tests for the Gallery"""
 
+    def setUp(self):
+        super(PickerTests, self).setUp()
+        item = "Pickers"
+        self.loadItem(item)
+        self.checkPageHeader(item)
+
     def test_picker_dialer(self):
-        item = "Pickers"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
         dialer_clock = self.getObject('dialer_clock')
         #Flick upward to reveal the hidden ui element.
         flickable = self.main_view.select_single('QQuickFlickable')
@@ -45,10 +47,6 @@
         self.assertThat(flickable.flicking, Eventually(Equals(False)))
 
     def test_picker_dialerhand(self):
-        item = "Pickers"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
         dialer_overlay = self.getObject('dialer_overlay')
         #Flick upward to reveal the hidden ui element.
         flickable = self.main_view.select_single('QQuickFlickable')
@@ -57,9 +55,6 @@
         self.assertThat(flickable.flicking, Eventually(Equals(False)))
 
     def test_picker_linear_picker(self):
-        item = "Pickers"
-        self.loadItem(item)
-        self.checkPageHeader(item)
         linear = self.getObject('picker_linear')
         self.assertThat(linear.circular, Equals(False))
         listview = linear.select_single('QQuickListView')
@@ -80,9 +75,6 @@
             pass
 
     def test_picker_circular_picker(self):
-        item = "Pickers"
-        self.loadItem(item)
-        self.checkPageHeader(item)
         circular = self.getObject('picker_circular')
         self.assertThat(circular.circular, Equals(True))
         selectedIndex = circular.selectedIndex
@@ -129,10 +121,6 @@
                                 Eventually(Equals(i % count)))
 
     def test_picker_infinite_picker(self):
-        item = "Pickers"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
         infinite = self.getObject('picker_infinite')
         self.assertThat(infinite.circular, Equals(False))