Skip to content

Commit 13961c5

Browse files
lduchosallduchosal
authored
feat/code-quality (#351)
* Chore: file scoped namespace * Feat: sign assembly * Fix: documentation and warnings * Chore: split IPNetwork2 into multiple partial classes * Chore: document partial classes * Fix: order methodes * Feat: document and code cleanup * Fix: unit tests * Chore: file scoped namespace * Feat: sign assembly * Fix: documentation and warnings
1 parent a7d86ec commit 13961c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+865
-1079
lines changed

‎src/ConsoleApplication/ActionEnum.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace System.Net;
66

77
/// <summary>
8-
/// Switch and actions
8+
/// Switch and actions.
99
/// </summary>
1010
public enum ActionEnum
1111
{

‎src/System.Net.IPNetwork/BigIntegerExtensions.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ public static string ToOctalString(this BigInteger bigint)
149149
///
150150
/// </summary>
151151
/// <param name="input">The positive number to bitwise reverse.</param>
152-
/// <param name="width">The width of the parameter.
153-
/// </param>
152+
/// <param name="width">The width of the parameter.</param>
154153
/// <returns>A number representing the input bitwise reversed.</returns>
155154
public static BigInteger PositiveReverse(this BigInteger input, int width)
156155
{

‎src/System.Net.IPNetwork/CidrClassLess.cs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,20 @@ public sealed class CidrClassLess : ICidrGuess
2222
/// <returns>true if ip was converted successfully; otherwise, false.</returns>
2323
public bool TryGuessCidr(string ip, out byte cidr)
2424
{
25-
IPAddress ipaddress = null;
26-
bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out ipaddress);
27-
if (parsed == false)
28-
{
29-
cidr = 0;
30-
return false;
31-
}
32-
33-
if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6)
34-
{
35-
cidr = 128;
36-
return true;
37-
}
25+
bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out IPAddress ipaddress);
26+
if (parsed == false)
27+
{
28+
cidr = 0;
29+
return false;
30+
}
3831

39-
cidr = 32;
32+
if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6)
33+
{
34+
cidr = 128;
4035
return true;
4136
}
37+
38+
cidr = 32;
39+
return true;
40+
}
4241
}

‎src/System.Net.IPNetwork/IPNetwork2ToCidr.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private static void InternalToCidr(bool tryParse, IPAddress netmask, out byte? c
5656
return;
5757
}
5858

59-
bool parsed = IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2);
59+
IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2);
6060

6161
// 20180217 lduchosal
6262
// impossible to reach code.

‎src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ public static bool TryGuessCidr(string ip, out byte cidr)
3131
/// <returns>true if cidr was converted successfully; otherwise, false.</returns>
3232
public static bool TryParseCidr(string sidr, AddressFamily family, out byte? cidr)
3333
{
34-
byte b = 0;
35-
if (!byte.TryParse(sidr, out b))
34+
if (!byte.TryParse(sidr, out byte b))
3635
{
3736
cidr = null;
3837
return false;
3938
}
4039

41-
if (!IPNetwork2.TryToNetmask(b, family, out IPAddress netmask))
40+
if (!IPNetwork2.TryToNetmask(b, family, out IPAddress _))
4241
{
4342
cidr = null;
4443
return false;

‎src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public static IPNetwork2 WideSubnet(string start, string end)
4949
}
5050

5151
var ipnetwork = new IPNetwork2(0, startIP.AddressFamily, 0);
52+
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
5253
for (byte cidr = 32; cidr >= 0; cidr--)
5354
{
5455
var wideSubnet = IPNetwork2.Parse(start, cidr);
@@ -151,6 +152,7 @@ internal static void InternalWideSubnet(bool tryWide, IPNetwork2[] ipnetworks, o
151152
}
152153

153154
var ipn = new IPNetwork2(0, family, 0);
155+
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
154156
for (byte cidr = nnin0.cidr; cidr >= 0; cidr--)
155157
{
156158
var wideSubnet = new IPNetwork2(uintNnin0, family, cidr);

‎src/TestProject/CidrClassFullIpv4UnitTest.cs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ public void TestTryGuessCidrNull()
1818
{
1919
var cidrguess = new CidrClassFull();
2020

21-
byte cidr;
22-
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
21+
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);
2322

24-
Assert.AreEqual(false, parsed, "parsed");
23+
Assert.IsFalse(parsed, "parsed");
2524
Assert.AreEqual(0, cidr, "cidr");
2625
}
2726

@@ -33,10 +32,9 @@ public void TestTryGuessCidrA()
3332
{
3433
var cidrguess = new CidrClassFull();
3534

36-
byte cidr;
37-
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr);
35+
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr);
3836

39-
Assert.AreEqual(true, parsed, "parsed");
37+
Assert.IsTrue(parsed, "parsed");
4038
Assert.AreEqual(8, cidr, "cidr");
4139
}
4240

