Skip to content

Commit 7577c14

Browse files
lduchosallduchosal
committed
chore: sonarcloud / smells
1 parent be67e32 commit 7577c14

File tree

4 files changed

+61
-62
lines changed

4 files changed

+61
-62
lines changed

‎src/TestProject/IPNetworkTest/IPNetworkParseTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void TestParseIPAddressNetmaskAne9()
8686
{
8787
Assert.ThrowsExactly<ArgumentException>(() =>
8888
{
89-
IPNetwork2.Parse("0.0.0.0", "x.x.x.x");
89+
IPNetwork2.Parse("0.0.0.1", "x.x.x.x");
9090
});
9191
}
9292

@@ -134,13 +134,13 @@ public void TestParseIPAddressNetmask()
134134
uint usable = 254;
135135

136136
var ipnetwork = IPNetwork2.Parse(ipaddress, netmask);
137-
Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network");
138-
Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask");
139-
Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast");
140-
Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr");
141-
Assert.AreEqual(usable, ipnetwork.Usable, "Usable");
142-
Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable");
143-
Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable");
137+
Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network1");
138+
Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask1");
139+
Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast1");
140+
Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr1");
141+
Assert.AreEqual(usable, ipnetwork.Usable, "Usable1");
142+
Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable1");
143+
Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable1");
144144
}
145145

146146
/// <summary>

