Compare commits
3 Commits
8fddabfbe8
...
cf988a0eef
| Author | SHA1 | Date | |
|---|---|---|---|
| cf988a0eef | |||
| 92c0acda2c | |||
| 058aac36c7 |
@@ -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)
|
||||
|
||||
@@ -3,7 +3,6 @@ import sys
|
||||
from unittest.mock import Mock
|
||||
|
||||
sys.modules['lineMapLayer'] = Mock()
|
||||
sys.modules['datasource'] = Mock()
|
||||
sys.modules['config'] = Mock()
|
||||
|
||||
from main import get_lat_lon, MapViewApp
|
||||
@@ -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 = []
|
||||
|
||||
Reference in New Issue
Block a user