Skip to content

Commit 4ffb849

Browse files
committed
SDK-1196: Remove broken longtitude function, rather than deprecate it
Also parametize tests for location constraint extension validation
1 parent 17f8467 commit 4ffb849

File tree

2 files changed

+36
-48
lines changed

2 files changed

+36
-48
lines changed

yoti_python_sdk/dynamic_sharing_service/extension/location_constraint_extension_builder.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from deprecated import deprecated
5-
64

75
class LocationConstraintExtensionBuilder(object):
86
LOCATION_CONSTRAINT = "LOCATION_CONSTRAINT"
@@ -27,14 +25,6 @@ def with_latitude(self, latitude):
2725
self.__device_location["latitude"] = latitude
2826
return self
2927

30-
@deprecated
31-
def with_longtitude(self, longtitude):
32-
"""
33-
To be removed in v3.0.0
34-
Use with_longitude instead
35-
"""
36-
return self.with_longitude(longtitude)
37-
3828
def with_longitude(self, longitude):
3929
if not isinstance(longitude, float) and not isinstance(longitude, int):
4030
raise ValueError("Lontitude must be float or int")

yoti_python_sdk/tests/dynamic_sharing_service/extension/test_location_constraint_extension_builder.py

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,56 @@
77
import pytest
88

99

10-
def test_longitude_validation():
10+
@pytest.mark.parametrize("longitude", [270.00, -181, "27.00"])
11+
def test_longitude_validation_should_reject_invalid(longitude):
1112
extension = LocationConstraintExtensionBuilder()
1213
with pytest.raises(ValueError):
13-
extension.with_longitude(270.00)
14-
with pytest.raises(ValueError):
15-
extension.with_longitude(-181)
16-
with pytest.raises(ValueError):
17-
extension.with_longitude("27.00")
18-
extension.with_longitude(180.0)
19-
extension.with_longitude(-90)
14+
extension.with_longitude(longitude)
2015

2116

22-
def test_latitude_validation():
17+
@pytest.mark.parametrize("longitude", [180.0, -90])
18+
def test_longitude_vaidation_should_accept_valid(longitude):
2319
extension = LocationConstraintExtensionBuilder()
24-
with pytest.raises(ValueError):
25-
extension.with_latitude(270.00)
26-
with pytest.raises(ValueError):
27-
extension.with_latitude(-181)
28-
with pytest.raises(ValueError):
29-
extension.with_latitude("27.00")
30-
with pytest.raises(ValueError):
31-
extension.with_latitude(91)
32-
with pytest.raises(ValueError):
33-
extension.with_latitude(-180)
34-
extension.with_latitude(18.0)
35-
extension.with_latitude(-90)
20+
extension.with_longitude(longitude)
3621

3722

38-
def test_uncertainty_validation():
23+
@pytest.mark.parametrize("latitude", [270.00, -181, "27.00", 91, -180])
24+
def test_latitude_validation_should_reject_invalid(latitude):
3925
extension = LocationConstraintExtensionBuilder()
4026
with pytest.raises(ValueError):
41-
extension.with_uncertainty(-1)
42-
with pytest.raises(ValueError):
43-
extension.with_uncertainty(-0.01)
44-
with pytest.raises(ValueError):
45-
extension.with_uncertainty("3")
46-
extension.with_uncertainty(0)
47-
extension.with_uncertainty(1)
48-
extension.with_uncertainty(1e3)
27+
extension.with_latitude(latitude)
4928

5029

51-
def test_radius_validation():
30+
@pytest.mark.parametrize("latitude", [18.0, -90])
31+
def test_latitude_validation_should_accept_valid(latitude):
32+
extension = LocationConstraintExtensionBuilder()
33+
extension.with_latitude(latitude)
34+
35+
36+
@pytest.mark.parametrize("uncertainty", [-1, -0.01, "3"])
37+
def test_uncertainty_validation_should_reject_invalid(uncertainty):
5238
extension = LocationConstraintExtensionBuilder()
5339
with pytest.raises(ValueError):
54-
extension.with_radius(-1)
55-
with pytest.raises(ValueError):
56-
extension.with_radius(-0.01)
40+
extension.with_uncertainty(uncertainty)
41+
42+
43+
@pytest.mark.parametrize("uncertainty", [0, 1, 1e3])
44+
def test_uncertainty_validation_should_accept_valid(uncertainty):
45+
extension = LocationConstraintExtensionBuilder()
46+
extension.with_uncertainty(uncertainty)
47+
48+
49+
@pytest.mark.parametrize("radius", [-1, -0.01, "3"])
50+
def test_radius_validation_should_reject_invalid(radius):
51+
extension = LocationConstraintExtensionBuilder()
5752
with pytest.raises(ValueError):
58-
extension.with_radius("3")
59-
extension.with_radius(0)
60-
extension.with_radius(1)
61-
extension.with_radius(1e3)
53+
extension.with_radius(radius)
54+
55+
56+
@pytest.mark.parametrize("radius", [0, 1, 1e3])
57+
def test_radius_validation_should_accept_valid(radius):
58+
extension = LocationConstraintExtensionBuilder()
59+
extension.with_radius(radius)
6260

6361

6462
def test_builds_with_given_values():

0 commit comments

Comments
 (0)