@@ -48,10 +46,9 @@ public void TestTryGuessCidrB()
4846
{
4947
var cidrguess = new CidrClassFull();
5048

51-
byte cidr;
52-
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr);
49+
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr);
5350

54-
Assert.AreEqual(true, parsed, "parsed");
51+
Assert.IsTrue(parsed, "parsed");
5552
Assert.AreEqual(16, cidr, "cidr");
5653
}
5754

@@ -63,10 +60,9 @@ public void TestTryGuessCidrC()
6360
{
6461
var cidrguess = new CidrClassFull();
6562

66-
byte cidr;
67-
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr);
63+
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr);
6864

69-
Assert.AreEqual(true, parsed, "parsed");
65+
Assert.IsTrue(parsed, "parsed");
7066
Assert.AreEqual(24, cidr, "cidr");
7167
}
7268

@@ -78,10 +74,9 @@ public void TestTryGuessCidrD()
7874
{
7975
var cidrguess = new CidrClassFull();
8076

81-
byte cidr;
82-
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr);
77+
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr);
8378

84-
Assert.AreEqual(true, parsed, "parsed");
79+
Assert.IsTrue(parsed, "parsed");
8580
Assert.AreEqual(24, cidr, "cidr");
8681
}
8782

@@ -93,10 +88,9 @@ public void TestTryGuessCidrE()
9388
{
9489
var cidrguess = new CidrClassFull();
9590

96-
byte cidr;
97-
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr);
91+
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr);
9892

99-
Assert.AreEqual(true, parsed, "parsed");
93+
Assert.IsTrue(parsed, "parsed");
10094
Assert.AreEqual(24, cidr, "cidr");
10195
}
10296
}

‎src/TestProject/CidrClassFullIpv6UnitTest.cs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ public void TestIpV6TryGuessCidrNull()
1818
{
1919
var cidrguess = new CidrClassFull();
2020

21-
byte cidr;
22-
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
21+
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);
2322

24-
Assert.AreEqual(false, parsed, "parsed");
23+
Assert.IsFalse(parsed, "parsed");
2524
Assert.AreEqual(0, cidr, "cidr");
2625
}
2726

@@ -33,10 +32,9 @@ public void TestIpV6TryGuessCidr1()
3332
{
3433
var cidrguess = new CidrClassFull();
3534

36-
byte cidr;
37-
bool parsed = cidrguess.TryGuessCidr("::", out cidr);
35+
bool parsed = cidrguess.TryGuessCidr("::", out byte cidr);
3836

39-
Assert.AreEqual(true, parsed, "parsed");
37+
Assert.IsTrue(parsed, "parsed");
4038
Assert.AreEqual(64, cidr, "cidr");
4139
}
4240

@@ -48,10 +46,9 @@ public void TestIpV6TryGuessCidr2()
4846
{
4947
var cidrguess = new CidrClassFull();
5048

51-
byte cidr;
52-
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr);
49+
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr);
5350

54-
Assert.AreEqual(true, parsed, "parsed");
51+
Assert.IsTrue(parsed, "parsed");
5552
Assert.AreEqual(64, cidr, "cidr");
5653
}
5754
}

‎src/TestProject/CidrClassLessUnitTest.cs‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ public void TestTryGuessCidrNull()
2020
{
2121
var cidrguess = new CidrClassLess();
2222

23-
byte cidr;
24-
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
23+
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);
2524

26-
Assert.AreEqual(false, parsed, "parsed");
25+
Assert.IsFalse(parsed, "parsed");
2726
Assert.AreEqual(0, cidr, "cidr");
2827
}
2928

@@ -35,10 +34,9 @@ public void TestTryGuessCidrA()
3534
{
3635
var cidrguess = new CidrClassLess();
3736

38-
byte cidr;
39-
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr);
37+
bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr);
4038

41-
Assert.AreEqual(true, parsed, "parsed");
39+
Assert.IsTrue(parsed, "parsed");
4240
Assert.AreEqual(32, cidr, "cidr");
4341
}
4442

@@ -50,10 +48,9 @@ public void TestTryGuessCidrB()
5048
{
5149
var cidrguess = new CidrClassLess();
5250

53-
byte cidr;
54-
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr);
51+
bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr);
5552

