Skip to content

Commit adae847

Browse files
kayjankayjan
committed
test: refactor fixtures
1 parent be4779f commit adae847

File tree

2 files changed

+61
-64
lines changed

2 files changed

+61
-64
lines changed

‎tests/conftest.py‎

Lines changed: 50 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55

66
import pytest
77

8-
from bigtree.node.basenode import BaseNode
9-
from bigtree.node.binarynode import BinaryNode
10-
from bigtree.node.dagnode import DAGNode
11-
from bigtree.node.node import Node
8+
from bigtree.node import basenode, binarynode, dagnode, node
129

1310

1411
@pytest.fixture
@@ -24,14 +21,14 @@ def tree_basenode():
2421
+-- c (age=60)
2522
+-- f (age=38)
2623
"""
27-
a = BaseNode(name="a", age=90)
28-
b = BaseNode(name="b", age=65)
29-
c = BaseNode(name="c", age=60)
30-
d = BaseNode(name="d", age=40)
31-
e = BaseNode(name="e", age=35)
32-
f = BaseNode(name="f", age=38)
33-
g = BaseNode(name="g", age=10)
34-
h = BaseNode(name="h", age=6)
24+
a = basenode.BaseNode(name="a", age=90)
25+
b = basenode.BaseNode(name="b", age=65)
26+
c = basenode.BaseNode(name="c", age=60)
27+
d = basenode.BaseNode(name="d", age=40)
28+
e = basenode.BaseNode(name="e", age=35)
29+
f = basenode.BaseNode(name="f", age=38)
30+
g = basenode.BaseNode(name="g", age=10)
31+
h = basenode.BaseNode(name="h", age=6)
3532

3633
b.parent = a
3734
c.parent = a
@@ -56,14 +53,14 @@ def tree_node():
5653
+-- c (age=60)
5754
+-- f (age=38)
5855
"""
59-
a = Node("a", age=90)
60-
b = Node("b", age=65)
61-
c = Node("c", age=60)
62-
d = Node("d", age=40)
63-
e = Node("e", age=35)
64-
f = Node("f", age=38)
65-
g = Node("g", age=10)
66-
h = Node("h", age=6)
56+
a = node.Node("a", age=90)
57+
b = node.Node("b", age=65)
58+
c = node.Node("c", age=60)
59+
d = node.Node("d", age=40)
60+
e = node.Node("e", age=35)
61+
f = node.Node("f", age=38)
62+
g = node.Node("g", age=10)
63+
h = node.Node("h", age=6)
6764

