Skip to content

Commit 956d9e8

Browse files
committed
993 finish conversion of test_table.py
1 parent 37bd007 commit 956d9e8

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

tests/extensions/test_table.py

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,50 @@ def example_uri() -> str:
1313

1414

1515
@pytest.mark.vcr()
16-
def test_validate(self) -> None:
17-
item = pystac.Item.from_file(self.example_uri)
16+
def test_validate(example_uri: str) -> None:
17+
item = pystac.Item.from_file(example_uri)
1818
item.validate()
1919

20-
def test_extension_not_implemented(self) -> None:
20+
def test_extension_not_implemented(example_uri: str) -> None:
2121
# Should raise exception if item does not include extension URI
22-
item = pystac.Item.from_file(self.example_uri)
22+
item = pystac.Item.from_file(example_uri)
2323
item.stac_extensions.remove(TableExtension.get_schema_uri())
2424

25-
with self.assertRaises(pystac.ExtensionNotImplemented):
25+
with pytest.raises(pystac.ExtensionNotImplemented):
2626
_ = TableExtension.ext(item)
2727

2828
# Should raise exception if owning item does not include extension URI
2929
asset = item.assets["data"]
3030

31-
with self.assertRaises(pystac.ExtensionNotImplemented):
31+
with pytest.raises(pystac.ExtensionNotImplemented):
3232
_ = TableExtension.ext(asset)
3333

3434
# Should succeed if Asset has no owner
3535
ownerless_asset = pystac.Asset.from_dict(asset.to_dict())
3636
_ = TableExtension.ext(ownerless_asset)
3737

38-
def test_item_ext_add_to(self) -> None:
39-
item = pystac.Item.from_file(self.example_uri)
38+
def test_item_ext_add_to(example_uri: str) -> None:
39+
item = pystac.Item.from_file(example_uri)
4040
item.stac_extensions.remove(TableExtension.get_schema_uri())
4141

4242
_ = TableExtension.ext(item, add_if_missing=True)
4343

44-
self.assertIn(TableExtension.get_schema_uri(), item.stac_extensions)
44+
assert TableExtension.get_schema_uri() in item.stac_extensions
4545

46-
def test_asset_ext_add_to(self) -> None:
47-
item = pystac.Item.from_file(self.example_uri)
46+
def test_asset_ext_add_to(example_uri: str) -> None:
47+
item = pystac.Item.from_file(example_uri)
4848
item.stac_extensions.remove(TableExtension.get_schema_uri())
4949

50-
self.assertNotIn(TableExtension.get_schema_uri(), item.stac_extensions)
50+
assert TableExtension.get_schema_uri() not in item.stac_extensions
5151
asset = item.assets["data"]
5252

5353
_ = TableExtension.ext(asset, add_if_missing=True)
54-
self.assertIn(TableExtension.get_schema_uri(), item.stac_extensions)
54+
assert TableExtension.get_schema_uri() in item.stac_extensions
5555

56-
def test_should_raise_exception_when_passing_invalid_extension_object(
57-
self,
58-
) -> None:
59-
self.assertRaisesRegex(
60-
ExtensionTypeError,
61-
r"^TableExtension does not apply to type 'object'$",
62-
TableExtension.ext,
63-
object(),
64-
)
56+
def test_should_raise_when_passing_invalid_extension_object() -> None:
57+
with pytest.raises(ExtensionTypeError, match=r"^TableExtension does not apply to type 'object'$"):
58+
# calling it wrong on purpose so ------v
59+
TableExtension.ext(object()) # type: ignore
6560

6661

6762
def test_item_with_table_extension_is_serilalizable_and_roundtrips(

0 commit comments

Comments
 (0)