Skip to content

Commit f1033fd

Browse files
author
Jakob Stolze
committed
refactor: use apiClient method to configure client
The apiClient mehtod simplifies the creation of the ApiClient class.
1 parent 337ac14 commit f1033fd

8 files changed

+16
-28
lines changed

test/test_directions_service_api.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818
import openrouteservice
1919
from openrouteservice.api.directions_service_api import DirectionsServiceApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21-
21+
from openrouteservice import apiClient
2222

2323
class TestDirectionsServiceApi(unittest.TestCase):
2424
"""DirectionsServiceApi unit test stubs"""
2525

2626
def setUp(self):
2727
cfg = configparser.ConfigParser()
2828
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = DirectionsServiceApi(openrouteservice.ApiClient(configuration)) # noqa: E501
29+
self.api = DirectionsServiceApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3230

3331
def tearDown(self):
3432
pass

test/test_elevation_api.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818
import openrouteservice
1919
from openrouteservice.api.elevation_api import ElevationApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21-
21+
from openrouteservice import apiClient
2222

2323
class TestElevationApi(unittest.TestCase):
2424
"""ElevationApi unit test stubs"""
2525

2626
def setUp(self):
2727
cfg = configparser.ConfigParser()
2828
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = ElevationApi(openrouteservice.ApiClient(configuration)) # noqa: E501
29+
self.api = ElevationApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3230

3331
def tearDown(self):
3432
pass

test/test_geocode_api.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818
import openrouteservice
1919
from openrouteservice.api.geocode_api import GeocodeApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21-
21+
from openrouteservice import apiClient
2222

2323
class TestGeocodeApi(unittest.TestCase):
2424
"""GeocodeApi unit test stubs"""
2525

2626
def setUp(self):
2727
cfg = configparser.ConfigParser()
2828
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = GeocodeApi(openrouteservice.ApiClient(configuration)) # noqa: E501
29+
self.api = GeocodeApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3230

3331
def tearDown(self):
3432
pass

test/test_isochrones_service_api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import openrouteservice
1919
from openrouteservice.api.isochrones_service_api import IsochronesServiceApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21+
from openrouteservice import apiClient
2122

2223

2324
class TestIsochronesServiceApi(unittest.TestCase):
@@ -26,9 +27,7 @@ class TestIsochronesServiceApi(unittest.TestCase):
2627
def setUp(self):
2728
cfg = configparser.ConfigParser()
2829
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = IsochronesServiceApi(openrouteservice.ApiClient(configuration)) # noqa: E501
30+
self.api = IsochronesServiceApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3231

3332
def tearDown(self):
3433
pass

test/test_matrix_service_api.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818
import openrouteservice
1919
from openrouteservice.api.matrix_service_api import MatrixServiceApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21-
21+
from openrouteservice import apiClient
2222

2323
class TestMatrixServiceApi(unittest.TestCase):
2424
"""MatrixServiceApi unit test stubs"""
2525

2626
def setUp(self):
2727
cfg = configparser.ConfigParser()
2828
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = MatrixServiceApi(openrouteservice.ApiClient(configuration)) # noqa: E501
29+
self.api = MatrixServiceApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3230

3331
def tearDown(self):
3432
pass

test/test_optimization_api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import openrouteservice
1919
from openrouteservice.api.optimization_api import OptimizationApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21+
from openrouteservice import apiClient
2122

2223

2324
class TestOptimizationApi(unittest.TestCase):
@@ -26,9 +27,7 @@ class TestOptimizationApi(unittest.TestCase):
2627
def setUp(self):
2728
cfg = configparser.ConfigParser()
2829
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = OptimizationApi(openrouteservice.ApiClient(configuration)) # noqa: E501
30+
self.api = OptimizationApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3231

3332
def tearDown(self):
3433
pass

test/test_pois_api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import openrouteservice as ors
1919
from openrouteservice.api.pois_api import PoisApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21+
from openrouteservice import apiClient
2122

2223

2324
class TestPoisApi(unittest.TestCase):
@@ -26,9 +27,7 @@ class TestPoisApi(unittest.TestCase):
2627
def setUp(self):
2728
cfg = configparser.ConfigParser()
2829
cfg.read('tests-config.ini')
29-
configuration = ors.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = PoisApi(ors.ApiClient(configuration)) # noqa: E501
30+
self.api = PoisApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3231

3332
def tearDown(self):
3433
pass

test/test_snapping_service_api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import openrouteservice
1919
from openrouteservice.api.snapping_service_api import SnappingServiceApi # noqa: E501
2020
from openrouteservice.rest import ApiException
21+
from openrouteservice import apiClient
2122

2223

2324
class TestSnappingServiceApi(unittest.TestCase):
@@ -26,9 +27,7 @@ class TestSnappingServiceApi(unittest.TestCase):
2627
def setUp(self):
2728
cfg = configparser.ConfigParser()
2829
cfg.read('tests-config.ini')
29-
configuration = openrouteservice.Configuration()
30-
configuration.api_key['Authorization'] = cfg['ORS']['apiKey']
31-
self.api = SnappingServiceApi(openrouteservice.ApiClient(configuration)) # noqa: E501
30+
self.api = SnappingServiceApi(apiClient(cfg['ORS']['apiKey'])) # noqa: E501
3231

3332
def tearDown(self):
3433
pass

0 commit comments

Comments
 (0)