Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ def __getattr__(self, item: str) -> Any:

def get_one(self, name: str, return_diff: bool = False) -> Union[FieldDiff, Any, list[FieldDiff], list[Any]]:
warnings.warn("get_one() method is deprecated by get_attr() and will be removed soon.", DeprecationWarning)
return self.get_attr(name, return_diff)
return self.get_field(name, return_diff)

def get_attr(self, name: str, return_diff: bool = False) -> Union[FieldDiff, Any, list[FieldDiff], list[Any]]:
def get_field(self, name: str, return_diff: bool = False) -> Union[FieldDiff, Any, list[FieldDiff], list[Any]]:
"""Get first field diff with given name.

:param name: The name of the field diff.
Expand All @@ -92,9 +92,9 @@ def get_attr(self, name: str, return_diff: bool = False) -> Union[FieldDiff, Any

def get_all(self, return_diff: bool = False) -> dict[str, Union[FieldDiff, Any, list[FieldDiff], list[Any]]]:
warnings.warn("get_all() method is deprecated by get_attrs() and will be removed soon.", DeprecationWarning)
return self.get_attrs(return_diff)
return self.get_fields(return_diff)

def get_attrs(self, return_diff: bool = False) -> dict[str, Union[FieldDiff, Any, list[FieldDiff], list[Any]]]:
def get_fields(self, return_diff: bool = False) -> dict[str, Union[FieldDiff, Any, list[FieldDiff], list[Any]]]:
"""Get all field diffs with given name.

:param return_diff: If ``True`` the result is returned as field diff instances, otherwise the result is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,23 @@ def test_get_one_multiple_diff(self):
]
self.assertEqual(expected, observed)

def test_get_attr_single(self):
observed = self.diff.get_attr("color")
def test_get_field_single(self):
observed = self.diff.get_field("color")
expected = "red"
self.assertEqual(expected, observed)

def test_get_attr_single_diff(self):
observed = self.diff.get_attr("color", return_diff=True)
def test_get_field_single_diff(self):
observed = self.diff.get_field("color", return_diff=True)
expected = FieldDiff("color", str, "red")
self.assertEqual(expected, observed)

def test_get_attr_multiple(self):
observed = self.diff.get_attr("doors")
def test_get_field_multiple(self):
observed = self.diff.get_field("doors")
expected = [5, 3]
self.assertEqual(expected, observed)

def test_get_attr_multiple_diff(self):
observed = self.diff.get_attr("doors", return_diff=True)
def test_get_field_multiple_diff(self):
observed = self.diff.get_field("doors", return_diff=True)
expected = [
IncrementalFieldDiff("doors", int, 5, Action.CREATE),
IncrementalFieldDiff("doors", int, 3, Action.CREATE),
Expand All @@ -244,16 +244,16 @@ def test_get_all_diffs(self):
}
self.assertEqual(expected, observed)

def test_get_attrs(self):
observed = self.diff.get_attrs()
def test_get_fields(self):
observed = self.diff.get_fields()
expected = {
"color": "red",
"doors": [5, 3],
}
self.assertEqual(expected, observed)

def test_get_attrs_diffs(self):
observed = self.diff.get_attrs(return_diff=True)
def test_get_fields_diffs(self):
observed = self.diff.get_fields(return_diff=True)
expected = {
"color": FieldDiff("color", str, "red"),
"doors": [
Expand Down