6865
b.parent = a
6966
c.parent = a
@@ -89,15 +86,15 @@ def tree_node2():
8986
+-- c (age=60)
9087
+-- f (age=38)
9188
"""
92-
a = Node("a", age=90)
93-
b = Node("b", age=65)
94-
c = Node("c", age=60)
95-
d = Node("d", age=40)
96-
e = Node("e", age=35)
97-
f = Node("f", age=38)
98-
g = Node("g", age=10)
99-
h = Node("h", age=6)
100-
i = Node("i", age=4)
89+
a = node.Node("a", age=90)
90+
b = node.Node("b", age=65)
91+
c = node.Node("c", age=60)
92+
d = node.Node("d", age=40)
93+
e = node.Node("e", age=35)
94+
f = node.Node("f", age=38)
95+
g = node.Node("g", age=10)
96+
h = node.Node("h", age=6)
97+
i = node.Node("i", age=4)
10198

10299
b.parent = a
103100
c.parent = a
@@ -112,14 +109,14 @@ def tree_node2():
112109

113110
@pytest.fixture
114111
def dag_node():
115-
a = DAGNode("a", age=90)
116-
b = DAGNode("b", age=65)
117-
c = DAGNode("c", age=60)
118-
d = DAGNode("d", age=40)
119-
e = DAGNode("e", age=35)
120-
f = DAGNode("f", age=38)
121-
g = DAGNode("g", age=10)
122-
h = DAGNode("h", age=6)
112+
a = dagnode.DAGNode("a", age=90)
113+
b = dagnode.DAGNode("b", age=65)
114+
c = dagnode.DAGNode("c", age=60)
115+
d = dagnode.DAGNode("d", age=40)
116+
e = dagnode.DAGNode("e", age=35)
117+
f = dagnode.DAGNode("f", age=38)
118+
g = dagnode.DAGNode("g", age=10)
119+
h = dagnode.DAGNode("h", age=6)
123120

124121
c.parents = [a, b]
125122
d.parents = [a, c]
@@ -132,14 +129,14 @@ def dag_node():
132129

133130
@pytest.fixture
134131
def dag_node_child():
135-
a = DAGNode("a", age=90)
136-
b = DAGNode("b", age=65)
137-
c = DAGNode("c", age=60)
138-
d = DAGNode("d", age=40)
139-
e = DAGNode("e", age=35)
140-
f = DAGNode("f", age=38)
141-
g = DAGNode("g", age=10)
142-
h = DAGNode("h", age=6)
132+
a = dagnode.DAGNode("a", age=90)
133+
b = dagnode.DAGNode("b", age=65)
134+
c = dagnode.DAGNode("c", age=60)
135+
d = dagnode.DAGNode("d", age=40)
136+
e = dagnode.DAGNode("e", age=35)
137+
f = dagnode.DAGNode("f", age=38)
138+
g = dagnode.DAGNode("g", age=10)
139+
h = dagnode.DAGNode("h", age=6)
143140

144141
c.parents = [a, b]
145142
d.parents = [a, c]
@@ -163,14 +160,14 @@ def binarytree_node():
163160
├── 6
164161
└── 7
165162
"""
166-
a = BinaryNode(1)
167-
b = BinaryNode(2, parent=a)
168-
c = BinaryNode(3, parent=a)
169-
d = BinaryNode(4, parent=b)
170-
e = BinaryNode(5)
171-
f = BinaryNode(6)
172-
g = BinaryNode(7)
173-
h = BinaryNode(8)
163+
a = binarynode.BinaryNode(1)
164+
b = binarynode.BinaryNode(2, parent=a)
165+
c = binarynode.BinaryNode(3, parent=a)
166+
d = binarynode.BinaryNode(4, parent=b)
167+
e = binarynode.BinaryNode(5)
168+
f = binarynode.BinaryNode(6)
169+
g = binarynode.BinaryNode(7)
170+
h = binarynode.BinaryNode(8)
174171
d.children = [None, h]
175172
e.parent = b
176173
f.parent = c

‎tests/dag/conftest.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
import pytest
22

3-
from bigtree.node.dagnode import DAGNode
3+
from bigtree.node import dagnode
44

55

66
@pytest.fixture
77
def dag_node_plot():
8-
z = DAGNode("z")
9-
y = DAGNode("y")
8+
z = dagnode.DAGNode("z")
9+
y = dagnode.DAGNode("y")
1010
y.parents = [z]
1111
return z
1212

1313

1414
@pytest.fixture
1515
def dag_node_style():
16-
a = DAGNode(
16+
a = dagnode.DAGNode(
1717
"a",
1818
node_style={"style": "filled", "fillcolor": "gold"},
1919
edge_style={"style": "bold", "label": "a"},
2020
)
21-
b = DAGNode(
21+
b = dagnode.DAGNode(
2222
"b",
2323
node_style={"style": "filled", "fillcolor": "blue"},
2424
edge_style={"style": "bold", "label": "b"},
2525
)
26-
c = DAGNode(
26+
c = dagnode.DAGNode(
2727
"c",
2828
node_style={"style": "filled", "fillcolor": "blue"},
2929
edge_style={"style": "bold", "label": "c"},
3030
)
31-
d = DAGNode(
31+
d = dagnode.DAGNode(
3232
"d",
3333
node_style={"style": "filled", "fillcolor": "green"},
3434
edge_style={"style": "bold", "label": 1},
3535
)
36-
e = DAGNode(
36+
e = dagnode.DAGNode(
3737
"e",
3838
node_style={"style": "filled", "fillcolor": "green"},
3939
edge_style={"style": "bold", "label": 2},
4040
)
41-
f = DAGNode(
41+
f = dagnode.DAGNode(
4242
"f",
4343
node_style={"style": "filled", "fillcolor": "green"},
4444
edge_style={"style": "bold", "label": 3},
4545
)
46-
g = DAGNode(
46+
g = dagnode.DAGNode(
4747
"g",
4848
node_style={"style": "filled", "fillcolor": "red"},
4949
edge_style={"style": "bold", "label": 4},
5050
)
51-
h = DAGNode(
51+
h = dagnode.DAGNode(
5252
"h",
5353
node_style={"style": "filled", "fillcolor": "red"},
5454
edge_style={"style": "bold", "label": 5},

0 commit comments

Comments
 (0)