Cleaned up test codes (appium#466)

ki4070ma · web-flow · commit f955fb9848f2 · 2019-11-09T18:28:51.000+09:00
* Deleted unnecessary codes

* Move functional tests to correct class

* Move some tests

* Created search_context/windows_test

* [functional] Created search_context package

* Remove class method decolator

* Fix import error

* Add BaseTestCase for ios functional testcases

* Add test_helper for android functional test

* Add __init__.py

* Deleted unused imports
diff --git a/.isort.cfg b/.isort.cfg
@@ -1,4 +1,4 @@
 [settings]
 multi_line_output = 3
 known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3,mock,sauceclient
-known_first_party = test
+known_first_party = test,appium
diff --git a/appium/webdriver/extensions/android/common.py b/appium/webdriver/extensions/android/common.py
@@ -53,11 +53,10 @@ def current_package(self):
         """
         return self.execute(Command.GET_CURRENT_PACKAGE)['value']
 
-
-def _addCommands(self):
-    self.command_executor._commands[Command.GET_CURRENT_PACKAGE] = \
-        ('GET', '/session/$sessionId/appium/device/current_package')
-    self.command_executor._commands[Command.END_TEST_COVERAGE] = \
-        ('POST', '/session/$sessionId/appium/app/end_test_coverage')
-    self.command_executor._commands[Command.OPEN_NOTIFICATIONS] = \
-        ('POST', '/session/$sessionId/appium/device/open_notifications')
+    def _addCommands(self):
+        self.command_executor._commands[Command.GET_CURRENT_PACKAGE] = \
+            ('GET', '/session/$sessionId/appium/device/current_package')
+        self.command_executor._commands[Command.END_TEST_COVERAGE] = \
+            ('POST', '/session/$sessionId/appium/app/end_test_coverage')
+        self.command_executor._commands[Command.OPEN_NOTIFICATIONS] = \
+            ('POST', '/session/$sessionId/appium/device/open_notifications')
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -438,12 +438,6 @@ def _addCommands(self):
             ('POST', '/session/$sessionId/touch/perform')
         self.command_executor._commands[Command.MULTI_ACTION] = \
             ('POST', '/session/$sessionId/touch/multi/perform')
-        self.command_executor._commands[Command.GET_CURRENT_PACKAGE] = \
-            ('GET', '/session/$sessionId/appium/device/current_package')
-        self.command_executor._commands[Command.END_TEST_COVERAGE] = \
-            ('POST', '/session/$sessionId/appium/app/end_test_coverage')
-        self.command_executor._commands[Command.OPEN_NOTIFICATIONS] = \
-            ('POST', '/session/$sessionId/appium/device/open_notifications')
         self.command_executor._commands[Command.SET_IMMEDIATE_VALUE] = \
             ('POST', '/session/$sessionId/appium/element/$id/value')
 
diff --git a/ci-jobs/functional/run_android_test.yml b/ci-jobs/functional/run_android_test.yml
@@ -11,7 +11,7 @@ jobs:
         displayName: Create and run Emulator
       - script: |
           cd test/functional/android
-          py.test ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}
+          python -m pytest ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}
         displayName: Run Android functional tests
       - template: ./publish_test_result.yml
       - template: ./save_appium_log.yml
diff --git a/ci-jobs/functional/run_ios_test.yml b/ci-jobs/functional/run_ios_test.yml
@@ -11,6 +11,6 @@ jobs:
           xcodeVersion: ${{ parameters.xcodeForIOS }}
       - script: |
           cd test/functional/ios
-          py.test ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}
+          python -m pytest ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}
         displayName: Run iOS functional tests
       - template: ./publish_test_result.yml
diff --git a/ci-jobs/functional_test.yml b/ci-jobs/functional_test.yml
@@ -13,7 +13,7 @@ jobs:
       name: 'func_test_ios1'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
-      testFiles: 'find_*.py remote_fs_tests.py safari_tests.py execute_driver_tests.py'
+      testFiles: 'search_context/find_by_*.py remote_fs_tests.py safari_tests.py execute_driver_tests.py'
       CI: ${{ parameters.ci }}
       xcodeForIOS: ${{ parameters.xcodeForIOS }}
   - template: ./functional/run_ios_test.yml
@@ -29,7 +29,7 @@ jobs:
       name: 'func_test_android1'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
-      testFiles: 'device_time_tests.py find_by_accessibility_id_tests.py find_by_image_tests.py'
+      testFiles: 'device_time_tests.py search_context/find_by_*.py'
       sdkVer: ${{ parameters.androidSdkVer }}
       CI: ${{ parameters.ci }}
   - template: ./functional/run_android_test.yml
@@ -69,7 +69,7 @@ jobs:
       name: 'func_test_android6'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
-      testFiles: 'webdriver_tests.py'
+      testFiles: 'common_tests.py'
       sdkVer: ${{ parameters.androidSdkVer }}
       CI: ${{ parameters.ci }}
   - template: ./functional/run_android_test.yml
diff --git a/test/functional/android/applications_tests.py b/test/functional/android/applications_tests.py
@@ -72,6 +72,10 @@ def test_app_strings_with_language_and_file(self):
         strings = self.driver.app_strings('en', 'some_file')
         self.assertEqual(u'You can\'t wipe my data, you are a monkey!', strings[u'monkey_wipe_data'])
 
+    def test_reset(self):
+        self.driver.reset()
+        self.assertTrue(self.driver.is_app_installed('com.example.android.apis'))
+
 
 if __name__ == '__main__':
     suite = unittest.TestLoader().loadTestsFromTestCase(ApplicationsTests)
diff --git a/test/functional/android/common_tests.py b/test/functional/android/common_tests.py
@@ -24,7 +24,7 @@
 from .helper.test_helper import BaseTestCase, wait_for_element
 
 
-class WebdriverTests(BaseTestCase):
+class CommonTests(BaseTestCase):
 
     def test_current_package(self):
         package = self.driver.current_package
@@ -35,10 +35,6 @@ def test_end_test_coverage(self):
         self.driver.end_test_coverage(intent='android.intent.action.MAIN', path='')
         sleep(5)
 
-    def test_reset(self):
-        self.driver.reset()
-        self.assertTrue(self.driver.is_app_installed('com.example.android.apis'))
-
     def test_open_notifications(self):
         if is_ci():
             # TODO Due to unexpected dialog, "System UI isn't responding"
@@ -71,5 +67,5 @@ def test_open_notifications(self):
 
 
 if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(WebdriverTests)
+    suite = unittest.TestLoader().loadTestsFromTestCase(CommonTests)
     unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/test/functional/android/search_context/__init__.py b/test/functional/android/search_context/__init__.py
diff --git a/test/functional/android/search_context/find_by_accessibility_id_tests.py b/test/functional/android/search_context/find_by_accessibility_id_tests.py
@@ -15,9 +15,11 @@
 import unittest
 
 from appium.webdriver.common.mobileby import MobileBy
-
-from ..test_helper import is_ci
-from .helper.test_helper import BaseTestCase, wait_for_element
+from test.functional.android.helper.test_helper import (
+    BaseTestCase,
+    wait_for_element
+)
+from test.functional.test_helper import is_ci
 
 
 class FindByAccessibilityIDTests(BaseTestCase):
diff --git a/test/functional/android/search_context/find_by_image_tests.py b/test/functional/android/search_context/find_by_image_tests.py
@@ -22,8 +22,7 @@
 from selenium.webdriver.support.ui import WebDriverWait
 
 from appium import webdriver
-
-from .helper import desired_capabilities
+from test.functional.android.helper import desired_capabilities
 
 
 @pytest.mark.skip(reason="Need to fix broken test")
diff --git a/test/functional/android/search_context/find_by_uiautomator_tests.py b/test/functional/android/search_context/find_by_uiautomator_tests.py
@@ -14,9 +14,12 @@
 
 import unittest
 
-from .helper.test_helper import BaseTestCase
+import pytest
 
+from test.functional.android.helper.test_helper import BaseTestCase
 
+
+@pytest.mark.skip(reason="Need to fix flaky test")
 class FindByUIAutomatorTests(BaseTestCase):
     def test_find_single_element(self):
         el = self.driver.find_element_by_android_uiautomator('new UiSelector().text("Animation")')
diff --git a/test/functional/android/touch_action_tests.py b/test/functional/android/touch_action_tests.py
@@ -16,11 +16,9 @@
 
 from selenium.common.exceptions import NoSuchElementException
 
-from appium import webdriver
 from appium.webdriver.common.mobileby import MobileBy
 from appium.webdriver.common.touch_action import TouchAction
 
-from .helper import desired_capabilities
 from .helper.test_helper import BaseTestCase, wait_for_element
 
 
diff --git a/test/functional/android/webelement_tests.py b/test/functional/android/webelement_tests.py
@@ -15,10 +15,8 @@
 
 import unittest
 
-from appium import webdriver
 from appium.webdriver.common.mobileby import MobileBy
 
-from .helper import desired_capabilities
 from .helper.test_helper import BaseTestCase, wait_for_element
 
 
diff --git a/test/functional/ios/applications_tests.py b/test/functional/ios/applications_tests.py
@@ -14,19 +14,13 @@
 
 import unittest
 
-from appium import webdriver
 from appium.webdriver.applicationstate import ApplicationState
+from test.functional.ios.helper.test_helper import BaseTestCase
 
 from .helper import desired_capabilities
 
 
-class WebDriverTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
+class WebDriverTests(BaseTestCase):
 
     def test_app_management(self):
         # this only works in Xcode9+
diff --git a/test/functional/ios/execute_driver_tests.py b/test/functional/ios/execute_driver_tests.py
@@ -15,19 +15,10 @@
 import textwrap
 import unittest
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class ExecuteDriverTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class ExecuteDriverTests(BaseTestCase):
     def test_batch(self):
         script = """
             const status = await driver.status();
diff --git a/test/functional/ios/helper/test_helper.py b/test/functional/ios/helper/test_helper.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import unittest
+
+from appium import webdriver
+
+from . import desired_capabilities
+
+
+class BaseTestCase(unittest.TestCase):
+
+    def setUp(self):
+        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
+        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
+
+    def tearDown(self):
+        self.driver.quit()
diff --git a/test/functional/ios/hw_actions_tests.py b/test/functional/ios/hw_actions_tests.py
@@ -14,19 +14,10 @@
 
 import unittest
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class HwActionsTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class HwActionsTests(BaseTestCase):
     def test_lock(self):
         self.driver.lock(-1)
         try:
diff --git a/test/functional/ios/keyboard_tests.py b/test/functional/ios/keyboard_tests.py
@@ -15,19 +15,10 @@
 import unittest
 from time import sleep
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class KeyboardTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class KeyboardTests(BaseTestCase):
     def test_hide_keyboard(self):
         self._move_to_textbox()
 
diff --git a/test/functional/ios/remote_fs_tests.py b/test/functional/ios/remote_fs_tests.py
@@ -15,18 +15,10 @@
 import os
 import unittest
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
 
-
-class RemoteFsTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
+class RemoteFsTests(BaseTestCase):
 
     def test_push_file(self):
         file_name = 'test_image.jpg'
diff --git a/test/functional/ios/screen_record_tests.py b/test/functional/ios/screen_record_tests.py
@@ -15,19 +15,10 @@
 import unittest
 from time import sleep
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class ScreenRecordTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class ScreenRecordTests(BaseTestCase):
     def test_screen_record(self):
         self.driver.start_recording_screen()
         sleep(10)
diff --git a/test/functional/ios/search_context/__init__.py b/test/functional/ios/search_context/__init__.py
diff --git a/test/functional/ios/search_context/find_by_element_webelement_tests.py b/test/functional/ios/search_context/find_by_element_webelement_tests.py
@@ -14,21 +14,10 @@
 
 import unittest
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
 
-
-class FindByElementWebelementTests(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    @classmethod
-    def tearDownClass(self):
-        self.driver.quit()
+class FindByElementWebelementTests(BaseTestCase):
 
     def test_find_element_by_path(self):
         el = self.driver.find_element_by_ios_predicate('wdName == "UICatalog"')
diff --git a/test/functional/ios/search_context/find_by_ios_class_chain_tests.py b/test/functional/ios/search_context/find_by_ios_class_chain_tests.py
@@ -14,21 +14,10 @@
 
 import unittest
 
-from appium import webdriver
+from test.functional.ios.helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class FindByIOClassChainTests(unittest.TestCase):
-    @classmethod
-    def setUpClass(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('UICatalog.app.zip')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    @classmethod
-    def tearDownClass(self):
-        self.driver.quit()
 
+class FindByIOClassChainTests(BaseTestCase):
     def test_find_element_by_path(self):
         el = self.driver.find_element_by_ios_class_chain('XCUIElementTypeWindow/**/XCUIElementTypeStaticText')
         self.assertEqual('Action Sheets', el.get_attribute('name'))
diff --git a/test/functional/ios/search_context/find_by_ios_predicate_tests.py b/test/functional/ios/search_context/find_by_ios_predicate_tests.py
diff --git a/test/functional/ios/webdriver_tests.py b/test/functional/ios/webdriver_tests.py
diff --git a/test/unit/webdriver/device/common_test.py b/test/unit/webdriver/device/common_test.py
diff --git a/test/unit/webdriver/search_context/android_test.py b/test/unit/webdriver/search_context/android_test.py
diff --git a/test/unit/webdriver/search_context/windows_test.py b/test/unit/webdriver/search_context/windows_test.py
diff --git a/test/unit/webdriver/webdriver_test.py b/test/unit/webdriver/webdriver_test.py
