Skip to content

Commit b9ee52e

Browse files
lduchosallduchosal
committed
Fix: minor coding issues
1 parent 3329292 commit b9ee52e

File tree

5 files changed

+107
-105
lines changed

5 files changed

+107
-105
lines changed

‎src/TestProject/BigIntegerBitWiseUnitTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ public class BigIntegerBitWiseUnitTest
1313
/// <summary>
1414
/// Test.
1515
/// </summary>
16+
/// <param name="bytes">the input bytes.</param>
17+
/// <param name="reverseLength">The reverse length.</param>
18+
/// <param name="expected">The expected result.</param>
1619
[TestMethod]
1720
[DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 4, new byte[] { 0x0 })]
1821
[DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 8, new byte[] { 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, })]

‎src/TestProject/ContainsUnitTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ public void TestContainsNetwork(string network1, string networkOrAddress, bool e
4343
public void TestContainsAdrress(string network1, string networkOrAddress, bool expected)
4444
{
4545
var ipnetwork = IPNetwork2.Parse(network1);
46-
bool result;
4746
var ipaddress = IPAddress.Parse(networkOrAddress);
48-
result = ipnetwork.Contains(ipaddress);
47+
bool result = ipnetwork.Contains(ipaddress);
4948

5049
Assert.AreEqual(expected, result, "contains");
5150
}

‎src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ public class IPNetworkSubnetTests
1717
[ExpectedException(typeof(ArgumentNullException))]
1818
public void TestSubnet1()
1919
{
20-
IPNetwork2 ipnetwork = null;
21-
byte cidr = 9;
20+
IPNetwork2 ipnetwork = null;
21+
byte cidr = 9;
2222

2323
#pragma warning disable 0618
24-
IPNetwork2.Subnet(ipnetwork, cidr);
24+
IPNetwork2.Subnet(ipnetwork, cidr);
2525
#pragma warning restore 0618
26-
}
26+
}
2727

2828
/// <summary>
2929
/// Tests Subnet functionality with Subnet Static1.
3030
/// </summary>
3131
[TestMethod]
3232
public void TestSubnetStatic1()
3333
{
34-
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
35-
byte cidr = 9;
34+
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
35+
byte cidr = 9;
3636

3737
#pragma warning disable 0618
38-
IPNetwork2.Subnet(ipnetwork, cidr);
38+
IPNetwork2.Subnet(ipnetwork, cidr);
3939
#pragma warning restore 0618
40-
}
40+
}
4141

4242
/// <summary>
4343
/// Test.
@@ -46,11 +46,11 @@ public void TestSubnetStatic1()
4646
[ExpectedException(typeof(ArgumentOutOfRangeException))]
4747
public void TestSubnet3()
4848
{
49-
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
50-
byte cidr = 55;
49+
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
50+
byte cidr = 55;
5151

52-
ipnetwork.Subnet(cidr);
53-
}
52+
ipnetwork.Subnet(cidr);
53+
}
5454

5555
/// <summary>
5656
/// Test.
@@ -59,154 +59,154 @@ public void TestSubnet3()
5959
[ExpectedException(typeof(ArgumentException))]
6060
public void TestSubnet4()
6161
{
62-
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
63-
byte cidr = 1;
62+
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
63+
byte cidr = 1;
6464

65-
ipnetwork.Subnet(cidr);
66-
}
65+
ipnetwork.Subnet(cidr);
66+
}
6767

6868
/// <summary>
6969
/// Tests Subnet functionality with Subnet5.
7070
/// </summary>
7171
[TestMethod]
7272
public void TestSubnet5()
7373
{
74-
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
75-
byte cidr = 9;
74+
IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1;
75+
byte cidr = 9;
7676

77-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
78-
Assert.AreEqual(2, subnets.Count, "count");
79-
Assert.AreEqual("10.0.0.0/9", subnets[0].ToString(), "subnet1");
80-
Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2");
81-
}
77+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
78+
Assert.AreEqual(2, subnets.Count, "count");
79+
Assert.AreEqual("10.0.0.0/9", subnets[0].ToString(), "subnet1");
80+
Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2");
81+
}
8282

