Merge pull request #12887 from AndreiH/bug926920

Bug 926920 - Merge the two tests in test_clock_switch_clock_type.py

tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_switch_clock_type.py

@@ -14,32 +14,20 @@ def setUp(self):
         self.clock = Clock(self.marionette)
         self.clock.launch()
 
-    def test_clock_switch_clock_type(self):
-        """ Switch the clock type
+    def test_clock_switch_clock_type_and_show_time_date(self):
+        """ Switch the clock type and show time and date
         https://moztrap.mozilla.org/manage/case/1770
-        """
-
-        # switch to digital clock
-        self.clock.tap_analog_display()
-        self.assertTrue(self.clock.is_digital_clock_displayed, "The digital clock should be displayed.")
-
-        # switch to analog clock
-        self.clock.tap_digital_display()
-        self.assertTrue(self.clock.is_analog_clock_displayed, "The analog clock should be displayed.")
-
-    def test_clock_show_time_date(self):
-        """ Show the time, date
         https://moztrap.mozilla.org/manage/case/1771
         """
 
-        # check the date, time, state for digital clock
+        # switch to digital clock and check the date, time, state for digital clock
         self.clock.tap_analog_display()
+        self.assertTrue(self.clock.is_digital_clock_displayed, "The digital clock should be displayed.")
         self.assertTrue(self.clock.is_day_and_date_displayed, "The date of digital clock should be displayed.")
-        self.assertTrue(self.clock.is_digital_clock_displayed, "The time of digital clock should be displayed.")
         self.assertTrue(self.clock.is_24_hour_state_displayed, "The hour24-state of digital clock should be displayed.")
 
-        # check the date, time for analog clock
+        # switch to analog clock and check the date, time for analog clock
         self.clock.tap_digital_display()
+        self.assertTrue(self.clock.is_analog_clock_displayed, "The analog clock should be displayed.")
         self.assertTrue(self.clock.is_day_and_date_displayed, "The date of digital clock should be displayed.")
-        self.assertTrue(self.clock.is_analog_clock_displayed, "The time of digital clock should be displayed.")
         self.assertFalse(self.clock.is_24_hour_state_displayed, "The hour24-state of digital clock should be displayed.")