Skip to content

Commit 606dffc

Browse files
graemefostergraemefoster
committed
Fixed tests
1 parent 107cc7f commit 606dffc

7 files changed

+70
-125
lines changed

‎AzureDiagrams/Resources/VNet.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace AzureDiagrams.Resources;
99

1010
public class VNet : AzureResource
1111
{
12-
private string[] _peerings;
12+
private string[] _peerings = [];
1313

1414
public VNet(string id, string name, Subnet[] subnets)
1515
{

‎AzureDiagramsTests/Basic/BasicResources.VNetWithAttachedStoragetAccountInSubNet.approved.txt‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<mxGeometry x="50" y="50" width="150" height="235"
1919
as="geometry" />
2020
</mxCell>
21-
<mxCell id="c220f485-7c6f-3c98-7a2e-fb9c4275067b" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
21+
<mxCell id="c220f485-7c6f-3c98-7a2e-fb9c4275067b" value="&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
2222
<mxGeometry x="50" y="235" width="250" height="345"
2323
as="geometry" />
2424
</mxCell>
@@ -35,23 +35,17 @@
3535
as="geometry" />
3636
</mxCell>
3737
<mxCell id="4158f643-25e6-2c7a-5cb0-55ccdd9752d5"
38-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=0;orthogonalLoop=1;;" edge="1" parent="1"
39-
source="a58a5de8-9a03-0168-9575-473d20b16ad1" target="469266b2-b714-ab6b-0de0-6c2c5d9d6328">
40-
<mxGeometry relative="1" as="geometry"><Array as="points">
41-
<mxPoint x="175" y="335" as="sourcePoint" />
42-
<mxPoint x="175" y="150" as="targetPoint" />
43-
</Array></mxGeometry>
44-
</mxCell>
45-
38+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
39+
source="a58a5de8-9a03-0168-9575-473d20b16ad1" target="469266b2-b714-ab6b-0de0-6c2c5d9d6328">
40+
<mxGeometry relative="1" as="geometry" />
41+
</mxCell>
42+
4643
<mxCell id="0f4edae9-0f1a-bfce-edd3-50f80e7ffa5f"
47-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=0;orthogonalLoop=1;;" edge="1" parent="1"
48-
source="54e9ac39-b1ca-bb6c-0883-f8dbd5b3b847" target="a58a5de8-9a03-0168-9575-473d20b16ad1">
49-
<mxGeometry relative="1" as="geometry"><Array as="points">
50-
<mxPoint x="175" y="409.9999999999999" as="sourcePoint" />
51-
<mxPoint x="175" y="385" as="targetPoint" />
52-
</Array></mxGeometry>
53-
</mxCell>
54-
44+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
45+
source="54e9ac39-b1ca-bb6c-0883-f8dbd5b3b847" target="a58a5de8-9a03-0168-9575-473d20b16ad1">
46+
<mxGeometry relative="1" as="geometry" />
47+
</mxCell>
48+
5549

5650
</root>
5751
</mxGraphModel>

‎AzureDiagramsTests/Basic/BasicResources.VNetWithSubNet.approved.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<mxGeometry x="50" y="50" width="250" height="185"
1111
as="geometry" />
1212
</mxCell>
13-
<mxCell id="c220f485-7c6f-3c98-7a2e-fb9c4275067b" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="1">
13+
<mxCell id="c220f485-7c6f-3c98-7a2e-fb9c4275067b" value="&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="1">
1414
<mxGeometry x="0" y="0" width="350" height="295"
1515
as="geometry" />
1616
</mxCell>

‎AzureDiagramsTests/Basic/BasicResources.VNetWithSubNetSimpleConstructor.approved.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<mxGeometry x="400" y="50" width="250" height="185"
1919
as="geometry" />
2020
</mxCell>
21-
<mxCell id="da6247fd-0679-ddbd-3294-b327594e85ba" value="vnet" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="1">
21+
<mxCell id="da6247fd-0679-ddbd-3294-b327594e85ba" value="vnet&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="1">
2222
<mxGeometry x="0" y="0" width="700" height="295"
2323
as="geometry" />
2424
</mxCell>

‎AzureDiagramsTests/VirtualWans/VWanWithVHub.CanDrawDiagram.approved.txt‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<mxGeometry x="50" y="50" width="400" height="185"
2323
as="geometry" />
2424
</mxCell>
25-
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
25+
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
2626
<mxGeometry x="50" y="260" width="400" height="185"
2727
as="geometry" />
2828
</mxCell>
@@ -35,19 +35,11 @@
3535
as="geometry" />
3636
</mxCell>
3737
<mxCell id="c5131159-6fd2-a9d3-d3a0-10808df28731"
38-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
39-
source="6278f6e0-78c3-8d53-0626-4965e13bdaa4" target="4b781b88-7e3d-9462-d7a0-69670644f6fe">
40-
<mxGeometry relative="1" as="geometry"><mxPoint x="350" y="335" as="sourcePoint" />
41-
<mxPoint x="249.99999999999994" y="137.5" as="targetPoint" />
42-
<Array as="points">
43-
<mxPoint x="350" y="335" />
44-
<mxPoint x="308.3333333333333" y="335" />
45-
<mxPoint x="300" y="326.6666666666667" />
46-
<mxPoint x="300" y="145.83333333333334" />
47-
<mxPoint x="291.6666666666667" y="137.5" />
48-
</Array></mxGeometry>
49-
</mxCell>
50-
38+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
39+
source="6278f6e0-78c3-8d53-0626-4965e13bdaa4" target="4b781b88-7e3d-9462-d7a0-69670644f6fe">
40+
<mxGeometry relative="1" as="geometry" />
41+
</mxCell>
42+
5143

5244
</root>
5345
</mxGraphModel>

‎AzureDiagramsTests/WebApps/WebAppWithPrivateEndpoint.CanDrawCondensedDiagram.approved.txt‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<mxGeometry x="300" y="50" width="250" height="185"
2323
as="geometry" />
2424
</mxCell>
25-
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
25+
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
2626
<mxGeometry x="50" y="50" width="600" height="345"
2727
as="geometry" />
2828
</mxCell>
@@ -35,18 +35,15 @@
3535
as="geometry" />
3636
</mxCell>
3737
<mxCell id="32917fb3-76cd-325d-0425-483011b23905"
38-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=0;orthogonalLoop=1;;" edge="1" parent="1"
39-
source="f1921020-766f-e0b6-735f-33e982981b99" target="66f228a5-2df7-c23b-4814-95adb050732d">
40-
<mxGeometry relative="1" as="geometry"><Array as="points">
41-
<mxPoint x="175" y="224.9999999999999" as="sourcePoint" />
42-
<mxPoint x="175" y="200" as="targetPoint" />
43-
</Array></mxGeometry>
44-
</mxCell>
45-
<mxCell id="32917fb3-76cd-325d-0425-483011b23905--1" value="calls" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="32917fb3-76cd-325d-0425-483011b23905">
46-
<mxGeometry x="-0.5" relative="1" as="geometry">
47-
<mxPoint as="offset" />
48-
</mxGeometry>
49-
</mxCell>
38+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
39+
source="f1921020-766f-e0b6-735f-33e982981b99" target="66f228a5-2df7-c23b-4814-95adb050732d">
40+
<mxGeometry relative="1" as="geometry" />
41+
</mxCell>
42+
<mxCell id="32917fb3-76cd-325d-0425-483011b23905--1" value="calls" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="32917fb3-76cd-325d-0425-483011b23905">
43+
<mxGeometry x="-0.5" relative="1" as="geometry">
44+
<mxPoint as="offset" />
45+
</mxGeometry>
46+
</mxCell>
5047

5148
</root>
5249
</mxGraphModel>

‎AzureDiagramsTests/WebApps/WebAppWithPrivateEndpoint.CanDrawDiagram.approved.txt‎

Lines changed: 40 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<mxGeometry x="50" y="310" width="300" height="160"
4747
as="geometry" />
4848
</mxCell>
49-
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
49+
<mxCell id="bd3a1a44-a441-608a-7d61-14ee6b5f190c" value="test-vnet&lt;br/&gt;(VNet)" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#F8CECC;verticalAlign=top" vertex="1" parent="207c67fc-34bc-d9f0-369e-0f16975fc114.container">
5050
<mxGeometry x="75" y="236.6875" width="400" height="530"
5151
as="geometry" />
5252
</mxCell>
@@ -63,89 +63,51 @@
6363
as="geometry" />
6464
</mxCell>
6565
<mxCell id="ddb3db1b-e793-b5a7-3215-7e30a151af16"
66-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
67-
source="60c80ab3-baea-d6d4-b81c-54b7d72ac690" target="05f10308-a191-af78-fcb8-3e9e99244b55">
68-
<mxGeometry relative="1" as="geometry"><mxPoint x="116.50640999999999" y="148.51295236485413" as="sourcePoint" />
69-
<mxPoint x="175" y="621.6875" as="targetPoint" />
70-
<Array as="points">
71-
<mxPoint x="116.50640999999999" y="148.51295236485413" />
72-
<mxPoint x="116.50641" y="613.3541666666666" />
73-
<mxPoint x="124.83974333333333" y="621.6875" />
74-
</Array></mxGeometry>
75-
</mxCell>
76-
66+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
67+
source="60c80ab3-baea-d6d4-b81c-54b7d72ac690" target="05f10308-a191-af78-fcb8-3e9e99244b55">
68+
<mxGeometry relative="1" as="geometry" />
69+
</mxCell>
70+
7771
<mxCell id="6fd81717-3d3d-2205-7183-0b2ed552f022"
78-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
79-
source="d18af89b-56f1-32d3-2249-8fc306f5363b" target="8508a9a2-8be4-6d67-545a-bfa01a44cc12">
80-
<mxGeometry relative="1" as="geometry"><mxPoint x="266.6666665252393" y="148.57022598954947" as="sourcePoint" />
81-
<mxPoint x="326.4870476351458" y="613.19391" as="targetPoint" />
82-
<Array as="points">
83-
<mxPoint x="266.6666665252393" y="148.57022598954947" />
84-
<mxPoint x="266.6666665252393" y="604.8605766666666" />
85-
<mxPoint x="274.9999998585726" y="613.19391" />
86-
</Array></mxGeometry>
87-
</mxCell>
88-
72+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
73+
source="d18af89b-56f1-32d3-2249-8fc306f5363b" target="8508a9a2-8be4-6d67-545a-bfa01a44cc12">
74+
<mxGeometry relative="1" as="geometry" />
75+
</mxCell>
76+
8977
<mxCell id="31164425-6f47-4d2c-c6b1-28566c8fcfdf"
90-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=0;orthogonalLoop=1;;" edge="1" parent="1"
91-
source="66f228a5-2df7-c23b-4814-95adb050732d" target="0fdd30e6-bd02-cb30-415c-a4b74d440c1b">
92-
<mxGeometry relative="1" as="geometry"><Array as="points">
93-
<mxPoint x="200" y="411.6874999999999" as="sourcePoint" />
94-
<mxPoint x="200" y="386.6875" as="targetPoint" />
95-
</Array></mxGeometry>
96-
</mxCell>
97-
78+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
79+
source="66f228a5-2df7-c23b-4814-95adb050732d" target="0fdd30e6-bd02-cb30-415c-a4b74d440c1b">
80+
<mxGeometry relative="1" as="geometry" />
81+
</mxCell>
82+
9883
<mxCell id="37954a19-2370-4b45-9726-c907604a11a8"
99-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=0;orthogonalLoop=1;;" edge="1" parent="1"
100-
source="f1921020-766f-e0b6-735f-33e982981b99" target="367449a7-6bdf-3242-7a62-e8447542c82f">
101-
<mxGeometry relative="1" as="geometry"><Array as="points">
102-
<mxPoint x="350" y="411.6874999999999" as="sourcePoint" />
103-
<mxPoint x="350" y="386.6875" as="targetPoint" />
104-
</Array></mxGeometry>
105-
</mxCell>
106-
84+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
85+
source="f1921020-766f-e0b6-735f-33e982981b99" target="367449a7-6bdf-3242-7a62-e8447542c82f">
86+
<mxGeometry relative="1" as="geometry" />
87+
</mxCell>
88+
10789
<mxCell id="03b7c2b8-0c1b-7a4a-c51d-0aa7117832a5"
108-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
109-
source="0fdd30e6-bd02-cb30-415c-a4b74d440c1b" target="60c80ab3-baea-d6d4-b81c-54b7d72ac690">
110-
<mxGeometry relative="1" as="geometry"><mxPoint x="175" y="361.6875" as="sourcePoint" />
111-
<mxPoint x="133.49359" y="148.51295236485407" as="targetPoint" />
112-
<Array as="points">
113-
<mxPoint x="175" y="361.6875" />
114-
<mxPoint x="141.82692333333335" y="361.6875" />
115-
<mxPoint x="133.49359" y="353.3541666666667" />
116-
</Array></mxGeometry>
117-
</mxCell>
118-
90+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
91+
source="0fdd30e6-bd02-cb30-415c-a4b74d440c1b" target="60c80ab3-baea-d6d4-b81c-54b7d72ac690">
92+
<mxGeometry relative="1" as="geometry" />
93+
</mxCell>
94+
11995
<mxCell id="4bd35d0b-db6a-f474-1560-278b55832753"
120-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
121-
source="367449a7-6bdf-3242-7a62-e8447542c82f" target="d18af89b-56f1-32d3-2249-8fc306f5363b">
122-
<mxGeometry relative="1" as="geometry"><mxPoint x="325" y="361.6875" as="sourcePoint" />
123-
<mxPoint x="283.5725677261962" y="148.48427309029978" as="targetPoint" />
124-
<Array as="points">
125-
<mxPoint x="325" y="361.6875" />
126-
<mxPoint x="291.9059010595295" y="361.6875" />
127-
<mxPoint x="283.5725677261962" y="353.3541666666667" />
128-
</Array></mxGeometry>
129-
</mxCell>
130-
96+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
97+
source="367449a7-6bdf-3242-7a62-e8447542c82f" target="d18af89b-56f1-32d3-2249-8fc306f5363b">
98+
<mxGeometry relative="1" as="geometry" />
99+
</mxCell>
100+
131101
<mxCell id="32917fb3-76cd-325d-0425-483011b23905"
132-
style="jettySize=auto;html=1;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;rounded=1;orthogonalLoop=1;;" edge="1" parent="1"
133-
source="8508a9a2-8be4-6d67-545a-bfa01a44cc12" target="66f228a5-2df7-c23b-4814-95adb050732d">
134-
<mxGeometry relative="1" as="geometry"><mxPoint x="326.48704763514587" y="630.18109" as="sourcePoint" />
135-
<mxPoint x="225" y="436.6875" as="targetPoint" />
136-
<Array as="points">
137-
<mxPoint x="326.48704763514587" y="630.18109" />
138-
<mxPoint x="258.0940986576157" y="630.18109" />
139-
<mxPoint x="249.76076532428235" y="621.8477566666667" />
140-
<mxPoint x="249.76076532428235" y="445.0208333333333" />
141-
<mxPoint x="241.427431990949" y="436.6875" />
142-
</Array></mxGeometry>
143-
</mxCell>
144-
<mxCell id="32917fb3-76cd-325d-0425-483011b23905--1" value="calls" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="32917fb3-76cd-325d-0425-483011b23905">
145-
<mxGeometry x="-0.5" relative="1" as="geometry">
146-
<mxPoint as="offset" />
147-
</mxGeometry>
148-
</mxCell>
102+
style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1"
103+
source="8508a9a2-8be4-6d67-545a-bfa01a44cc12" target="66f228a5-2df7-c23b-4814-95adb050732d">
104+
<mxGeometry relative="1" as="geometry" />
105+
</mxCell>
106+
<mxCell id="32917fb3-76cd-325d-0425-483011b23905--1" value="calls" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="32917fb3-76cd-325d-0425-483011b23905">
107+
<mxGeometry x="-0.5" relative="1" as="geometry">
108+
<mxPoint as="offset" />
109+
</mxGeometry>
110+
</mxCell>
149111

150112
</root>
151113
</mxGraphModel>

0 commit comments

Comments
 (0)