fix: change tests to use spring/water well fixtures

Author: jacob-a-brown

api/thing.py

@@ -82,7 +82,6 @@ def database_error_handler(
     """
 
     error_message = error.orig.args[0]["M"]
-    print(error_message)
 
     if (
         error_message

tests/test_asset.py

@@ -86,9 +86,9 @@ def test_upload_asset():
         assert "storage_path" in data
 
 
-def test_add_asset(thing):
+def test_add_asset(water_well_thing):
     payload = {
-        "thing_id": thing.id,
+        "thing_id": water_well_thing.id,
         "name": "test_asset.png",
         "label": "Test Asset",
         "uri": "https://storage.googleapis.com/mock-bucket/mock-asset",
@@ -114,7 +114,7 @@ def test_add_asset(thing):
     cleanup_post_test(Asset, data["id"])
 
 
-def test_add_asset_409_bad_thing_id(thing):
+def test_add_asset_409_bad_thing_id(water_well_thing):
     bad_thing_id = 99999
     payload = {
         "thing_id": bad_thing_id,
@@ -160,9 +160,9 @@ def test_get_assets(asset, asset_with_associated_thing):
     assert data["items"][1]["signed_url"] == None
 
 
-def test_get_assets_thing_id(asset_with_associated_thing, thing):
+def test_get_assets_thing_id(asset_with_associated_thing, water_well_thing):
     with patch("api.asset.get_storage_bucket", return_value=MockStorageBucket()):
-        query_parameters = {"thing_id": thing.id}
+        query_parameters = {"thing_id": water_well_thing.id}
         response = client.get("/asset", params=query_parameters)
         assert response.status_code == 200
         data = response.json()

tests/test_contact.py

@@ -59,11 +59,11 @@ def test_validate_email():
 # ADD tests ====================================================================
 
 
-def test_add_contact(thing):
+def test_add_contact(spring_thing):
     payload = {
         "name": "Test Contact 2",
         "role": "Owner",
-        "thing_id": thing.id,
+        "thing_id": spring_thing.id,
         "emails": [{"email": "testcontact2@gmail.com", "email_type": "Primary"}],
         "phones": [{"phone_number": "+14153334444", "phone_type": "Primary"}],
         "addresses": [

tests/test_geospatial.py

@@ -102,6 +102,8 @@ def populate():
         session.delete(loc1)
         session.delete(loc2)
         session.delete(group)
+        session.delete(thing1)
+        session.delete(thing2)
         session.commit()
 
 
@@ -112,7 +114,6 @@ def test_get_project_area():
     assert "type" in data
     assert data["type"] == "FeatureCollection"
     assert "features" in data
-    print(data)
     assert len(data["features"]) > 0
     assert data["features"][0]["properties"]["group_id"] == 1
     assert data["features"][0]["properties"]["group_name"] == "Test Group Foo"

tests/test_observation.py

@@ -429,10 +429,13 @@ def test_get_groundwater_observation_by_sample(sample):
     assert len(items) > 0, "Expected at least one groundwater observation for the thing"
 
 
-def test_get_groundwater_observation_by_thing(thing):
+def test_get_groundwater_observation_by_thing(water_well_thing):
     response = client.get(
         "/observation/groundwater-level",
-        params={"thing_id": thing.id, "observed_property": "groundwater level"},
+        params={
+            "thing_id": water_well_thing.id,
+            "observed_property": "groundwater level",
+        },
     )
     assert response.status_code == 200
     data = response.json()

tests/test_sample.py

@@ -53,12 +53,12 @@ def test_validate_sample_top_and_bottom():
 
 
 #  ============= Post tests for samples =============================================
-def test_add_sample(thing, sensor):
+def test_add_sample(spring_thing, sensor):
     """
     Test adding a sample.
     """
     payload = {
-        "thing_id": thing.id,
+        "thing_id": spring_thing.id,
         "sample_type": "groundwater",
         "field_sample_id": "FS-1234567",
         "sample_date": "2025-01-01T00:00:00Z",
@@ -96,12 +96,12 @@ def test_add_sample(thing, sensor):
     cleanup_post_test(Sample, data["id"])
 
 
-def test_409_add_sample_invalid_field_sample_id(sample, thing):
+def test_409_add_sample_invalid_field_sample_id(sample, spring_thing):
     """
     Test adding a sample with an invalid field_sample_id.
     """
     payload = {
-        "thing_id": thing.id,
+        "thing_id": spring_thing.id,
         "sample_type": "groundwater",
         "field_sample_id": sample.field_sample_id,  # This should already exist
         "sample_date": "2025-01-01T00:00:00Z",

tests/test_search.py

@@ -22,14 +22,14 @@
 from tests import client
 
 
-def test_search_api(thing, contact, email, phone, address):
+def test_search_api(water_well_thing, spring_thing, contact):
     response = client.get("/search", params={"q": "Test"})
     assert response.status_code == 200
     data = response.json()
     assert isinstance(data, dict)
     items = data.get("items")
     assert isinstance(items, list)
-    assert len(items) == 2
+    assert len(items) == 3
 
 
 @pytest.mark.skip(reason="This test is not working .")

tests/test_thing.py

@@ -540,7 +540,6 @@ def test_get_things(water_well_thing, spring_thing):
     response = client.get("/thing")
     assert response.status_code == 200
     data = response.json()
-    print(data)
     assert data["total"] == 2
 
     assert data["items"][0]["id"] == water_well_thing.id