Skip to content

Commit

Permalink
tests: refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsypuk
tsypuk committed Jul 29, 2023
1 parent c9c4e48 commit 86b9a82
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion tests/test_aws_vertecies.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from utils.utils import TestUtilities


class Test_MCD_AWS_Vertex_Isolation(TestUtilities):
class TestMCDAWSVertexInIsolation(TestUtilities):

def test_dynamo(self):
# given
Expand Down
34 changes: 17 additions & 17 deletions tests/test_layers.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from multicloud_diagrams import MultiCloudDiagrams
import xml.etree.ElementTree as et
import xml.etree.ElementTree as ET

from utils.utils import TestUtilities

Expand All @@ -11,8 +11,8 @@ def test_default_layer(self):
mcd = MultiCloudDiagrams(debug_mode=True)

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")

Expand All @@ -26,8 +26,8 @@ def test_add_2_layers(self):
mcd.add_layer('L2')

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")

Expand All @@ -42,8 +42,8 @@ def test_add_3_layers(self):
mcd.add_layer('L3')

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")

Expand All @@ -57,8 +57,8 @@ def test_get_layer_id_single_layer(self):
layer_id = mcd.get_layer_id(layer_name='')

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")
self.verify_layers(mx_cells, 1, mcd)
Expand All @@ -74,8 +74,8 @@ def test_get_layer_name_2_layers(self):
layer_id_l2 = mcd.get_layer_id(layer_name='L2')

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")
self.verify_layers(mx_cells, 2, mcd)
Expand All @@ -92,8 +92,8 @@ def test_get_layer_id_2_layers(self):
layer_id_l2 = mcd.get_layer_id(layer_id=2)

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")
self.verify_layers(mx_cells, 2, mcd)
Expand All @@ -109,8 +109,8 @@ def test_get_layer_by_name_not_exist_id(self):
mcd.get_layer_id(layer_name='L2')

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")
self.verify_layers(mx_cells, 1, mcd)
Expand All @@ -124,8 +124,8 @@ def test_get_layer_by_id_not_exist_id(self):
mcd.get_layer_id(layer_id=2)

# then
tree = et.ElementTree(mcd.mx_file)
self.verify_mxfile_default(et.ElementTree(tree))
tree = ET.ElementTree(mcd.mx_file)
self.verify_mxfile_default(tree)

mx_cells = tree.findall("./*/*/*/")
self.verify_layers(mx_cells, 1, mcd)
18 changes: 9 additions & 9 deletions tests/test_mcd.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from multicloud_diagrams import MultiCloudDiagrams
import xml.etree.ElementTree as et
import xml.etree.ElementTree as ET

from utils.utils import TestUtilities

Expand All @@ -11,7 +11,7 @@ def test_drawio_preambula(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
self.verify_mxfile(tree.findall("."))
Expand All @@ -21,7 +21,7 @@ def test_diagram(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
# ./diagram/
Expand All @@ -32,7 +32,7 @@ def test_mx_graph_model(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
# ./diagram/mxGraphModel/
Expand All @@ -43,7 +43,7 @@ def test_root(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
# ./diagram/mxGraphModel/root
Expand All @@ -54,7 +54,7 @@ def test_mx_cell(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
# ./diagram/mxGraphModel/root/mxCell
Expand Down Expand Up @@ -87,7 +87,7 @@ def test_shadow_drawio(self):
mcd = MultiCloudDiagrams(shadow=True)

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
self.verify_mx_graph_models(tree.findall("./*/"))
Expand All @@ -97,7 +97,7 @@ def test_default_shadow_drawio(self):
mcd = MultiCloudDiagrams()

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
self.verify_mx_graph_models(tree.findall("./*/"))
Expand All @@ -108,7 +108,7 @@ def test_no_shadow_drawio(self):
mcd = MultiCloudDiagrams(shadow=shadow_mode)

# when
tree = et.ElementTree(mcd.mx_file)
tree = ET.ElementTree(mcd.mx_file)

# then
self.verify_mx_graph_models(tree.findall("./*/"), shadow_mode=shadow_mode)
Expand Down

0 comments on commit 86b9a82

Please sign in to comment.