fix: adapt tests to new multiprocessing

Author: Gigaszi

mapswipe_workers/tests/unittests/test_process_mapillary.py

@@ -53,6 +53,7 @@ def setUp(self):
         )
         self.empty_polygon = Polygon()
         self.empty_geometry = GeometryCollection()
+        self.row = pd.Series({"x": 1, "y": 1, "z": self.level})
 
     def test_create_tiles_with_valid_polygon(self):
         tiles = create_tiles(self.test_polygon, self.level)
@@ -171,26 +172,26 @@ def test_download_and_process_tile_success(self, mock_get, mock_vt2geojson):
 
         row = {"x": 1, "y": 1, "z": 14}
 
-        result = download_and_process_tile(row)
+        polygon = wkt.loads("POLYGON ((-1 -1, -1 1, 1 1, 1 -1, -1 -1))")
 
+        result = download_and_process_tile(row, polygon, {})
         self.assertIsInstance(result, pd.DataFrame)
         self.assertEqual(len(result), 1)
         self.assertEqual(result["geometry"][0].wkt, "POINT (0 0)")
 
     @patch("mapswipe_workers.utils.process_mapillary.requests.get")
     def test_download_and_process_tile_failure(self, mock_get):
-        # Mock a failed response
+
         mock_response = MagicMock()
         mock_response.status_code = 500
         mock_get.return_value = mock_response
 
-        row = pd.Series({"x": 1, "y": 1, "z": self.level})
-        result = download_and_process_tile(row)
+        result = download_and_process_tile(self.row, self.test_polygon, {})
 
         self.assertIsNone(result)
 
-    @patch("mapswipe_workers.utils.process_mapillary.download_and_process_tile")
-    def test_coordinate_download(self, mock_download_and_process_tile):
+    @patch("mapswipe_workers.utils.process_mapillary.get_mapillary_data")
+    def test_download_and_process_tile_spatial_filtering(self, mock_get_mapillary_data):
         inside_points = [
             (0.2, 0.2),
             (0.5, 0.5),
@@ -208,20 +209,20 @@ def test_coordinate_download(self, mock_download_and_process_tile):
             for x, y in points
         ]
 
-        mock_download_and_process_tile.return_value = pd.DataFrame(data)
+        mock_get_mapillary_data.return_value = pd.DataFrame(data)
 
-        metadata = coordinate_download(self.test_polygon, self.level)
+        metadata = download_and_process_tile(self.row, self.test_polygon, {})
 
         metadata = metadata.drop_duplicates()
         self.assertEqual(len(metadata), len(inside_points))
 
         self.assertIsInstance(metadata, pd.DataFrame)
 
-    @patch("mapswipe_workers.utils.process_mapillary.download_and_process_tile")
-    def test_coordinate_download_with_failures(self, mock_download_and_process_tile):
-        mock_download_and_process_tile.return_value = pd.DataFrame()
+    @patch("mapswipe_workers.utils.process_mapillary.parallelized_processing")
+    def test_coordinate_download_with_failures(self, mock_parallelized_processing):
+        mock_parallelized_processing.return_value = pd.DataFrame()
 
-        metadata = coordinate_download(self.test_polygon, self.level)
+        metadata = coordinate_download(self.test_polygon, self.level, {})
 
         self.assertTrue(metadata.empty)
 
@@ -284,7 +285,7 @@ def test_filter_missing_columns(self):
             "is_pano",
             "organization_id",
             "captured_at",
-        ]  # Add your column names here
+        ]
         for column in columns_to_check:
             df_copy = self.fixture_df.copy()
             df_copy[column] = None
@@ -302,33 +303,6 @@ def test_get_image_metadata(self, mock_coordinate_download):
         self.assertIn("ids", result)
         self.assertIn("geometries", result)
 
-    @patch("mapswipe_workers.utils.process_mapillary.coordinate_download")
-    def test_get_image_metadata_filtering(self, mock_coordinate_download):
-        mock_coordinate_download.return_value = self.fixture_df
-
-        params = {
-            "is_pano": True,
-            "start_time": "2016-01-20 00:00:00",
-            "end_time": "2022-01-21 23:59:59",
-        }
-
-        result = get_image_metadata(self.fixture_data, **params)
-        self.assertIsInstance(result, dict)
-        self.assertIn("ids", result)
-        self.assertIn("geometries", result)
-
-    @patch("mapswipe_workers.utils.process_mapillary.coordinate_download")
-    def test_get_image_metadata_no_rows(self, mock_coordinate_download):
-        mock_coordinate_download.return_value = self.fixture_df
-
-        params = {
-            "is_pano": True,
-            "start_time": "1916-01-20 00:00:00",
-            "end_time": "1922-01-21 23:59:59",
-        }
-        with self.assertRaises(ValueError):
-            get_image_metadata(self.fixture_data, **params)
-
     @patch("mapswipe_workers.utils.process_mapillary.coordinate_download")
     def test_get_image_metadata_empty_response(self, mock_coordinate_download):
         df = self.fixture_df.copy()
@@ -338,13 +312,9 @@ def test_get_image_metadata_empty_response(self, mock_coordinate_download):
         with self.assertRaises(ValueError):
             get_image_metadata(self.fixture_data)
 
-    @patch("mapswipe_workers.utils.process_mapillary.filter_results")
     @patch("mapswipe_workers.utils.process_mapillary.coordinate_download")
-    def test_get_image_metadata_size_restriction(
-        self, mock_coordinate_download, mock_filter_results
-    ):
-        mock_filter_results.return_value = pd.DataFrame({"ID": range(1, 100002)})
-        mock_coordinate_download.return_value = self.fixture_df
+    def test_get_image_metadata_size_restriction(self, mock_coordinate_download):
+        mock_coordinate_download.return_value = pd.DataFrame({"ID": range(1, 100002)})
 
         with self.assertRaises(ValueError):
             get_image_metadata(self.fixture_data)