Change altitude optional as arg for set_location (appium#415)

* Change altitude optional as arg for set_location

* Add comments

* review comments

Author: ki4070ma

appium/webdriver/extensions/location.py

@@ -29,24 +29,25 @@ def toggle_location_services(self):
         self.execute(Command.TOGGLE_LOCATION_SERVICES, {})
         return self
 
-    def set_location(self, latitude, longitude, altitude):
+    def set_location(self, latitude, longitude, altitude=None):
         """Set the location of the device
 
         Args:
-            latitude (float): String or numeric value between -90.0 and 90.00
-            longitude (float): String or numeric value between -180.0 and 180.0
-            altitude (float): String or numeric value
+            latitude (Union[float, str]): String or numeric value between -90.0 and 90.00
+            longitude (Union[float, str]): String or numeric value between -180.0 and 180.0
+            altitude (Union[float, str], optional): String or numeric value (Android real device only)
 
         Returns:
             `appium.webdriver.webdriver.WebDriver`
         """
         data = {
             "location": {
-                "latitude": float(latitude),
-                "longitude": float(longitude),
-                "altitude": float(altitude)
+                "latitude": latitude,
+                "longitude": longitude,
             }
         }
+        if altitude is not None:
+            data['location']['altitude'] = altitude
         self.execute(Command.SET_LOCATION, data)
         return self
 

test/unit/webdriver/device/location_test.py

@@ -36,7 +36,7 @@ def test_toggle_location_services(self):
         assert isinstance(driver.toggle_location_services(), WebDriver)
 
     @httpretty.activate
-    def test_set_location(self):
+    def test_set_location_float(self):
         driver = android_w3c_driver()
         httpretty.register_uri(
             httpretty.POST,
@@ -49,6 +49,34 @@ def test_set_location(self):
         assert abs(d['location']['longitude'] - 22.2) <= FLT_EPSILON
         assert abs(d['location']['altitude'] - 33.3) <= FLT_EPSILON
 
+    @httpretty.activate
+    def test_set_location_str(self):
+        driver = android_w3c_driver()
+        httpretty.register_uri(
+            httpretty.POST,
+            appium_command('/session/1234567890/location')
+        )
+        assert isinstance(driver.set_location('11.1', '22.2', '33.3'), WebDriver)
+
+        d = get_httpretty_request_body(httpretty.last_request())
+        assert d['location']['latitude'] == '11.1'
+        assert d['location']['longitude'] == '22.2'
+        assert d['location']['altitude'] == '33.3'
+
+    @httpretty.activate
+    def test_set_location_without_altitude(self):
+        driver = android_w3c_driver()
+        httpretty.register_uri(
+            httpretty.POST,
+            appium_command('/session/1234567890/location')
+        )
+        assert isinstance(driver.set_location(11.1, 22.2), WebDriver)
+
+        d = get_httpretty_request_body(httpretty.last_request())
+        assert abs(d['location']['latitude'] - 11.1) <= FLT_EPSILON
+        assert abs(d['location']['longitude'] - 22.2) <= FLT_EPSILON
+        assert d['location'].get('altitude') == None
+
     @httpretty.activate
     def test_location(self):
         driver = android_w3c_driver()