Fix missing package, missing commands and a test (appium#296)

KazuCocoa · web-flow · commit 42b4dca4d201 · 2018-12-18T18:54:17.000+09:00
* add extensions into package

* add tests for context to make sure it loads

* move command definition from extensions to root
diff --git a/appium/webdriver/extensions/context.py b/appium/webdriver/extensions/context.py
@@ -46,13 +46,3 @@ def context(self):
             driver.context
         """
         return self.current_context
-
-    # pylint: disable=protected-access
-
-    def _addCommands(self):
-        self.command_executor._commands[Command.CONTEXTS] = \
-            ('GET', '/session/$sessionId/contexts')
-        self.command_executor._commands[Command.GET_CURRENT_CONTEXT] = \
-            ('GET', '/session/$sessionId/context')
-        self.command_executor._commands[Command.SWITCH_TO_CONTEXT] = \
-            ('POST', '/session/$sessionId/context')
diff --git a/appium/webdriver/extensions/location.py b/appium/webdriver/extensions/location.py
@@ -52,13 +52,3 @@ def location(self):
          - altitude
         """
         return self.execute(Command.GET_LOCATION)['value']
-
-    # pylint: disable=protected-access
-
-    def _addCommands(self):
-        self.command_executor._commands[Command.TOGGLE_LOCATION_SERVICES] = \
-            ('POST', '/session/$sessionId/appium/device/toggle_location_services')
-        self.command_executor._commands[Command.GET_LOCATION] = \
-            ('GET', '/session/$sessionId/location')
-        self.command_executor._commands[Command.SET_LOCATION] = \
-            ('POST', '/session/$sessionId/location')
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -1412,7 +1412,20 @@ def finger_print(self, finger_id):
     # pylint: disable=protected-access
 
     def _addCommands(self):
-        super(WebDriver, self)._addCommands()
+        self.command_executor._commands[Command.CONTEXTS] = \
+            ('GET', '/session/$sessionId/contexts')
+        self.command_executor._commands[Command.GET_CURRENT_CONTEXT] = \
+            ('GET', '/session/$sessionId/context')
+        self.command_executor._commands[Command.SWITCH_TO_CONTEXT] = \
+            ('POST', '/session/$sessionId/context')
+
+        self.command_executor._commands[Command.TOGGLE_LOCATION_SERVICES] = \
+            ('POST', '/session/$sessionId/appium/device/toggle_location_services')
+        self.command_executor._commands[Command.GET_LOCATION] = \
+            ('GET', '/session/$sessionId/location')
+        self.command_executor._commands[Command.SET_LOCATION] = \
+            ('POST', '/session/$sessionId/location')
+
         self.command_executor._commands[Command.TOUCH_ACTION] = \
             ('POST', '/session/$sessionId/touch/perform')
         self.command_executor._commands[Command.MULTI_ACTION] = \
diff --git a/setup.py b/setup.py
@@ -37,7 +37,8 @@
         'appium',
         'appium.common',
         'appium.webdriver',
-        'appium.webdriver.common'
+        'appium.webdriver.common',
+        'appium.webdriver.extensions'
     ],
     license='Apache 2.0',
     classifiers=[
diff --git a/test/unit/webdriver/device/context_test.py b/test/unit/webdriver/device/context_test.py
@@ -0,0 +1,31 @@
+#!/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.
+
+from test.unit.helper.test_helper import appium_command, android_w3c_driver
+from appium.common.helper import appium_bytes
+
+import httpretty
+
+
+class TestWebDriverDeviceContext(object):
+
+    @httpretty.activate
+    def test_get_contexts(self):
+        driver = android_w3c_driver()
+        httpretty.register_uri(
+            httpretty.GET,
+            appium_command('/session/1234567890/context'),
+            body='{"value": "NATIVE"}'
+        )
+        assert driver.current_context == 'NATIVE'
