fix aggregate_spatial dummycube tests Open-EO/openeo-geopyspark-driver#577

Author: JeroenVerstraelen

tests/test_dry_run.py

@@ -1076,14 +1076,14 @@ def test_aggregate_spatial_read_vector(dry_run_env, dry_run_tracer):
     source_constraints = dry_run_tracer.get_source_constraints(merge=True)
     assert len(source_constraints) == 1
     src, constraints = source_constraints[0]
+    (geometries,) = dry_run_tracer.get_geometries()
     assert src == ("load_collection", ("S2_FOOBAR", ()))
     assert constraints == {
         "spatial_extent": {"west": 5.05, "south": 51.21, "east": 5.15, "north": 51.3, "crs": "EPSG:4326"},
-        "aggregate_spatial": {"geometries": DelayedVector(geometry_path)},
+        "aggregate_spatial": {"geometries": geometries},
         "weak_spatial_extent": {"crs": "EPSG:4326", "east": 5.15, "north": 51.3, "south": 51.21, "west": 5.05},
     }
-    geometries, = dry_run_tracer.get_geometries()
-    assert isinstance(geometries, DelayedVector)
+    assert isinstance(geometries, DriverVectorCube)
 
 
 def test_aggregate_spatial_get_geometries_feature_collection(
@@ -1605,7 +1605,7 @@ def test_CropSAR_aggregate_spatial_constraint(dry_run_env, dry_run_tracer):
         assert len(constraints_with_geometry) == 3
 
         for _, constraints in constraints_with_geometry:
-            assert constraints['aggregate_spatial']['geometries'].path == geometry_path
+            assert isinstance(constraints["aggregate_spatial"]["geometries"], DriverVectorCube)
     finally:
         del process_registry_100._processes['test', 'CropSAR']
 

tests/test_views_execute.py

@@ -1268,11 +1268,13 @@ def test_read_vector(api):
     )
     resp = api.check_result(process_graph)
     assert b'NaN' not in resp.data
-    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.345]], "2015-08-22T00:00:00Z": [[None], [None]]}
+    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.0]], "2015-08-22T00:00:00Z": [[None], [3.0]]}
     params = dummy_backend.last_load_collection_call('PROBAV_L3_S10_TOC_NDVI_333M_V2')
     assert params["spatial_extent"] == {"west": 5, "south": 51, "east": 6, "north": 52, "crs": 'EPSG:4326'}
     assert params["temporal_extent"] == ('2017-11-21', '2017-12-21')
-    assert params["aggregate_spatial_geometries"] == DelayedVector(geometry_filename)
+    assert isinstance(params["aggregate_spatial_geometries"], DriverVectorCube)
+    assert len(params["aggregate_spatial_geometries"].get_cube()) == 2
+    assert len(params["aggregate_spatial_geometries"].get_geometries()) == 2
 
 
 def test_read_vector_no_load_collection_spatial_extent(api):
@@ -1284,11 +1286,12 @@ def test_read_vector_no_load_collection_spatial_extent(api):
     )
     resp = api.check_result(process_graph)
     assert b'NaN' not in resp.data
-    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.345]], "2015-08-22T00:00:00Z": [[None], [None]]}
+    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.0]], "2015-08-22T00:00:00Z": [[None], [3.0]]}
     params = dummy_backend.last_load_collection_call('PROBAV_L3_S10_TOC_NDVI_333M_V2')
     assert params["spatial_extent"] == {"west": 5.05, "south": 51.21, "east": 5.15, "north": 51.3, "crs": 'EPSG:4326'}
     assert params["temporal_extent"] == ('2017-11-21', '2017-12-21')
-    assert params["aggregate_spatial_geometries"] == DelayedVector(geometry_filename)
+    assert len(params["aggregate_spatial_geometries"].get_cube()) == 2
+    assert len(params["aggregate_spatial_geometries"].get_geometries()) == 2
 
 
 @pytest.mark.parametrize("udf_code", [
@@ -1595,13 +1598,10 @@ def test_load_collection_without_spatial_extent_incorporates_read_vector_extent(
         preprocess=lambda s: s.replace("PLACEHOLDER", str(get_path("geojson/GeometryCollection01.json")))
     )
     resp = api.check_result(process_graph)
-    assert b'NaN' not in resp.data
-    assert resp.json == {
-        "2015-07-06T00:00:00Z": [[2.345], [2.345]],
-        "2015-08-22T00:00:00Z": [[None], [None]]
-    }
-    params = dummy_backend.last_load_collection_call('PROBAV_L3_S10_TOC_NDVI_333M_V2')
-    assert params["spatial_extent"] == {"west": 5.05, "south": 51.21, "east": 5.15, "north": 51.3, "crs": 'EPSG:4326'}
+    assert b"NaN" not in resp.data
+    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.0]], "2015-08-22T00:00:00Z": [[None], [3.0]]}
+    params = dummy_backend.last_load_collection_call("PROBAV_L3_S10_TOC_NDVI_333M_V2")
+    assert params["spatial_extent"] == {"west": 5.05, "south": 51.21, "east": 5.15, "north": 51.3, "crs": "EPSG:4326"}
 
 
 def test_read_vector_from_feature_collection(api):
@@ -1610,13 +1610,10 @@ def test_read_vector_from_feature_collection(api):
         preprocess=lambda s: s.replace("PLACEHOLDER", str(get_path("geojson/FeatureCollection01.json")))
     )
     resp = api.check_result(process_graph)
-    assert b'NaN' not in resp.data
-    assert resp.json == {
-        "2015-07-06T00:00:00Z": [[2.345], [2.345]],
-        "2015-08-22T00:00:00Z": [[None], [None]]
-    }
-    params = dummy_backend.last_load_collection_call('PROBAV_L3_S10_TOC_NDVI_333M_V2')
-    assert params["spatial_extent"] == {"west": 5, "south": 51, "east": 6, "north": 52, "crs": 'EPSG:4326'}
+    assert b"NaN" not in resp.data
+    assert resp.json == {"2015-07-06T00:00:00Z": [[2.345], [2.0]], "2015-08-22T00:00:00Z": [[None], [3.0]]}
+    params = dummy_backend.last_load_collection_call("PROBAV_L3_S10_TOC_NDVI_333M_V2")
+    assert params["spatial_extent"] == {"west": 5, "south": 51, "east": 6, "north": 52, "crs": "EPSG:4326"}
 
 
 class TestVectorCubeLoading: