993 refactor & cleanup

Author: teks

tests/extensions/test_grid.py

@@ -17,7 +17,12 @@
 
 code = "MGRS-4CFJ"
 
-SENTINEL_EXAMPLE_URI = TestCases.get_path("data-files/grid/example-sentinel2.json")
+
+@pytest.fixture
+def sentinel2_example_item() -> pystac.Item:
+    return pystac.Item.from_file(
+        TestCases.get_path("data-files/grid/example-sentinel2.json")
+    )
 
 
 @pytest.fixture
@@ -111,9 +116,9 @@ def test_clear_code(item: pystac.Item) -> None:
         GridExtension.ext(item).code = "EPSG:4326"
 
 
-def test_extension_not_implemented() -> None:
+def test_extension_not_implemented(sentinel2_example_item: pystac.Item) -> None:
     # Should raise exception if Item does not include extension URI
-    item = pystac.Item.from_file(SENTINEL_EXAMPLE_URI)
+    item = sentinel2_example_item
     item.stac_extensions.remove(GridExtension.get_schema_uri())
 
     with pytest.raises(pystac.ExtensionNotImplemented):
@@ -126,8 +131,8 @@ def test_extension_not_implemented() -> None:
         _ = GridExtension.ext(item)
 
 
-def test_item_ext_add_to() -> None:
-    item = pystac.Item.from_file(SENTINEL_EXAMPLE_URI)
+def test_item_ext_add_to(sentinel2_example_item: pystac.Item) -> None:
+    item = sentinel2_example_item
     item.stac_extensions.remove(GridExtension.get_schema_uri())
     assert GridExtension.get_schema_uri() not in item.stac_extensions
 

tests/extensions/test_projection.py

@@ -78,6 +78,11 @@ def example_uri() -> str:
     return TestCases.get_path("data-files/projection/example-landsat8.json")
 
 
+@pytest.fixture
+def proj_item(example_uri: str) -> Item:
+    return pystac.Item.from_file(example_uri)
+
+
 @pytest.fixture
 def example_summaries_uri() -> str:
     return TestCases.get_path("data-files/projection/collection-with-summaries.json")
@@ -107,25 +112,20 @@ def test_apply() -> None:
 
 
 @pytest.mark.vcr()
