Add some more tests

Author: jsignell

pystac/collection.py

@@ -734,7 +734,7 @@ def get_item(self, id: str, recursive: bool = False) -> Item | None:
             raise e
 
     @property
-    def item_assets(self) -> dict[str, ItemAssetDefinition] | None:
+    def item_assets(self) -> dict[str, ItemAssetDefinition]:
         """Accessor for `item_assets
         <https://github.com/radiantearth/stac-spec/blob/v1.1.0/collection-spec/collection-spec.md#item_assets>`__
         on this collection.
@@ -763,14 +763,14 @@ def item_assets(self) -> dict[str, ItemAssetDefinition] | None:
 
         .. code-block:: python
 
-            >>> collection.item_assets["B4"] = {
-                'type': 'image/tiff; application=geotiff; profile=cloud-optimized',
-                'eo:bands': [{'name': 'B4', 'common_name': 'red'}]
-            }
-            >>> collection.item_assets["B4"].owner == collection
-            True
+           >>> collection.item_assets["B4"] = {
+               'type': 'image/tiff; application=geotiff; profile=cloud-optimized',
+               'eo:bands': [{'name': 'B4', 'common_name': 'red'}]
+           }
+           >>> collection.item_assets["B4"].owner == collection
+           True
         """
-        if self._item_assets is None and "item_assets" in self.extra_fields:
+        if self._item_assets is None:
             self._item_assets = _ItemAssets(self)
         return self._item_assets
 

pystac/extensions/item_assets.py

@@ -22,8 +22,21 @@
 
 
 class AssetDefinition(ItemAssetDefinition):
+    """
+    DEPRECATED
+
+    .. deprecated:: 1.12.0
+        Use :class:`~pystac.ItemAssetDefinition` instead.
+    """
+
     def __init__(cls, *args: Any, **kwargs: Any) -> None:
-        # TODO: deprecation warning in here.
+        warnings.warn(
+            (
+                "``AssetDefinition`` is deprecated. "
+                "Please use ``pystac.ItemAssetDefinition`` instead."
+            ),
+            DeprecationWarning,
+        )
         super().__init__(*args, **kwargs)
 
 

tests/test_item_assets.py

@@ -4,7 +4,7 @@
 
 from pystac import Collection
 from pystac.errors import DeprecatedWarning
-from pystac.extensions.item_assets import ItemAssetsExtension
+from pystac.extensions.item_assets import AssetDefinition, ItemAssetsExtension
 from pystac.item_assets import ItemAssetDefinition
 from tests.utils import TestCases
 
@@ -23,7 +23,6 @@ def setUp(self) -> None:
     def test_example(self) -> None:
         collection = self.collection.clone()
 
-        assert collection.item_assets
         self.assertEqual(len(collection.item_assets), 13)
 
         self.assertEqual(
@@ -48,7 +47,6 @@ def test_example(self) -> None:
     def test_set_using_dict(self) -> None:
         collection = self.collection.clone()
 
-        assert collection.item_assets
         self.assertEqual(len(collection.item_assets), 13)
 
         collection.item_assets["Bx"] = {
@@ -75,6 +73,9 @@ def setUp(self) -> None:
             TestCases.get_path("data-files/item-assets/example-landsat8.json")
         )
 
+    def test_eq(self) -> None:
+        assert self.collection.item_assets["B1"] != {"title": "Coastal Band (B1)"}
+
     def test_create(self) -> None:
         title = "Coastal Band (B1)"
         description = "Coastal Band Top Of the Atmosphere"
@@ -124,6 +125,25 @@ def test_roles(self) -> None:
         self.assertEqual(asset_defn.roles, roles)
         self.assertEqual(asset_defn.to_dict()["roles"], roles)
 
+    def test_set_owner(self) -> None:
+        asset_definition = ItemAssetDefinition(
+            {
+                "type": "image/tiff; application=geotiff",
+                "eo:bands": [
+                    {
+                        "name": "B1",
+                        "common_name": "coastal",
+                        "center_wavelength": 0.44,
+                        "full_width_half_max": 0.02,
+                    }
+                ],
+                "title": "Coastal Band (B1)",
+                "description": "Coastal Band Top Of the Atmosphere",
+            }
+        )
+        asset_definition.set_owner(self.collection)
+        assert asset_definition.owner == self.collection
+
 
 def test_extra_fields(collection: Collection) -> None:
     asset_definition = ItemAssetDefinition.create(
@@ -133,7 +153,10 @@ def test_extra_fields(collection: Collection) -> None:
         roles=None,
         extra_fields={"raster:bands": [{"nodata": 42}]},
     )
+
     collection.item_assets = {"data": asset_definition}
+    assert collection.item_assets["data"].owner == collection
+
     collection_as_dict = collection.to_dict()
     assert collection_as_dict["item_assets"]["data"]["raster:bands"] == [{"nodata": 42}]
     asset = asset_definition.create_asset("asset.tif")
@@ -147,19 +170,65 @@ def test_extra_fields(collection: Collection) -> None:
     assert collection.ext.has("raster")
 
 
+def test_set_item_asset(collection: Collection) -> None:
+    asset_definition = ItemAssetDefinition.create(
+        title=None,
+        description=None,
+        media_type=None,
+        roles=None,
+        extra_fields={"raster:bands": [{"nodata": 42}]},
+    )
+
+    collection.item_assets["data"] = asset_definition
+    assert collection.item_assets["data"].owner == collection
+
+
 def test_item_assets_extension_is_deprecated() -> None:
     collection = Collection.from_file(CLASSIFICATION_COLLECTION_RASTER_URI)
 
     assert ItemAssetsExtension.get_schema_uri() not in collection.stac_extensions
 
     with pytest.warns(DeprecatedWarning, match="top-level property of"):
-        item_asset = ItemAssetsExtension.ext(
-            collection, add_if_missing=True
-        ).item_assets["cloud-mask-raster"]
+        item_asset_ext = ItemAssetsExtension.ext(collection, add_if_missing=True)
+        item_asset = item_asset_ext.item_assets["cloud-mask-raster"]
+
+    assert collection.id in repr(item_asset_ext)
 
     assert item_asset.ext.has("eo")
 
     with pytest.warns(DeprecatedWarning, match="top-level property of"):
         assert collection.ext.item_assets["cloud-mask-raster"].ext.has("eo")
 
     assert ItemAssetsExtension.get_schema_uri() in collection.stac_extensions
+
+    with pytest.warns(DeprecationWarning):
+        asset_definition = AssetDefinition(
+            {"title": "Thumbnail image", "type": "image/jpeg"}
+        )
+    item_asset_ext.item_assets["thumbnail"] = asset_definition
+
+
+def test_item_assets_extension_asset_definition_is_deprecated() -> None:
+    with pytest.warns(
+        DeprecationWarning, match="Please use ``pystac.ItemAssetDefinition``"
+    ):
+        asset_definition = AssetDefinition(
+            {
+                "type": "image/tiff; application=geotiff",
+                "eo:bands": [
+                    {
+                        "name": "B1",
+                        "common_name": "coastal",
+                        "center_wavelength": 0.44,
+                        "full_width_half_max": 0.02,
+                    }
+                ],
+                "title": "Coastal Band (B1)",
+                "description": "Coastal Band Top Of the Atmosphere",
+            }
+        )
+
+    assert asset_definition.title == "Coastal Band (B1)"
+    assert asset_definition.ext.eo.bands
+    assert asset_definition.ext.eo.bands[0].name == "B1"
+    assert asset_definition.owner is None