untangle item_collection and api.item_collectoin tests

stac-utils · Nov 21, 2023 · 48b5d63 · 48b5d63
1 parent f0942c3
commit 48b5d63
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/tests/api/examples/v1.0.0/itemcollection-sample-full.json b/tests/api/examples/v1.0.0/itemcollection-sample-full.json
@@ -1,5 +1,7 @@
 {
     "type": "FeatureCollection",
+    "numberMatched": 10,
+    "numberReturned": 1,
     "features": [
       {
         "stac_version": "1.0.0",

diff --git a/tests/api/extensions/test_fields.py b/tests/api/extensions/test_fields.py
@@ -31,7 +31,7 @@ def test_fields_filter_item():
         bbox=[0, 0, 0, 0],
         type="Feature",
     )
-    print(fields.filter)
+
     d = item.model_dump(**fields.filter)
     assert d.pop("id") == item.id
     assert d.pop("geometry") == item.geometry.model_dump(exclude_unset=True)

diff --git a/tests/api/test_item_collection.py b/tests/api/test_item_collection.py
@@ -1,15 +1,31 @@
 import json
 
-from stac_pydantic import ItemCollection
+import pytest
+
+from stac_pydantic.api import ItemCollection
 from stac_pydantic.api.version import STAC_API_VERSION
 from stac_pydantic.version import STAC_VERSION
 
-from ..conftest import dict_match, request
+from ..conftest import compare_example, dict_match, request
 
 ITEM_COLLECTION = "itemcollection-sample-full.json"
 PATH = ["tests", "api", "examples", f"v{STAC_API_VERSION}"]
 
 
+@pytest.mark.parametrize(
+    "example_url",
+    [
+        f"https://raw.githubusercontent.com/radiantearth/stac-api-spec/v{STAC_API_VERSION}/fragments/itemcollection/examples/itemcollection-sample-full.json",
+        f"https://raw.githubusercontent.com/radiantearth/stac-api-spec/v{STAC_API_VERSION}/fragments/itemcollection/examples/itemcollection-sample-minimal.json",
+    ],
+)
+def test_item_collection_examples(example_url):
+    """
+    Testing the less strict version here, not enforcing required Links
+    """
+    compare_example(example_url, ItemCollection)
+
+
 def test_item_collection():
     test_item_coll = request(ITEM_COLLECTION, PATH)
     for feat in test_item_coll["features"]:
@@ -20,7 +36,6 @@ def test_item_collection():
         dict_match(feat, valid_item_coll["features"][idx])
 
 
-# TODO: REFACTOR
 def test_to_json():
     test_item = request(ITEM_COLLECTION, PATH)
     for feat in test_item["features"]:

diff --git a/tests/api/test_landing_page.py b/tests/api/test_landing_page.py
@@ -57,7 +57,6 @@ def test_landing_page_invalid_features(example_url):
         LandingPage(**example)
 
 
-# TODO: Not sure if this actually does anything??
 @pytest.mark.parametrize("example_url,schema_url", unique_combinations)
 def test_schema(example_url, schema_url):
     rsp_yaml = requests.get(schema_url).text
@@ -70,9 +69,6 @@ def test_schema(example_url, schema_url):
     jsonschema.validate(instance=landing_page, schema=schema)
 
 
-##############
-
-
 def test_api_landing_page():
     LandingPage(
         id="test-landing-page",

diff --git a/tests/test_item_collection.py b/tests/test_item_collection.py
@@ -1,27 +1,17 @@
 import json
 
 from stac_pydantic import ItemCollection
-from stac_pydantic.api.version import STAC_API_VERSION
 from stac_pydantic.version import STAC_VERSION
 
 from .conftest import dict_match, request
 
 ITEM_COLLECTION = "itemcollection-sample-full.json"
-PATH = ["tests", "api", "examples", f"v{STAC_API_VERSION}"]
-
-# TODO sort this out. has extra attributes but missing links
-# @pytest.mark.parametrize("example_url", [f"https://raw.githubusercontent.com/radiantearth/stac-api-spec/v{STAC_API_VERSION}/fragments/itemcollection/examples/itemcollection-sample-full.json",
-#                                          f"https://raw.githubusercontent.com/radiantearth/stac-api-spec/v{STAC_API_VERSION}/fragments/itemcollection/examples/itemcollection-sample-minimal.json"])
-# def test_item_collection_examples(example_url):
-#     """
-#     Testing the less strict version here, not enforcing required Links
-#     """
-#     compare_example(example_url, ItemCollection)
+PATH = ["tests", "example_stac"]
 
 
 def test_item_collection():
     test_item_coll = request(ITEM_COLLECTION, PATH)
-    # test_item_coll["stac_version"] = STAC_VERSION
+
     for feat in test_item_coll["features"]:
         feat["stac_version"] = STAC_VERSION
 
@@ -30,7 +20,6 @@ def test_item_collection():
         dict_match(feat, valid_item_coll["features"][idx])
 
 
-# TODO: REFACTOR
 def test_to_json():
     test_item = request(ITEM_COLLECTION, PATH)
     for feat in test_item["features"]:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311
+envlist = py38,py39,py310,py311,py312
 
 [testenv]
 extras = dev