Skip to content

Commit b8ac36e

Browse files
committed
fixup! Issue #793/#794 preserve "item_id" column for now
1 parent 3130384 commit b8ac36e

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

tests/extra/job_management/test_stac_job_db.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,14 @@ def dummy_stac_item() -> pystac.Item:
166166
)
167167

168168

169-
@pytest.fixture
170-
def dummy_series_no_item_id() -> pd.Series:
171-
return pd.Series({"datetime": "2020-05-22T00:00:00Z", "some_property": "value"}, name="test")
172-
173-
174169

175170
@pytest.fixture
176171
def bulk_dataframe():
177172
return pd.DataFrame(
178-
index=[f"test-{i}" for i in range(10)],
173+
index=[f"item-{i}" for i in range(10)],
179174
data={
175+
"datetime": [f"2020-{i + 1:02d}-01" for i in range(10)],
180176
"some_property": [f"value-{i}" for i in range(10)],
181-
"datetime": [f"2020-{i+1:02d}-01" for i in range(10)],
182177
},
183178
)
184179

@@ -295,8 +290,25 @@ def test_initialize_from_df_with_geometry(self, mock_persists, job_db_not_exists
295290
assert job_db_not_exists.has_geometry == True
296291
assert job_db_not_exists.geometry_column == "geometry"
297292

298-
def test_series_from(self, job_db_exists, dummy_series_no_item_id, dummy_stac_item):
299-
pdt.assert_series_equal(job_db_exists.series_from(dummy_stac_item), dummy_series_no_item_id)
293+
@pytest.mark.parametrize(
294+
["item", "expected"],
295+
[
296+
(
297+
_pystac_item(
298+
id="item-123",
299+
properties={"some_property": "value"},
300+
datetime_=datetime.datetime(2020, 5, 22),
301+
),
302+
pd.Series(
303+
name="item-123",
304+
data={"some_property": "value", "datetime": "2020-05-22T00:00:00Z"},
305+
),
306+
),
307+
],
308+
)
309+
def test_series_from(self, job_db_exists, item, expected):
310+
actual = job_db_exists.series_from(item)
311+
pdt.assert_series_equal(actual, expected)
300312

301313
@pytest.mark.parametrize(
302314
["series", "expected"],

0 commit comments

Comments
 (0)