8383
/// <summary>
8484
/// Tests Subnet functionality with Subnet6.
8585
/// </summary>
8686
[TestMethod]
8787
public void TestSubnet6()
8888
{
89-
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
90-
byte cidr = 20;
91-
92-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
93-
Assert.AreEqual(16, subnets.Count, "count");
94-
Assert.AreEqual("192.168.0.0/20", subnets[0].ToString(), "subnet1");
95-
Assert.AreEqual("192.168.16.0/20", subnets[1].ToString(), "subnet2");
96-
Assert.AreEqual("192.168.32.0/20", subnets[2].ToString(), "subnet3");
97-
Assert.AreEqual("192.168.48.0/20", subnets[3].ToString(), "subnet4");
98-
Assert.AreEqual("192.168.64.0/20", subnets[4].ToString(), "subnet5");
99-
Assert.AreEqual("192.168.80.0/20", subnets[5].ToString(), "subnet6");
100-
Assert.AreEqual("192.168.96.0/20", subnets[6].ToString(), "subnet7");
101-
Assert.AreEqual("192.168.112.0/20", subnets[7].ToString(), "subnet8");
102-
Assert.AreEqual("192.168.128.0/20", subnets[8].ToString(), "subnet9");
103-
Assert.AreEqual("192.168.144.0/20", subnets[9].ToString(), "subnet10");
104-
Assert.AreEqual("192.168.160.0/20", subnets[10].ToString(), "subnet11");
105-
Assert.AreEqual("192.168.176.0/20", subnets[11].ToString(), "subnet12");
106-
Assert.AreEqual("192.168.192.0/20", subnets[12].ToString(), "subnet13");
107-
Assert.AreEqual("192.168.208.0/20", subnets[13].ToString(), "subnet14");
108-
Assert.AreEqual("192.168.224.0/20", subnets[14].ToString(), "subnet15");
109-
Assert.AreEqual("192.168.240.0/20", subnets[15].ToString(), "subnet16");
110-
}
89+
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
90+
byte cidr = 20;
91+
92+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
93+
Assert.AreEqual(16, subnets.Count, "count");
94+
Assert.AreEqual("192.168.0.0/20", subnets[0].ToString(), "subnet1");
95+
Assert.AreEqual("192.168.16.0/20", subnets[1].ToString(), "subnet2");
96+
Assert.AreEqual("192.168.32.0/20", subnets[2].ToString(), "subnet3");
97+
Assert.AreEqual("192.168.48.0/20", subnets[3].ToString(), "subnet4");
98+
Assert.AreEqual("192.168.64.0/20", subnets[4].ToString(), "subnet5");
99+
Assert.AreEqual("192.168.80.0/20", subnets[5].ToString(), "subnet6");
100+
Assert.AreEqual("192.168.96.0/20", subnets[6].ToString(), "subnet7");
101+
Assert.AreEqual("192.168.112.0/20", subnets[7].ToString(), "subnet8");
102+
Assert.AreEqual("192.168.128.0/20", subnets[8].ToString(), "subnet9");
103+
Assert.AreEqual("192.168.144.0/20", subnets[9].ToString(), "subnet10");
104+
Assert.AreEqual("192.168.160.0/20", subnets[10].ToString(), "subnet11");
105+
Assert.AreEqual("192.168.176.0/20", subnets[11].ToString(), "subnet12");
106+
Assert.AreEqual("192.168.192.0/20", subnets[12].ToString(), "subnet13");
107+
Assert.AreEqual("192.168.208.0/20", subnets[13].ToString(), "subnet14");
108+
Assert.AreEqual("192.168.224.0/20", subnets[14].ToString(), "subnet15");
109+
Assert.AreEqual("192.168.240.0/20", subnets[15].ToString(), "subnet16");
110+
}
111111

112112
/// <summary>
113113
/// Tests Subnet functionality with Subnet7.
114114
/// </summary>
115115
[TestMethod]
116116
public void TestSubnet7()
117117
{
118-
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
119-
byte cidr = 24;
118+
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
119+
byte cidr = 24;
120120

121-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
122-
Assert.AreEqual(256, subnets.Count, "count");
123-
Assert.AreEqual("192.168.0.0/24", subnets[0].ToString(), "subnet1");
124-
Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet16");
125-
}
121+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
122+
Assert.AreEqual(256, subnets.Count, "count");
123+
Assert.AreEqual("192.168.0.0/24", subnets[0].ToString(), "subnet1");
124+
Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet16");
125+
}
126126

127127
/// <summary>
128128
/// Tests Subnet functionality with Subnet8.
129129
/// </summary>
130130
[TestMethod]
131131
public void TestSubnet8()
132132
{
133-
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
134-
byte cidr = 24;
133+
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
134+
byte cidr = 24;
135135

136-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
137-
Assert.AreEqual(256, subnets.Count, "count");
138-
Assert.AreEqual("192.168.0.0/24", subnets[0].ToString(), "subnet1");
139-
Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet256");
140-
}
136+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
137+
Assert.AreEqual(256, subnets.Count, "count");
138+
Assert.AreEqual("192.168.0.0/24", subnets[0].ToString(), "subnet1");
139+
Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet256");
140+
}
141141

142142
/// <summary>
143143
/// Tests Subnet functionality with Subnet9.
144144
/// </summary>
145145
[TestMethod]
146146
public void TestSubnet9()
147147
{
148-
var ipnetwork = IPNetwork2.Parse("192.168.0.0/24");
149-
byte cidr = 32;
148+
var ipnetwork = IPNetwork2.Parse("192.168.0.0/24");
149+
byte cidr = 32;
150150

151-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
152-
Assert.AreEqual(256, subnets.Count, "count");
153-
Assert.AreEqual("192.168.0.0/32", subnets[0].ToString(), "subnet1");
154-
Assert.AreEqual("192.168.0.255/32", subnets[255].ToString(), "subnet256");
155-
}
151+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
152+
Assert.AreEqual(256, subnets.Count, "count");
153+
Assert.AreEqual("192.168.0.0/32", subnets[0].ToString(), "subnet1");
154+
Assert.AreEqual("192.168.0.255/32", subnets[255].ToString(), "subnet256");
155+
}
156156