‎src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void Issue33__TestSupernet__Bug_or_default_behavior()
4141
{
4242
Assert.ThrowsExactly<ArgumentOutOfRangeException>(() =>
4343
{
44-
var network1 = IPNetwork2.Parse("192.168.0.0/24");
44+
var network1 = IPNetwork2.Parse("192.168.1.0/24");
4545
var network2 = IPNetwork2.Parse("192.168.2.0/24");
4646
var expected = IPNetwork2.Parse("192.168.0.0/23");
4747
IPNetwork2 supernet = network1.Supernet(network2);
@@ -86,9 +86,9 @@ public void Issue162__Test_IPrangeToCIDRnotation()
8686
[TestMethod]
8787
public void TestSupernet1()
8888
{
89-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
90-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
91-
var expected = IPNetwork2.Parse("192.168.0.0/23");
89+
var network1 = IPNetwork2.Parse("192.168.10.1/24");
90+
var network2 = IPNetwork2.Parse("192.168.11.1/24");
91+
var expected = IPNetwork2.Parse("192.168.10.0/23");
9292
IPNetwork2 supernet = network1.Supernet(network2);
9393

9494
Assert.AreEqual(expected, supernet, "supernet");
@@ -102,9 +102,8 @@ public void TestSupernet2()
102102
{
103103
Assert.ThrowsExactly<NullReferenceException>(() =>
104104
{
105-
IPNetwork2 network1 = null;
106-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
107-
network1.Supernet(network2);
105+
var network1 = IPNetwork2.Parse("192.168.1.1/24");
106+
network1.Supernet(null);
108107
});
109108
}
110109

‎src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public class IPNetworkTrySupernetTests
1616
[TestMethod]
1717
public void TestTrySupernet1()
1818
{
19-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
20-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
21-
var supernetExpected = IPNetwork2.Parse("192.168.0.0/23");
19+
var network1 = IPNetwork2.Parse("192.168.10.1/24");
20+
var network2 = IPNetwork2.Parse("192.168.11.1/24");
21+
var supernetExpected = IPNetwork2.Parse("192.168.10.0/23");
2222
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
2323

24-
Assert.AreEqual(supernetExpected, supernet, "supernet");
25-
Assert.IsTrue(result, "parsed");
24+
Assert.AreEqual(supernetExpected, supernet);
25+
Assert.IsTrue(result);
2626
}
2727

2828
/// <summary>
@@ -34,7 +34,7 @@ public void TestTrySupernet2()
3434
Assert.ThrowsExactly<ArgumentNullException>(() =>
3535
{
3636
IPNetwork2 network1 = null;
37-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
37+
var network2 = IPNetwork2.Parse("192.168.11.1/24");
3838

3939
#pragma warning disable 0618
4040
IPNetwork2.TrySupernet(network1, network2, out var _);
@@ -49,13 +49,13 @@ public void TestTrySupernet2()
4949
public void TestTrySupernetStatic2()
5050
{
5151
IPNetwork2 network1 = IPNetwork2.IANA_ABLK_RESERVED1;
52-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
52+
var network2 = IPNetwork2.Parse("192.168.21.1/24");
5353
#pragma warning disable 0618
5454
bool supernetted = IPNetwork2.TrySupernet(network1, network2, out IPNetwork2 supernet);
5555
#pragma warning restore 0618
5656

57-
Assert.IsFalse(supernetted, "supernetted");
58-
Assert.IsNull(supernet, "supernet");
57+
Assert.IsFalse(supernetted);
58+
Assert.IsNull(supernet);
5959
}
6060

6161
/// <summary>
@@ -64,7 +64,7 @@ public void TestTrySupernetStatic2()
6464
[TestMethod]
6565
public void TestTrySupernet3()
6666
{
67-
var network1 = IPNetwork2.Parse("192.168.1.1/24");
67+
var network1 = IPNetwork2.Parse("192.168.31.1/24");
6868
IPNetwork2 network2 = null;
6969
IPNetwork2 supernetExpected = null;
7070
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
@@ -79,8 +79,8 @@ public void TestTrySupernet3()
7979
[TestMethod]
8080
public void TestTrySupernet4()
8181
{
82-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
83-
var network2 = IPNetwork2.Parse("192.168.1.1/25");
82+
var network1 = IPNetwork2.Parse("192.168.40.1/24");
83+
var network2 = IPNetwork2.Parse("192.168.41.1/25");
8484
IPNetwork2 supernetExpected = null;
8585
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
8686

@@ -94,7 +94,7 @@ public void TestTrySupernet4()
9494
[TestMethod]
9595
public void TestTrySupernet5()
9696
{
97-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
97+
var network1 = IPNetwork2.Parse("192.168.40.1/24");
9898
var network2 = IPNetwork2.Parse("192.168.5.1/24");
9999
IPNetwork2 supernetExpected = null;
100100
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
@@ -109,9 +109,9 @@ public void TestTrySupernet5()
109109
[TestMethod]
110110
public void TestTrySupernet6()
111111
{
112-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
113-
var network2 = IPNetwork2.Parse("192.168.0.1/25");
114-
var supernetExpected = IPNetwork2.Parse("192.168.0.0/24");
112+
var network1 = IPNetwork2.Parse("192.168.60.1/24");
113+
var network2 = IPNetwork2.Parse("192.168.60.1/25");
114+
var supernetExpected = IPNetwork2.Parse("192.168.60.0/24");
115115
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
116116

117117
Assert.AreEqual(supernetExpected, supernet, "supernet");
@@ -124,9 +124,9 @@ public void TestTrySupernet6()
124124
[TestMethod]
125125
public void TestTrySupernet7()
126126
{
127-
var network1 = IPNetwork2.Parse("192.168.0.1/25");
128-
var network2 = IPNetwork2.Parse("192.168.0.1/24");
129-
var supernetExpected = IPNetwork2.Parse("192.168.0.0/24");
127+
var network1 = IPNetwork2.Parse("192.168.70.1/25");
128+
var network2 = IPNetwork2.Parse("192.168.70.1/24");
129+
var supernetExpected = IPNetwork2.Parse("192.168.70.0/24");
130130
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
131131

132132
Assert.AreEqual(supernetExpected, supernet, "supernet");
@@ -139,8 +139,8 @@ public void TestTrySupernet7()
139139
[TestMethod]
140140
public void TestTrySupernet8()
141141
{
142-
var network1 = IPNetwork2.Parse("192.168.1.1/24");
143-
var network2 = IPNetwork2.Parse("192.168.2.1/24");
142+
var network1 = IPNetwork2.Parse("192.168.81.1/24");
143+
var network2 = IPNetwork2.Parse("192.168.82.1/24");
144144
IPNetwork2 supernetExpected = null;
145145
bool result = network1.TrySupernet(network2, out IPNetwork2 supernet);
146146

@@ -154,8 +154,8 @@ public void TestTrySupernet8()
154154
[TestMethod]
155155
public void TestTrySupernet9()
156156
{
157-
var network1 = IPNetwork2.Parse("192.168.1.1/24");
158-
var network2 = IPNetwork2.Parse("192.168.2.1/24");
157+
var network1 = IPNetwork2.Parse("192.168.91.1/24");
158+
var network2 = IPNetwork2.Parse("192.168.92.1/24");
159159
IPNetwork2[] network3 = [network1, network2];
160160
IPNetwork2[] supernetExpected = [network1, network2];
161161
bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet);
@@ -171,10 +171,10 @@ public void TestTrySupernet9()
171171
[TestMethod]
172172
public void TestTrySupernet10()
173173
{
174-
var network1 = IPNetwork2.Parse("192.168.0.1/24");
175-
var network2 = IPNetwork2.Parse("192.168.1.1/24");
174+
var network1 = IPNetwork2.Parse("192.168.80.1/24");
175+
var network2 = IPNetwork2.Parse("192.168.81.1/24");
176176
IPNetwork2[] network3 = [network1, network2];
177-
IPNetwork2[] supernetExpected = [IPNetwork2.Parse("192.168.0.0/23")];
177+
IPNetwork2[] supernetExpected = [IPNetwork2.Parse("192.168.80.0/23")];
178178
bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet);
179179

180180
Assert.AreEqual(supernetExpected[0], supernet[0], "supernet");
@@ -188,7 +188,7 @@ public void TestTrySupernet10()
188188
public void TestTrySupernet11()
189189
{
190190
IPNetwork2[] network3 = null;
191-
_ = new[] { IPNetwork2.Parse("192.168.0.0/23") };
191+
_ = new[] { IPNetwork2.Parse("192.168.60.0/23") };
192192
bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet);
193193

194194
Assert.IsNull(supernet, "supernet");

‎src/TestProject/IPNetworkV6/IPNetworkV6SubnetTests.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public void TestSubnet5()
5050
byte cidr = 65;
5151

5252
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
53-
Assert.AreEqual(2, subnets.Count, "count");
54-
Assert.AreEqual("1:1:1:1::/65", subnets[0].ToString(), "subnet1");
55-
Assert.AreEqual("1:1:1:1:8000::/65", subnets[1].ToString(), "subnet2");
53+
Assert.HasCount(2, subnets);
54+
Assert.AreEqual("1:1:1:1::/65", subnets[0].ToString());
55+
Assert.AreEqual("1:1:1:1:8000::/65", subnets[1].ToString());
5656
}
5757

5858
/// <summary>
@@ -65,23 +65,23 @@ public void TestSubnet6()
6565
byte cidr = 68;
6666

6767
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
68-
Assert.AreEqual(16, subnets.Count, "count");
69-
Assert.AreEqual("1:1:1:1::/68", subnets[0].ToString(), "subnet1");
70-
Assert.AreEqual("1:1:1:1:1000::/68", subnets[1].ToString(), "subnet2");
71-
Assert.AreEqual("1:1:1:1:2000::/68", subnets[2].ToString(), "subnet3");
72-
Assert.AreEqual("1:1:1:1:3000::/68", subnets[3].ToString(), "subnet4");
73-
Assert.AreEqual("1:1:1:1:4000::/68", subnets[4].ToString(), "subnet5");
74-
Assert.AreEqual("1:1:1:1:5000::/68", subnets[5].ToString(), "subnet6");
75-
Assert.AreEqual("1:1:1:1:6000::/68", subnets[6].ToString(), "subnet7");
76-
Assert.AreEqual("1:1:1:1:7000::/68", subnets[7].ToString(), "subnet8");
77-
Assert.AreEqual("1:1:1:1:8000::/68", subnets[8].ToString(), "subnet9");
78-
Assert.AreEqual("1:1:1:1:9000::/68", subnets[9].ToString(), "subnet10");
79-
Assert.AreEqual("1:1:1:1:a000::/68", subnets[10].ToString(), "subnet11");
80-
Assert.AreEqual("1:1:1:1:b000::/68", subnets[11].ToString(), "subnet12");
81-
Assert.AreEqual("1:1:1:1:c000::/68", subnets[12].ToString(), "subnet13");
82-
Assert.AreEqual("1:1:1:1:d000::/68", subnets[13].ToString(), "subnet14");
83-
Assert.AreEqual("1:1:1:1:e000::/68", subnets[14].ToString(), "subnet15");
84-
Assert.AreEqual("1:1:1:1:f000::/68", subnets[15].ToString(), "subnet16");
68+
Assert.HasCount(16, subnets);
69+
Assert.AreEqual("1:1:1:1::/68", subnets[0].ToString());
70+
Assert.AreEqual("1:1:1:1:1000::/68", subnets[1].ToString());
71+
Assert.AreEqual("1:1:1:1:2000::/68", subnets[2].ToString());
72+
Assert.AreEqual("1:1:1:1:3000::/68", subnets[3].ToString());
73+
Assert.AreEqual("1:1:1:1:4000::/68", subnets[4].ToString());
74+
Assert.AreEqual("1:1:1:1:5000::/68", subnets[5].ToString());
75+
Assert.AreEqual("1:1:1:1:6000::/68", subnets[6].ToString());
76+
Assert.AreEqual("1:1:1:1:7000::/68", subnets[7].ToString());
77+
Assert.AreEqual("1:1:1:1:8000::/68", subnets[8].ToString());
78+
Assert.AreEqual("1:1:1:1:9000::/68", subnets[9].ToString());
79+
Assert.AreEqual("1:1:1:1:a000::/68", subnets[10].ToString());
80+
Assert.AreEqual("1:1:1:1:b000::/68", subnets[11].ToString());
81+
Assert.AreEqual("1:1:1:1:c000::/68", subnets[12].ToString());
82+
Assert.AreEqual("1:1:1:1:d000::/68", subnets[13].ToString());
83+
Assert.AreEqual("1:1:1:1:e000::/68", subnets[14].ToString());
84+
Assert.AreEqual("1:1:1:1:f000::/68", subnets[15].ToString());
8585
}
8686

8787
/// <summary>

0 commit comments

Comments
 (0)