Skip to content

Commit c611f34

Browse files
yt-msMidnighter
authored andcommitted
refactor: PR feedback
1 parent a460246 commit c611f34

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

tests/integration/test_implied_relationship_strategies.py

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616

1717
from structurizr.model import InteractionStyle, Model
1818
from structurizr.model.implied_relationship_strategies import (
19-
create_implied_relationships_unless_any_exist,
20-
create_implied_relationships_unless_same_exists,
21-
ignore_implied_relationship_strategy,
19+
create_implied_relationships_unless_any_exist as create_unless_any_exist,
20+
)
21+
from structurizr.model.implied_relationship_strategies import (
22+
create_implied_relationships_unless_same_exists as create_unless_same_exists,
23+
)
24+
from structurizr.model.implied_relationship_strategies import (
25+
ignore_implied_relationship_strategy as ignore,
2226
)
2327

2428

@@ -42,7 +46,7 @@ def test_by_default_model_doesnt_create_implied_relationships():
4246

4347
def test_ignore_implied_relationship_strategy():
4448
"""Check that by default no implied relationships are added."""
45-
model = Model(implied_relationship_strategy=ignore_implied_relationship_strategy)
49+
model = Model(implied_relationship_strategy=ignore)
4650
system1 = model.add_software_system(name="system1")
4751
container1 = system1.add_container(name="container1", description="test")
4852
system2 = model.add_software_system(name="system2")
@@ -58,8 +62,7 @@ def test_ignore_implied_relationship_strategy():
5862

5963
def test_create_implied_relationships_unless_any_exist():
6064
"""Check logic of create_implied_relationships_unless_any_exist."""
61-
model = Model()
62-
model.implied_relationship_strategy = create_implied_relationships_unless_any_exist
65+
model = Model(implied_relationship_strategy=create_unless_any_exist)
6366
system1 = model.add_software_system(name="system1")
6467
container1 = system1.add_container(name="container1", description="test")
6568
component1 = container1.add_component(name="component1", description="test")
@@ -91,10 +94,7 @@ def test_create_implied_relationships_unless_any_exist():
9194

9295
def test_create_implied_relationships_unless_same_exists():
9396
"""Check logic of create_implied_relationships_unless_same_exists."""
94-
model = Model()
95-
model.implied_relationship_strategy = (
96-
create_implied_relationships_unless_same_exists
97-
)
97+
model = Model(implied_relationship_strategy=create_unless_same_exists)
9898

9999
system1 = model.add_software_system(name="system1")
100100
container1 = system1.add_container(name="container1", description="test")
@@ -110,8 +110,7 @@ def test_create_implied_relationships_unless_same_exists():
110110

111111
def test_suppressing_implied_relationships():
112112
"""Ensure you can explicitly suppress the current strategy."""
113-
model = Model()
114-
model.implied_relationship_strategy = create_implied_relationships_unless_any_exist
113+
model = Model(implied_relationship_strategy=create_unless_any_exist)
115114
system1 = model.add_software_system(name="system1")
116115
container1 = system1.add_container(name="container1", description="test")
117116
system2 = model.add_software_system(name="system2")
@@ -128,8 +127,8 @@ def test_suppressing_implied_relationships():
128127
@pytest.mark.parametrize(
129128
"strategy",
130129
[
131-
create_implied_relationships_unless_any_exist,
132-
create_implied_relationships_unless_same_exists,
130+
create_unless_any_exist,
131+
create_unless_same_exists,
133132
],
134133
)
135134
def test_self_references_are_not_implied(strategy):
@@ -146,8 +145,7 @@ def test_self_references_are_not_implied(strategy):
146145

147146
def test_cloning_to_implied_relationship_copies_attributes_across():
148147
"""Make sure that attributes carry over to implied relationships."""
149-
model = Model()
150-
model.implied_relationship_strategy = create_implied_relationships_unless_any_exist
148+
model = Model(implied_relationship_strategy=create_unless_any_exist)
151149
system1 = model.add_software_system(name="system1")
152150
container1 = system1.add_container(name="container1", description="test")
153151
system2 = model.add_software_system(name="system2")

0 commit comments

Comments
 (0)