Compare commits
4 Commits
46fb233dcb
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| b171f42fa6 | |||
| 92c0acda2c | |||
| 058aac36c7 | |||
|
|
0f053f5c8f |
@@ -49,12 +49,28 @@ jobs:
|
|||||||
working-directory: IoT-Systems
|
working-directory: IoT-Systems
|
||||||
run: docker-compose down -v --remove-orphans
|
run: docker-compose down -v --remove-orphans
|
||||||
|
|
||||||
|
mapview-test:
|
||||||
|
name: MapView testing
|
||||||
|
runs-on: host-arch-x86_64
|
||||||
|
steps:
|
||||||
|
- name: Clone repository
|
||||||
|
run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
|
||||||
|
|
||||||
|
- name: Build MapView testing container
|
||||||
|
working-directory: IoT-Systems
|
||||||
|
run: docker build -t local/mapview -f MapView/Dockerfile-test .
|
||||||
|
|
||||||
|
- name: Run MapView tests
|
||||||
|
working-directory: IoT-Systems
|
||||||
|
run: docker run --rm -it -v $PWD/MapView:/app:ro local/mapview
|
||||||
|
|
||||||
integration-smoke-test:
|
integration-smoke-test:
|
||||||
name: Integration smoke testing
|
name: Integration smoke testing
|
||||||
runs-on: host-arch-x86_64
|
runs-on: host-arch-x86_64
|
||||||
needs:
|
needs:
|
||||||
- hub-test
|
- hub-test
|
||||||
- store-test
|
- store-test
|
||||||
|
- mapview-test
|
||||||
steps:
|
steps:
|
||||||
- name: Clone repository
|
- name: Clone repository
|
||||||
run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
|
run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
|
||||||
|
|||||||
14
MapView/Dockerfile-test
Normal file
14
MapView/Dockerfile-test
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Use the official Python image as the base image
|
||||||
|
FROM python:latest
|
||||||
|
# Set the working directory inside the container
|
||||||
|
WORKDIR /app
|
||||||
|
# Copy the requirements.txt file and install dependencies
|
||||||
|
COPY MapView/requirements.txt .
|
||||||
|
RUN sed -i 's/==.*//' requirements.txt
|
||||||
|
|
||||||
|
RUN apt update && apt install -y libgl-dev libsdl1.2-dev
|
||||||
|
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
RUN pip install --root-user-action ignore --no-cache-dir python-unittest kivy[base] pygame
|
||||||
|
|
||||||
|
CMD ["./test-entry.sh"]
|
||||||
@@ -39,7 +39,11 @@ class Datasource:
|
|||||||
self.connection_status = None
|
self.connection_status = None
|
||||||
self._new_points = []
|
self._new_points = []
|
||||||
self._active_markers = []
|
self._active_markers = []
|
||||||
|
|
||||||
|
try:
|
||||||
asyncio.ensure_future(self.connect_to_server())
|
asyncio.ensure_future(self.connect_to_server())
|
||||||
|
except RuntimeError:
|
||||||
|
Logger.info("No event loop detected, running in offline mode")
|
||||||
|
|
||||||
def get_new_points(self):
|
def get_new_points(self):
|
||||||
Logger.debug(self._new_points)
|
Logger.debug(self._new_points)
|
||||||
|
|||||||
3
MapView/test-entry.sh
Executable file
3
MapView/test-entry.sh
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
PYTHONPATH=$PWD python3 -m unittest tests.test_mp
|
||||||
137
MapView/tests/test_mp.py
Normal file
137
MapView/tests/test_mp.py
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
import unittest
|
||||||
|
import sys
|
||||||
|
from unittest.mock import Mock
|
||||||
|
|
||||||
|
sys.modules['lineMapLayer'] = Mock()
|
||||||
|
sys.modules['config'] = Mock()
|
||||||
|
|
||||||
|
from main import get_lat_lon, MapViewApp
|
||||||
|
from datasource import Datasource as DataSourceClass
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------
|
||||||
|
# get_lat_lon
|
||||||
|
# -----------------------
|
||||||
|
class TestGetLatLon(unittest.TestCase):
|
||||||
|
|
||||||
|
def test_dict(self):
|
||||||
|
point = {"lat": 50.45, "lon": 30.52}
|
||||||
|
self.assertEqual(get_lat_lon(point), (50.45, 30.52))
|
||||||
|
|
||||||
|
def test_tuple(self):
|
||||||
|
point = (50.45, 30.52)
|
||||||
|
self.assertEqual(get_lat_lon(point), (50.45, 30.52))
|
||||||
|
|
||||||
|
def test_list(self):
|
||||||
|
point = [50.45, 30.52]
|
||||||
|
self.assertEqual(get_lat_lon(point), (50.45, 30.52))
|
||||||
|
|
||||||
|
def test_invalid(self):
|
||||||
|
point = {"lat": None, "lon": 30.52}
|
||||||
|
self.assertIsNone(get_lat_lon(point))
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------
|
||||||
|
# map_lat_lon_to_marker
|
||||||
|
# -----------------------
|
||||||
|
class TestMapLatLonToMarker(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.instance = MapViewApp()
|
||||||
|
|
||||||
|
def test_marker_found(self):
|
||||||
|
marker = Mock()
|
||||||
|
marker.lat = 30.52
|
||||||
|
marker.lon = 50.45
|
||||||
|
|
||||||
|
self.instance.pothole_markers = [marker]
|
||||||
|
self.instance.bump_markers = []
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_marker(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertEqual(result, marker)
|
||||||
|
|
||||||
|
def test_marker_not_found(self):
|
||||||
|
self.instance.pothole_markers = []
|
||||||
|
self.instance.bump_markers = []
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_marker(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertIsNone(result)
|
||||||
|
|
||||||
|
|
||||||
|
# -----------------------
|
||||||
|
# map_lat_lon_to_processed_agent_data
|
||||||
|
# -----------------------
|
||||||
|
class TestMapLatLonToProcessedAgentData(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.instance = DataSourceClass()
|
||||||
|
|
||||||
|
def test_returns_marker(self):
|
||||||
|
marker = Mock()
|
||||||
|
marker.latitude = 30.52
|
||||||
|
marker.longitude = 50.45
|
||||||
|
|
||||||
|
self.instance._active_markers = [marker]
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertIsNotNone(result)
|
||||||
|
self.assertEqual(result, marker)
|
||||||
|
|
||||||
|
def test_marker_is_close_enough(self):
|
||||||
|
marker = Mock()
|
||||||
|
marker.latitude = 30.521
|
||||||
|
marker.longitude = 50.452
|
||||||
|
|
||||||
|
self.instance._active_markers = [marker]
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertIsNotNone(result)
|
||||||
|
self.assertEqual(result, marker)
|
||||||
|
|
||||||
|
def test_marker_is_too_far(self):
|
||||||
|
marker = Mock()
|
||||||
|
marker.latitude = 30.524
|
||||||
|
marker.longitude = 50.454
|
||||||
|
|
||||||
|
self.instance._active_markers = [marker]
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertIsNone(result)
|
||||||
|
|
||||||
|
def test_return_closer_marker(self):
|
||||||
|
marker1 = Mock()
|
||||||
|
marker1.latitude = 30.521
|
||||||
|
marker1.longitude = 50.451
|
||||||
|
|
||||||
|
marker2 = Mock()
|
||||||
|
marker2.latitude = 30.524
|
||||||
|
marker2.longitude = 50.454
|
||||||
|
|
||||||
|
self.instance._active_markers = [marker1, marker2]
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.452, 30.522)
|
||||||
|
self.assertIsNotNone(result)
|
||||||
|
self.assertEqual(result, marker1)
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.453, 30.523)
|
||||||
|
self.assertIsNotNone(result)
|
||||||
|
self.assertEqual(result, marker2)
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.459, 30.529)
|
||||||
|
self.assertIsNone(result)
|
||||||
|
|
||||||
|
def test_empty_markers(self):
|
||||||
|
self.instance._active_markers = []
|
||||||
|
|
||||||
|
result = self.instance.map_lat_lon_to_processed_agent_data(50.45, 30.52)
|
||||||
|
|
||||||
|
self.assertIsNone(result)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user