From a344203b26fa26cf01f894920cd3e45da01d6195 Mon Sep 17 00:00:00 2001 From: David Eder Date: Fri, 18 Jun 2021 07:28:08 +0200 Subject: [PATCH 1/3] Add entity ident test --- .../entity_ident_service/test_ident_server.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 components/entitiy_ident/entity_ident_service/test_ident_server.py diff --git a/components/entitiy_ident/entity_ident_service/test_ident_server.py b/components/entitiy_ident/entity_ident_service/test_ident_server.py new file mode 100644 index 0000000..73efabd --- /dev/null +++ b/components/entitiy_ident/entity_ident_service/test_ident_server.py @@ -0,0 +1,29 @@ +import unittest + +import requests +from flask import jsonify + +from components.entitiy_ident.entity_ident_service.entity_ident_server import app + + +class TestIdentServer(unittest.TestCase): + def setUp(self) -> None: + self.app = app.test_client() + + def test_get_traffic_lights(self): + response = requests.get('http://0.0.0.0:5002/api/v1/resources/traffic_lights') + self.assertEqual(200, response.status_code) + data = response.json()['cursor'] + self.assertEqual('3', data[0]['id']) + + def test_get_cars(self): + response = requests.get('http://0.0.0.0:5002/api/v1/resources/cars') + self.assertEqual(200, response.status_code) + data = response.json()['cursor'] + self.assertEqual('5GZCZ43D13S812716', data[0]['vin']) + + def test_get_traffic_light_events(self): + response = requests.get('http://0.0.0.0:5002/api/v1/resources/traffic_light_events?id=3') + self.assertEqual(200, response.status_code) + data = response.json()['cursor'] + self.assertEqual('5GZCZ43D13S812716', data[0]['vin']) \ No newline at end of file From dfca25e2e0b7d5ff7139992b456872e2e1436ba0 Mon Sep 17 00:00:00 2001 From: David Eder Date: Fri, 18 Jun 2021 12:06:02 +0200 Subject: [PATCH 2/3] Add entity ident test --- .../entity_ident_service/test_ident_server.py | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/components/entitiy_ident/entity_ident_service/test_ident_server.py b/components/entitiy_ident/entity_ident_service/test_ident_server.py index 73efabd..630ba3c 100644 --- a/components/entitiy_ident/entity_ident_service/test_ident_server.py +++ b/components/entitiy_ident/entity_ident_service/test_ident_server.py @@ -1,29 +1,31 @@ import unittest import requests -from flask import jsonify from components.entitiy_ident.entity_ident_service.entity_ident_server import app +ENTITY_IDENT_URL = 'http://entityident:5002/api/v1/resources/' + class TestIdentServer(unittest.TestCase): + def setUp(self) -> None: self.app = app.test_client() def test_get_traffic_lights(self): - response = requests.get('http://0.0.0.0:5002/api/v1/resources/traffic_lights') + response = requests.get(ENTITY_IDENT_URL + 'traffic_lights') + self.assertEqual(200, response.status_code) + data = response.json()['cursor'] + self.assertIsNotNone(data[0]['id']) + + def test_get_cars(self): + response = requests.get(ENTITY_IDENT_URL + 'cars') + self.assertEqual(200, response.status_code) + data = response.json()['cursor'] + self.assertIsNotNone(data[0]['vin']) + + def test_get_traffic_lights_geo(self): + response = requests.get(ENTITY_IDENT_URL + 'traffic_lights_geo?lat=47.92603&lon=16.20917') self.assertEqual(200, response.status_code) data = response.json()['cursor'] self.assertEqual('3', data[0]['id']) - - def test_get_cars(self): - response = requests.get('http://0.0.0.0:5002/api/v1/resources/cars') - self.assertEqual(200, response.status_code) - data = response.json()['cursor'] - self.assertEqual('5GZCZ43D13S812716', data[0]['vin']) - - def test_get_traffic_light_events(self): - response = requests.get('http://0.0.0.0:5002/api/v1/resources/traffic_light_events?id=3') - self.assertEqual(200, response.status_code) - data = response.json()['cursor'] - self.assertEqual('5GZCZ43D13S812716', data[0]['vin']) \ No newline at end of file From 0ccaa27e7e1488731301cd83b0b577033f006034 Mon Sep 17 00:00:00 2001 From: David Eder Date: Fri, 18 Jun 2021 12:09:49 +0200 Subject: [PATCH 3/3] Add entity ident comments --- .../entity_ident_service/entity_ident_server.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/components/entitiy_ident/entity_ident_service/entity_ident_server.py b/components/entitiy_ident/entity_ident_service/entity_ident_server.py index 23587b5..3a109a6 100644 --- a/components/entitiy_ident/entity_ident_service/entity_ident_server.py +++ b/components/entitiy_ident/entity_ident_service/entity_ident_server.py @@ -42,6 +42,9 @@ mongo.db.cars.update_one({"vin": "5GZCZ43D13S812716"}, {"$set": {"startingTime": @app.route('/api/v1/resources/cars', methods=['GET']) def get_cars(): + """ + Get all cars stored in entity ident database or filter by vin. + """ query_parameters = request.args vin = query_parameters.get('vin') @@ -55,6 +58,10 @@ def get_cars(): @app.route('/api/v1/resources/traffic_lights', methods=['GET']) def get_traffic_lights(): + """ + Get all traffic lights stored in entity ident database or filter by id. + """ + query_parameters = request.args tl_id = query_parameters.get('id') @@ -69,6 +76,10 @@ def get_traffic_lights(): @app.route('/api/v1/resources/traffic_lights_geo', methods=['GET']) def get_traffic_lights_geo(): + """ + Get traffic light which is in range and south of coordinates (lat, lon). + """ + query_parameters = request.args lat = float(query_parameters.get('lat'))