Skip to content

Commit

Permalink
Improve naming of method returning all dependencies of type
Browse files Browse the repository at this point in the history
Ref. #672
  • Loading branch information
treiher authored and Isabell Zorr committed Jun 29, 2021
1 parent cb9ad88 commit d0874b9
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions rflx/model/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ def __init__(

assert len(self.identifier.parts) > 1, "type identifier must contain package"

self._enum_literals = mty.qualified_enum_literals(self.all_types, self.package)
self._type_literals = mty.qualified_type_literals(self.all_types)
self._enum_literals = mty.qualified_enum_literals(self.dependencies, self.package)
self._type_literals = mty.qualified_type_literals(self.dependencies)

if not state and (structure or types):
try:
Expand Down Expand Up @@ -197,8 +197,8 @@ def refined_type(self, refinements: Sequence["Refinement"]) -> rty.Message:
)

@property
def all_types(self) -> List[mty.Type]:
return [self, *unique(a for t in self.types.values() for a in t.all_types)]
def dependencies(self) -> List[mty.Type]:
return [self, *unique(a for t in self.types.values() for a in t.dependencies)]

@abstractmethod
def copy(
Expand Down
6 changes: 3 additions & 3 deletions rflx/model/type_.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def type_(self) -> rty.Type:
return rty.Undefined()

@property
def all_types(self) -> ty.List["Type"]:
def dependencies(self) -> ty.List["Type"]:
"""
Return a list consisting of the type and all types on which the type depends. The
dependencies are determined recursively.
Expand Down Expand Up @@ -521,8 +521,8 @@ def element_size(self) -> expr.Expr:
return expr.Size(self.element_type.name)

@property
def all_types(self) -> ty.List["Type"]:
return [self, *self.element_type.all_types]
def dependencies(self) -> ty.List["Type"]:
return [self, *self.element_type.dependencies]


class Opaque(Composite):
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/model/message_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3090,14 +3090,14 @@ def test_paths() -> None:
}


def test_message_all_types() -> None:
assert TLV_MESSAGE.all_types == [
def test_message_dependencies() -> None:
assert TLV_MESSAGE.dependencies == [
TLV_MESSAGE,
TLV_TAG,
TLV_LENGTH,
OPAQUE,
]
assert SEQUENCE_MESSAGES_MESSAGE.all_types == [
assert SEQUENCE_MESSAGES_MESSAGE.dependencies == [
SEQUENCE_MESSAGES_MESSAGE,
SEQUENCE_LENGTH,
SEQUENCE_INNER_MESSAGES,
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/model/type_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ class NewType(Type):
assert NewType("P::T").type_ == rty.Undefined()


def test_type_all_types() -> None:
def test_type_dependencies() -> None:
class NewType(Type):
pass

assert NewType("P::T").all_types == [NewType("P::T")]
assert NewType("P::T").dependencies == [NewType("P::T")]


def test_modular_size() -> None:
Expand Down Expand Up @@ -295,12 +295,12 @@ def test_enumeration_invalid_multiple_duplicate_elements() -> None:
)


def test_sequence_all_types() -> None:
assert models.SEQUENCE_MODULAR_VECTOR.all_types == [
def test_sequence_dependencies() -> None:
assert models.SEQUENCE_MODULAR_VECTOR.dependencies == [
models.SEQUENCE_MODULAR_VECTOR,
models.SEQUENCE_MODULAR_INTEGER,
]
assert models.SEQUENCE_INNER_MESSAGES.all_types == [
assert models.SEQUENCE_INNER_MESSAGES.dependencies == [
models.SEQUENCE_INNER_MESSAGES,
models.SEQUENCE_INNER_MESSAGE,
models.SEQUENCE_LENGTH,
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_spark_test_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
tests.data.models.NULL_MODEL,
tests.data.models.TLV_MODEL,
tests.data.models.NULL_MESSAGE_IN_TLV_MESSAGE_MODEL,
Model(tests.data.models.FIXED_SIZE_SIMPLE_MESSAGE.all_types),
Model(tests.data.models.FIXED_SIZE_SIMPLE_MESSAGE.dependencies),
]

SPECIFICATION_FILES = [
Expand Down

0 comments on commit d0874b9

Please sign in to comment.