Bug 1021098 - [vertical homescreen] Update unit tests for vertical ho…

…mescreen

tests/python/gaia-ui-tests/gaiatest/tests/unit/test_cleanup_gaia.py

@@ -9,7 +9,7 @@
 
 class TestCleanupGaia(GaiaTestCase):
 
-    homescreen_frame_locator = (By.CSS_SELECTOR, 'div.homescreen iframe')
+    homescreen_frame_locator = (By.CSS_SELECTOR, '#homescreen iframe')
 
     def test_cleanup_gaia(self):
         self.check_initial_state()
@@ -32,12 +32,6 @@ def test_cleanup_gaia(self):
         # move away from home screen
         self.marionette.switch_to_frame(
             self.marionette.find_element(*self.homescreen_frame_locator))
-        self.marionette.execute_script(
-            'window.wrappedJSObject.GridManager.goToPage(1);')
-        self.assertEqual(self.marionette.execute_script("""
-var manager = window.wrappedJSObject.GridManager;
-return manager.pageHelper.getCurrentPageNumber();
-"""), 1)
         self.marionette.switch_to_frame()
 
         # lock screen
@@ -64,8 +58,4 @@ def check_initial_state(self):
         # check we're on the home screen
         self.marionette.switch_to_frame(
             self.marionette.find_element(*self.homescreen_frame_locator))
-        self.assertEqual(self.marionette.execute_script("""
-var manager = window.wrappedJSObject.GridManager;
-return manager.pageHelper.getCurrentPageNumber();
-"""), 0)
         self.marionette.switch_to_frame()

tests/python/gaia-ui-tests/gaiatest/tests/unit/test_kill.py

@@ -5,19 +5,22 @@
 import time
 
 from gaiatest import GaiaTestCase
+from gaiatest.apps.clock.app import Clock
+from gaiatest.apps.calendar.app import Calendar
+from gaiatest.apps.homescreen.app import Homescreen
 
 
 class TestKill(GaiaTestCase):
 
     def test_kill(self):
-        app = self.apps.launch('Clock')
+        app = self.apps.launch(Clock.name)
         self.apps.kill(app)
         self.check_no_apps_running()
 
     def test_kill_multiple(self):
         running_apps = []
 
-        for app in ['Calendar', 'Clock']:
+        for app in [Calendar.name, Clock.name]:
             running_apps.append(self.apps.launch(app))
             time.sleep(1)
 
@@ -30,5 +33,4 @@ def test_kill_multiple(self):
         self.check_no_apps_running()
 
     def check_no_apps_running(self):
-        self.assertEqual(
-            [a.name.lower() for a in self.apps.running_apps], ['homescreen'])
+        self.assertEqual([a.name for a in self.apps.running_apps], [Homescreen.name])

tests/python/gaia-ui-tests/gaiatest/tests/unit/test_killall.py

@@ -5,12 +5,15 @@
 import time
 
 from gaiatest import GaiaTestCase
+from gaiatest.apps.clock.app import Clock
+from gaiatest.apps.calendar.app import Calendar
+from gaiatest.apps.homescreen.app import Homescreen
 
 
 class TestKillAll(GaiaTestCase):
 
     def test_kill_all(self):
-        for app in ['Calendar', 'Clock']:
+        for app in [Calendar.name, Clock.name]:
             self.apps.launch(app)
             time.sleep(1)
 
@@ -23,7 +26,7 @@ def test_kill_all_with_no_apps_running(self):
         self.check_no_apps_running()
 
     def test_kill_all_twice(self):
-        apps = ['Calendar', 'Clock']
+        apps = [Calendar.name, Clock.name]
         for app in apps:
             self.apps.launch(app)
             time.sleep(1)
@@ -38,5 +41,4 @@ def test_kill_all_twice(self):
         self.apps.kill_all()
 
     def check_no_apps_running(self):
-        self.assertEqual(
-            [a.name.lower() for a in self.apps.running_apps], ['homescreen'])
+        self.assertEqual([a.name for a in self.apps.running_apps], [Homescreen.name])