Merge pull request #14210 from AlinT/bug_943337_v1.2

Bug 943337 - Merge all 2 kill cards view tests into one.
mozilla-b2g · Dec 5, 2013 · e226f3d · e226f3d
2 parents 1e33fd8 + e5e30e8
commit e226f3d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 57 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/manifest.ini b/tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/manifest.ini
@@ -4,9 +4,7 @@ b2g = true
 
 [test_cards_view_launch_app.py]
 
-[test_cards_view_kill_app.py]
-
-[test_cards_view_kill_app_with_three_apps.py]
+[test_cards_view_kill_apps_with_two_apps.py]
 
 [test_cards_view_with_three_apps.py]
 # Bug 915138 - Cards view can have a maximum of 3 cards

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/test_cards_view_kill_app.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/cards_view/test_cards_view_kill_app.py
diff --git a/...st_cards_view_kill_app_with_three_apps.py → ...est_cards_view_kill_apps_with_two_apps.py b/...st_cards_view_kill_app_with_three_apps.py → ...est_cards_view_kill_apps_with_two_apps.py
@@ -6,9 +6,9 @@
 from gaiatest.apps.system.regions.cards_view import CardsView
 
 
-class TestCardsViewThreeApps(GaiaTestCase):
+class TestCardsViewTwoApps(GaiaTestCase):
 
-    _test_apps = ["Clock", "Gallery", "Calendar"]
+    _test_apps = ["Clock", "Gallery"]
 
     def setUp(self):
         GaiaTestCase.setUp(self)
@@ -27,21 +27,18 @@ def test_kill_app_from_cards_view(self):
         # Pull up the cards view
         self.cards_view.open_cards_view()
 
-        # Close the current app from the cards view
-        self.cards_view.close_app(self._test_apps[2])
+        # Close the current apps from the cards view
+        self.cards_view.close_app(self._test_apps[1])
+        self.cards_view.close_app(self._test_apps[0])
 
         self.marionette.switch_to_frame()
 
         # Pull up the cards view again
         self.cards_view.open_cards_view()
 
-        # If successfully killed, the app should no longer appear in the cards view.
-        self.assertFalse(self.cards_view.is_app_present(self._test_apps[2]),
-            "Killed app not expected to appear in cards view")
+        # If successfully killed, the apps should no longer appear in the cards view and the "No recent apps" message should be displayed
+        self.assertFalse(self.cards_view.is_app_present(self._test_apps[1]),
+                         "Killed app not expected to appear in cards view")
 
-        # Check if the remaining 2 apps are visible in the cards view
-        self.assertTrue(self.cards_view.is_app_displayed(self._test_apps[0]),
-            "First opened app should be visible in cards view")
-
-        self.assertTrue(self.cards_view.is_app_displayed(self._test_apps[1]),
-            "Second app opened should be visible in cards view")
+        self.assertFalse(self.cards_view.is_app_present(self._test_apps[0]),
+                         "Killed app not expected to appear in cards view")
diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini b/tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
@@ -15,8 +15,7 @@ b2g = true
 [functional/calendar/test_calendar_new_event_appears_on_all_calendar_views.py]
 disabled = Bug 877611
 [functional/calendar/test_calendar_today_date.py]
-[functional/cards_view/test_cards_view_kill_app.py]
-[functional/cards_view/test_cards_view_kill_app_with_three_apps.py]
+[functional/cards_view/test_cards_view_kill_app_with_two_apps.py]
 [functional/cards_view/test_cards_view_launch_app.py]
 [functional/cards_view/test_cards_view_with_three_apps.py]
 [functional/clock/test_clock_add_alarm_multiple_times.py]