56-
Assert.AreEqual(true, parsed, "parsed");
53+
Assert.IsTrue(parsed, "parsed");
5754
Assert.AreEqual(32, cidr, "cidr");
5855
}
5956

@@ -65,10 +62,9 @@ public void TestTryGuessCidrC()
6562
{
6663
var cidrguess = new CidrClassLess();
6764

68-
byte cidr;
69-
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr);
65+
bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr);
7066

71-
Assert.AreEqual(true, parsed, "parsed");
67+
Assert.IsTrue(parsed, "parsed");
7268
Assert.AreEqual(32, cidr, "cidr");
7369
}
7470

@@ -80,10 +76,9 @@ public void TestTryGuessCidrD()
8076
{
8177
var cidrguess = new CidrClassLess();
8278

83-
byte cidr;
84-
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr);
79+
bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr);
8580

86-
Assert.AreEqual(true, parsed, "parsed");
81+
Assert.IsTrue(parsed, "parsed");
8782
Assert.AreEqual(32, cidr, "cidr");
8883
}
8984

@@ -95,10 +90,9 @@ public void TestTryGuessCidrE()
9590
{
9691
var cidrguess = new CidrClassLess();
9792

98-
byte cidr;
99-
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr);
93+
bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr);
10094

101-
Assert.AreEqual(true, parsed, "parsed");
95+
Assert.IsTrue(parsed, "parsed");
10296
Assert.AreEqual(32, cidr, "cidr");
10397
}
10498

@@ -114,10 +108,9 @@ public void TestIpV6TryGuessCidrNull()
114108
{
115109
var cidrguess = new CidrClassLess();
116110

117-
byte cidr;
118-
bool parsed = cidrguess.TryGuessCidr(null, out cidr);
111+
bool parsed = cidrguess.TryGuessCidr(null, out byte cidr);
119112

120-
Assert.AreEqual(false, parsed, "parsed");
113+
Assert.IsFalse(parsed, "parsed");
121114
Assert.AreEqual(0, cidr, "cidr");
122115
}
123116

@@ -129,10 +122,9 @@ public void TestIpV6TryGuessCidr1()
129122
{
130123
var cidrguess = new CidrClassLess();
131124

132-
byte cidr;
133-
bool parsed = cidrguess.TryGuessCidr("::", out cidr);
125+
bool parsed = cidrguess.TryGuessCidr("::", out byte cidr);
134126

135-
Assert.AreEqual(true, parsed, "parsed");
127+
Assert.IsTrue(parsed, "parsed");
136128
Assert.AreEqual(128, cidr, "cidr");
137129
}
138130

@@ -144,10 +136,9 @@ public void TestIpV6TryGuessCidr2()
144136
{
145137
var cidrguess = new CidrClassLess();
146138

147-
byte cidr;
148-
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr);
139+
bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr);
149140

150-
Assert.AreEqual(true, parsed, "parsed");
141+
Assert.IsTrue(parsed, "parsed");
151142
Assert.AreEqual(128, cidr, "cidr");
152143
}
153144

‎src/TestProject/ContainsUnitTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void TestContainsStatic3()
6161
IPNetwork2 ipnetwork2 = null;
6262

6363
#pragma warning disable 0618
64-
bool result = IPNetwork2.Contains(ipnetwork, ipnetwork2);
64+
IPNetwork2.Contains(ipnetwork, ipnetwork2);
6565
#pragma warning restore 0618
6666
}
6767

@@ -91,7 +91,7 @@ public void TestContains8()
9191
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
9292
IPNetwork2 ipnetwork2 = null;
9393

94-
bool result = ipnetwork.Contains(ipnetwork2);
94+
ipnetwork.Contains(ipnetwork2);
9595
}
9696

9797
/// <summary>
@@ -105,7 +105,7 @@ public void TestContainsStatic1()
105105
IPAddress ipaddress = null;
106106

107107
#pragma warning disable 0618
108-
bool result = IPNetwork2.Contains(ipnetwork, ipaddress);
108+
IPNetwork2.Contains(ipnetwork, ipaddress);
109109
#pragma warning restore 0618
110110
}
111111

@@ -134,7 +134,7 @@ public void TestContains10()
134134
var ipnetwork = IPNetwork2.Parse("0.0.0.0/0");
135135
IPAddress ipaddress = null;
136136

137-
bool result = ipnetwork.Contains(ipaddress);
137+
ipnetwork.Contains(ipaddress);
138138
}
139139

140140
/// <summary>

0 commit comments

Comments
 (0)