-def test_partial_apply(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_partial_apply(proj_item: Item) -> None:
     ProjectionExtension.ext(proj_item).apply(epsg=1111)
 
     assert ProjectionExtension.ext(proj_item).epsg == 1111
     proj_item.validate()
 
 
 @pytest.mark.vcr()
-def test_validate_proj(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.validate()
+def test_validate_proj(proj_item: Item) -> None:
+    proj_item.validate()
 
 
 @pytest.mark.vcr()
-def test_epsg(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_epsg(proj_item: Item) -> None:
     # Get
     assert "proj:epsg" not in proj_item.properties
     assert "proj:code" in proj_item.properties
@@ -175,9 +175,7 @@ def test_optional_epsg() -> None:
 
 
 @pytest.mark.vcr()
-def test_wkt2(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_wkt2(proj_item: Item) -> None:
     # Get
     assert "proj:wkt2" in proj_item.properties
     proj_wkt2 = ProjectionExtension.ext(proj_item).wkt2
@@ -210,9 +208,7 @@ def test_wkt2(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_projjson(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_projjson(proj_item: Item) -> None:
     # Get
     assert "proj:projjson" in proj_item.properties
     proj_projjson = ProjectionExtension.ext(proj_item).projjson
@@ -254,18 +250,17 @@ def test_projjson(example_uri: str) -> None:
         proj_item.validate()
 
 
-def test_crs_string(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    ProjectionExtension.remove_from(item)
-    for key in list(item.properties.keys()):
+def test_crs_string(proj_item: Item) -> None:
+    ProjectionExtension.remove_from(proj_item)
+    for key in list(proj_item.properties.keys()):
         if key.startswith("proj:"):
-            item.properties.pop(key)
-    assert item.properties.get("proj:code") is None
-    assert item.properties.get("proj:epsg") is None
-    assert item.properties.get("proj:wkt2") is None
-    assert item.properties.get("proj:projjson") is None
+            proj_item.properties.pop(key)
+    assert proj_item.properties.get("proj:code") is None
+    assert proj_item.properties.get("proj:epsg") is None
+    assert proj_item.properties.get("proj:wkt2") is None
+    assert proj_item.properties.get("proj:projjson") is None
 
-    projection = ProjectionExtension.ext(item, add_if_missing=True)
+    projection = ProjectionExtension.ext(proj_item, add_if_missing=True)
     assert projection.crs_string is None
 
     projection.projjson = PROJJSON
@@ -282,9 +277,7 @@ def test_crs_string(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_geometry(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_geometry(proj_item: Item) -> None:
     # Get
     assert "proj:geometry" in proj_item.properties
     proj_geometry = ProjectionExtension.ext(proj_item).geometry
@@ -324,9 +317,7 @@ def test_geometry(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_bbox(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_bbox(proj_item: Item) -> None:
     # Get
     assert "proj:bbox" in proj_item.properties
     proj_bbox = ProjectionExtension.ext(proj_item).bbox
@@ -359,9 +350,7 @@ def test_bbox(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_centroid(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_centroid(proj_item: Item) -> None:
     # Get
     assert "proj:centroid" in proj_item.properties
     proj_centroid = ProjectionExtension.ext(proj_item).centroid
@@ -400,9 +389,7 @@ def test_centroid(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_shape(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_shape(proj_item: Item) -> None:
     # Get
     assert "proj:shape" in proj_item.properties
     proj_shape = ProjectionExtension.ext(proj_item).shape
@@ -436,9 +423,7 @@ def test_shape(example_uri: str) -> None:
 
 
 @pytest.mark.vcr()
-def test_transform(example_uri: str) -> None:
-    proj_item = pystac.Item.from_file(example_uri)
-
+def test_transform(proj_item: Item) -> None:
     # Get
     assert "proj:transform" in proj_item.properties
     proj_transform = ProjectionExtension.ext(proj_item).transform
@@ -481,16 +466,15 @@ def test_transform(example_uri: str) -> None:
     proj_item.validate()
 
 
-def test_extension_not_implemented(example_uri: str) -> None:
+def test_extension_not_implemented(proj_item: Item) -> None:
     # Should raise exception if Item does not include extension URI
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
+    proj_item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
 
     with pytest.raises(pystac.ExtensionNotImplemented):
-        _ = ProjectionExtension.ext(item)
+        _ = ProjectionExtension.ext(proj_item)
 
     # Should raise exception if owning Item does not include extension URI
-    asset = item.assets["B8"]
+    asset = proj_item.assets["B8"]
 
     with pytest.raises(pystac.ExtensionNotImplemented):
         _ = ProjectionExtension.ext(asset)
@@ -500,25 +484,23 @@ def test_extension_not_implemented(example_uri: str) -> None:
     _ = ProjectionExtension.ext(ownerless_asset)
 
 
-def test_item_ext_add_to(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
-    assert ProjectionExtension.get_schema_uri() not in item.stac_extensions
+def test_item_ext_add_to(proj_item: Item) -> None:
+    proj_item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
+    assert ProjectionExtension.get_schema_uri() not in proj_item.stac_extensions
 
-    _ = ProjectionExtension.ext(item, add_if_missing=True)
+    _ = ProjectionExtension.ext(proj_item, add_if_missing=True)
 
-    assert ProjectionExtension.get_schema_uri() in item.stac_extensions
+    assert ProjectionExtension.get_schema_uri() in proj_item.stac_extensions
 
 
-def test_asset_ext_add_to(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
-    assert ProjectionExtension.get_schema_uri() not in item.stac_extensions
-    asset = item.assets["B8"]
+def test_asset_ext_add_to(proj_item: Item) -> None:
+    proj_item.stac_extensions.remove(ProjectionExtension.get_schema_uri())
+    assert ProjectionExtension.get_schema_uri() not in proj_item.stac_extensions
+    asset = proj_item.assets["B8"]
 
     _ = ProjectionExtension.ext(asset, add_if_missing=True)
 
-    assert ProjectionExtension.get_schema_uri() in item.stac_extensions
+    assert ProjectionExtension.get_schema_uri() in proj_item.stac_extensions
 
 
 def test_should_raise_exception_when_passing_invalid_extension_object() -> None:

tests/extensions/test_table.py

@@ -9,26 +9,24 @@
 
 
 @pytest.fixture
-def example_uri() -> str:
-    return TestCases.get_path("data-files/table/item.json")
+def table_item() -> Item:
+    return pystac.Item.from_file(TestCases.get_path("data-files/table/item.json"))
 
 
 @pytest.mark.vcr()
-def test_validate(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.validate()
+def test_validate(table_item: Item) -> None:
+    table_item.validate()
 
 
-def test_extension_not_implemented(example_uri: str) -> None:
+def test_extension_not_implemented(table_item: Item) -> None:
     # Should raise exception if item does not include extension URI
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(TableExtension.get_schema_uri())
+    table_item.stac_extensions.remove(TableExtension.get_schema_uri())
 
     with pytest.raises(pystac.ExtensionNotImplemented):
-        _ = TableExtension.ext(item)
+        _ = TableExtension.ext(table_item)
 
     # Should raise exception if owning item does not include extension URI
-    asset = item.assets["data"]
+    asset = table_item.assets["data"]
 
     with pytest.raises(pystac.ExtensionNotImplemented):
         _ = TableExtension.ext(asset)
@@ -38,24 +36,22 @@ def test_extension_not_implemented(example_uri: str) -> None:
     _ = TableExtension.ext(ownerless_asset)
 
 
-def test_item_ext_add_to(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(TableExtension.get_schema_uri())
+def test_item_ext_add_to(table_item: Item) -> None:
+    table_item.stac_extensions.remove(TableExtension.get_schema_uri())
 
-    _ = TableExtension.ext(item, add_if_missing=True)
+    _ = TableExtension.ext(table_item, add_if_missing=True)
 
-    assert TableExtension.get_schema_uri() in item.stac_extensions
+    assert TableExtension.get_schema_uri() in table_item.stac_extensions
 
 
-def test_asset_ext_add_to(example_uri: str) -> None:
-    item = pystac.Item.from_file(example_uri)
-    item.stac_extensions.remove(TableExtension.get_schema_uri())
+def test_asset_ext_add_to(table_item: Item) -> None:
+    table_item.stac_extensions.remove(TableExtension.get_schema_uri())
 
-    assert TableExtension.get_schema_uri() not in item.stac_extensions
-    asset = item.assets["data"]
+    assert TableExtension.get_schema_uri() not in table_item.stac_extensions
+    asset = table_item.assets["data"]
 
     _ = TableExtension.ext(asset, add_if_missing=True)
-    assert TableExtension.get_schema_uri() in item.stac_extensions
+    assert TableExtension.get_schema_uri() in table_item.stac_extensions
 
 
 def test_should_raise_when_passing_invalid_extension_object() -> None:
@@ -68,17 +64,16 @@ def test_should_raise_when_passing_invalid_extension_object() -> None:
 
 def test_item_with_table_extension_is_serilalizable_and_roundtrips(
     tmp_path: Path,
+    table_item: Item,
 ) -> None:
-    example_uri = TestCases.get_path("data-files/table/item.json")
-    item = pystac.Item.from_file(example_uri)
     # add column metadata
-    tab_ext = TableExtension.ext(item, add_if_missing=True)
+    tab_ext = TableExtension.ext(table_item, add_if_missing=True)
     columns = [
         Column({"name": "col_1", "type": "str"}),
         Column({"name": "col_2", "type": "byte_array"}),
     ]
     tab_ext.columns = columns
-    item.save_object(dest_href=str(tmp_path / "item.json"))
+    table_item.save_object(dest_href=str(tmp_path / "item.json"))
     assert all(isinstance(c, Column) for c in tab_ext.columns)
     assert all(
         before.properties == after.properties
@@ -94,10 +89,9 @@ def test_item_with_table_extension_is_serilalizable_and_roundtrips(
         "https://stac-extensions.github.io/table/v1.1.0/schema.json",
     ),
 )
-def test_migrate(schema_uri: str, item: Item) -> None:
-    item_dict = item.to_dict(include_self_link=False, transform_hrefs=False)
+def test_migrate(schema_uri: str, table_item: Item) -> None:
+    item_dict = table_item.to_dict(include_self_link=False, transform_hrefs=False)
     item_dict["stac_extensions"] = [schema_uri]
-    item = Item.from_dict(item_dict, migrate=True)
-    assert item.stac_extensions == [
+    assert Item.from_dict(item_dict, migrate=True).stac_extensions == [
         "https://stac-extensions.github.io/table/v1.2.0/schema.json"
     ]