[P] Integrate MapView testing into CI pipeline

.gitea/workflows/tests.yaml

@@ -49,12 +49,28 @@ jobs:
         working-directory: IoT-Systems
         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:
     name: Integration smoke testing
     runs-on: host-arch-x86_64
     needs:
       - hub-test
       - store-test
+      - mapview-test
     steps:
       - name: Clone repository
         run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}

MapView/Dockerfile-test

@@ -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"]

MapView/datasource.py

@@ -39,7 +39,11 @@ class Datasource:
         self.connection_status = None
         self._new_points = []
         self._active_markers = []
-        asyncio.ensure_future(self.connect_to_server())
+
+        try:
+            asyncio.ensure_future(self.connect_to_server())
+        except RuntimeError:
+            Logger.info("No event loop detected, running in offline mode")
 
     def get_new_points(self):
         Logger.debug(self._new_points)

MapView/test-entry.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+PYTHONPATH=$PWD python3 -m unittest tests.test_mp

MapView/tests/test_mp.py

@@ -3,11 +3,10 @@ import sys
 from unittest.mock import Mock
 
 sys.modules['lineMapLayer'] = Mock()
-sys.modules['datasource'] = Mock()
 sys.modules['config'] = Mock()
 
-from MapView.main import get_lat_lon, MapViewApp
-from MapView.datasource import Datasource as DataSourceClass
+from main import get_lat_lon, MapViewApp
+from datasource import Datasource as DataSourceClass
 
 
 # -----------------------
@@ -79,6 +78,52 @@ class TestMapLatLonToProcessedAgentData(unittest.TestCase):
         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 = []
@@ -89,4 +134,4 @@ class TestMapLatLonToProcessedAgentData(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()