157157
/// <summary>
158158
/// Tests Subnet functionality with Subnet_Example8.
159159
/// </summary>
160160
[TestMethod]
161161
public void TestSubnet_Example8()
162162
{
163-
var wholeInternet = IPNetwork2.Parse("0.0.0.0/0");
164-
byte newCidr = 2;
165-
IPNetworkCollection subneted = wholeInternet.Subnet(newCidr);
166-
167-
Console.WriteLine("{0} was subnetted into {1} subnets", wholeInternet, subneted.Count);
168-
Console.WriteLine("First: {0}", subneted[0]);
169-
Console.WriteLine("Last : {0}", subneted[subneted.Count - 1]);
170-
Console.WriteLine("All :");
171-
172-
foreach (IPNetwork2 ipnetwork in subneted)
173-
{
174-
Console.WriteLine("{0}", ipnetwork);
175-
}
163+
var wholeInternet = IPNetwork2.Parse("0.0.0.0/0");
164+
byte newCidr = 2;
165+
IPNetworkCollection subneted = wholeInternet.Subnet(newCidr);
166+
167+
Console.WriteLine("{0} was subnetted into {1} subnets", wholeInternet, subneted.Count);
168+
Console.WriteLine("First: {0}", subneted[0]);
169+
Console.WriteLine("Last : {0}", subneted[subneted.Count - 1]);
170+
Console.WriteLine("All :");
171+
172+
foreach (IPNetwork2 ipnetwork in subneted)
173+
{
174+
Console.WriteLine("{0}", ipnetwork);
176175
}
176+
}
177177

178178
/// <summary>
179179
/// Tests Subnet functionality with Subnet10.
180180
/// </summary>
181181
[TestMethod]
182182
public void TestSubnet10()
183183
{
184-
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
185-
byte cidr = 32;
186-
187-
// Here I spawm a OOM dragon ! beware of the beast !
188-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
189-
Assert.AreEqual(4294967296, subnets.Count, "count");
190-
Assert.AreEqual("0.0.0.0/32", subnets[0].ToString(), "subnet1");
191-
Assert.AreEqual("255.255.255.255/32", subnets[4294967295].ToString(), "subnet256");
192-
}
184+
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
185+
byte cidr = 32;
186+
187+
// Here I spawm a OOM dragon ! beware of the beast !
188+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
189+
Assert.AreEqual(4294967296, subnets.Count, "count");
190+
Assert.AreEqual("0.0.0.0/32", subnets[0].ToString(), "subnet1");
191+
Assert.AreEqual("255.255.255.255/32", subnets[4294967295].ToString(), "subnet256");
192+
}
193193

194194
/// <summary>
195195
/// Tests Subnet functionality with Subnet12.
196196
/// </summary>
197197
[TestMethod]
198198
public void TestSubnet12()
199199
{
200-
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
201-
byte cidr = 20;
202-
int i = -1;
203-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
204-
foreach (IPNetwork2 ipn in subnets)
205-
{
206-
i++;
207-
Assert.AreEqual(subnets[i], ipn, "subnet");
208-
}
200+
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
201+
byte cidr = 20;
202+
int i = -1;
203+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
204+
foreach (IPNetwork2 ipn in subnets)
205+
{
206+
i++;
207+
Assert.AreEqual(subnets[i], ipn, "subnet");
209208
}
209+
}
210210

211211
/// <summary>
212212
/// Test.
@@ -215,9 +215,9 @@ public void TestSubnet12()
215215
[ExpectedException(typeof(ArgumentOutOfRangeException))]
216216
public void TestSubnet13()
217217
{
218-
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
219-
byte cidr = 20;
220-
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
221-
IPNetwork2 error = subnets[1000];
218+
IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1;
219+
byte cidr = 20;
220+
IPNetworkCollection subnets = ipnetwork.Subnet(cidr);
221+
IPNetwork2 error = subnets[1000];
222222
}
223223
}

‎src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void TestInternalSubnet2()
3838
public void TestTrySubnet1()
3939
{
4040
#pragma warning disable 0618
41-
IPNetwork2.TrySubnet(null, 9, out var _);
41+
IPNetwork2.TrySubnet(null, 9, out _);
4242
#pragma warning restore 0618
4343
}
4444

‎src/TestProject/IPNetworkV6/IPNetworkV6ToNetmaskTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ public void ToNetmask0()
8282
public void ToNetmaskOore1()
8383
{
8484
byte cidr = 129;
85-
IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetworkV6).ToString();
85+
IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetworkV6);
8686
}
8787
}

0 commit comments

Comments
 (0)