diff --git a/src/ConsoleApplication/ActionEnum.cs b/src/ConsoleApplication/ActionEnum.cs index 0fc5db5a..844927f7 100644 --- a/src/ConsoleApplication/ActionEnum.cs +++ b/src/ConsoleApplication/ActionEnum.cs @@ -5,7 +5,7 @@ namespace System.Net; /// -/// Switch and actions +/// Switch and actions. /// public enum ActionEnum { diff --git a/src/System.Net.IPNetwork/BigIntegerExtensions.cs b/src/System.Net.IPNetwork/BigIntegerExtensions.cs index 9736bba4..688130cc 100644 --- a/src/System.Net.IPNetwork/BigIntegerExtensions.cs +++ b/src/System.Net.IPNetwork/BigIntegerExtensions.cs @@ -149,8 +149,7 @@ public static string ToOctalString(this BigInteger bigint) /// /// /// The positive number to bitwise reverse. - /// The width of the parameter. - /// + /// The width of the parameter. /// A number representing the input bitwise reversed. public static BigInteger PositiveReverse(this BigInteger input, int width) { diff --git a/src/System.Net.IPNetwork/CidrClassLess.cs b/src/System.Net.IPNetwork/CidrClassLess.cs index f815f295..5dfe2b2b 100644 --- a/src/System.Net.IPNetwork/CidrClassLess.cs +++ b/src/System.Net.IPNetwork/CidrClassLess.cs @@ -22,21 +22,20 @@ public sealed class CidrClassLess : ICidrGuess /// true if ip was converted successfully; otherwise, false. public bool TryGuessCidr(string ip, out byte cidr) { - IPAddress ipaddress = null; - bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out ipaddress); - if (parsed == false) - { - cidr = 0; - return false; - } - - if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6) - { - cidr = 128; - return true; - } + bool parsed = IPAddress.TryParse(string.Format("{0}", ip), out IPAddress ipaddress); + if (parsed == false) + { + cidr = 0; + return false; + } - cidr = 32; + if (ipaddress.AddressFamily == AddressFamily.InterNetworkV6) + { + cidr = 128; return true; } + + cidr = 32; + return true; + } } \ No newline at end of file diff --git a/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs b/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs index 7f7cae74..6dcf1fb2 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs @@ -56,7 +56,7 @@ private static void InternalToCidr(bool tryParse, IPAddress netmask, out byte? c return; } - bool parsed = IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2); + IPNetwork2.TryToBigInteger(netmask, out BigInteger? uintNetmask2); // 20180217 lduchosal // impossible to reach code. diff --git a/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs b/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs index 2aa1ccd8..bb635739 100644 --- a/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs +++ b/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs @@ -31,14 +31,13 @@ public static bool TryGuessCidr(string ip, out byte cidr) /// true if cidr was converted successfully; otherwise, false. public static bool TryParseCidr(string sidr, AddressFamily family, out byte? cidr) { - byte b = 0; - if (!byte.TryParse(sidr, out b)) + if (!byte.TryParse(sidr, out byte b)) { cidr = null; return false; } - if (!IPNetwork2.TryToNetmask(b, family, out IPAddress netmask)) + if (!IPNetwork2.TryToNetmask(b, family, out IPAddress _)) { cidr = null; return false; diff --git a/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs b/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs index 05d7ff39..82c4a548 100644 --- a/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs @@ -49,6 +49,7 @@ public static IPNetwork2 WideSubnet(string start, string end) } var ipnetwork = new IPNetwork2(0, startIP.AddressFamily, 0); + // ReSharper disable once ConditionIsAlwaysTrueOrFalse for (byte cidr = 32; cidr >= 0; cidr--) { var wideSubnet = IPNetwork2.Parse(start, cidr); @@ -151,6 +152,7 @@ internal static void InternalWideSubnet(bool tryWide, IPNetwork2[] ipnetworks, o } var ipn = new IPNetwork2(0, family, 0); + // ReSharper disable once ConditionIsAlwaysTrueOrFalse for (byte cidr = nnin0.cidr; cidr >= 0; cidr--) { var wideSubnet = new IPNetwork2(uintNnin0, family, cidr); diff --git a/src/TestProject/CidrClassFullIpv4UnitTest.cs b/src/TestProject/CidrClassFullIpv4UnitTest.cs index e5e3cac5..0610b6ee 100644 --- a/src/TestProject/CidrClassFullIpv4UnitTest.cs +++ b/src/TestProject/CidrClassFullIpv4UnitTest.cs @@ -18,10 +18,9 @@ public void TestTryGuessCidrNull() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + bool parsed = cidrguess.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(0, cidr, "cidr"); } @@ -33,10 +32,9 @@ public void TestTryGuessCidrA() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(8, cidr, "cidr"); } @@ -48,10 +46,9 @@ public void TestTryGuessCidrB() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(16, cidr, "cidr"); } @@ -63,10 +60,9 @@ public void TestTryGuessCidrC() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(24, cidr, "cidr"); } @@ -78,10 +74,9 @@ public void TestTryGuessCidrD() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(24, cidr, "cidr"); } @@ -93,10 +88,9 @@ public void TestTryGuessCidrE() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(24, cidr, "cidr"); } } \ No newline at end of file diff --git a/src/TestProject/CidrClassFullIpv6UnitTest.cs b/src/TestProject/CidrClassFullIpv6UnitTest.cs index 9b1b726f..af246ce5 100644 --- a/src/TestProject/CidrClassFullIpv6UnitTest.cs +++ b/src/TestProject/CidrClassFullIpv6UnitTest.cs @@ -18,10 +18,9 @@ public void TestIpV6TryGuessCidrNull() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + bool parsed = cidrguess.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(0, cidr, "cidr"); } @@ -33,10 +32,9 @@ public void TestIpV6TryGuessCidr1() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("::", out cidr); + bool parsed = cidrguess.TryGuessCidr("::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(64, cidr, "cidr"); } @@ -48,10 +46,9 @@ public void TestIpV6TryGuessCidr2() { var cidrguess = new CidrClassFull(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr); + bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(64, cidr, "cidr"); } } \ No newline at end of file diff --git a/src/TestProject/CidrClassLessUnitTest.cs b/src/TestProject/CidrClassLessUnitTest.cs index 4e0e8ae9..15737d5c 100644 --- a/src/TestProject/CidrClassLessUnitTest.cs +++ b/src/TestProject/CidrClassLessUnitTest.cs @@ -20,10 +20,9 @@ public void TestTryGuessCidrNull() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + bool parsed = cidrguess.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(0, cidr, "cidr"); } @@ -35,10 +34,9 @@ public void TestTryGuessCidrA() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(32, cidr, "cidr"); } @@ -50,10 +48,9 @@ public void TestTryGuessCidrB() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(32, cidr, "cidr"); } @@ -65,10 +62,9 @@ public void TestTryGuessCidrC() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(32, cidr, "cidr"); } @@ -80,10 +76,9 @@ public void TestTryGuessCidrD() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(32, cidr, "cidr"); } @@ -95,10 +90,9 @@ public void TestTryGuessCidrE() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr); + bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(32, cidr, "cidr"); } @@ -114,10 +108,9 @@ public void TestIpV6TryGuessCidrNull() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + bool parsed = cidrguess.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(0, cidr, "cidr"); } @@ -129,10 +122,9 @@ public void TestIpV6TryGuessCidr1() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("::", out cidr); + bool parsed = cidrguess.TryGuessCidr("::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(128, cidr, "cidr"); } @@ -144,10 +136,9 @@ public void TestIpV6TryGuessCidr2() { var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr); + bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(128, cidr, "cidr"); } diff --git a/src/TestProject/ContainsUnitTest.cs b/src/TestProject/ContainsUnitTest.cs index b66762f7..a6e78db8 100644 --- a/src/TestProject/ContainsUnitTest.cs +++ b/src/TestProject/ContainsUnitTest.cs @@ -61,7 +61,7 @@ public void TestContainsStatic3() IPNetwork2 ipnetwork2 = null; #pragma warning disable 0618 - bool result = IPNetwork2.Contains(ipnetwork, ipnetwork2); + IPNetwork2.Contains(ipnetwork, ipnetwork2); #pragma warning restore 0618 } @@ -91,7 +91,7 @@ public void TestContains8() var ipnetwork = IPNetwork2.Parse("0.0.0.0/0"); IPNetwork2 ipnetwork2 = null; - bool result = ipnetwork.Contains(ipnetwork2); + ipnetwork.Contains(ipnetwork2); } /// @@ -105,7 +105,7 @@ public void TestContainsStatic1() IPAddress ipaddress = null; #pragma warning disable 0618 - bool result = IPNetwork2.Contains(ipnetwork, ipaddress); + IPNetwork2.Contains(ipnetwork, ipaddress); #pragma warning restore 0618 } @@ -134,7 +134,7 @@ public void TestContains10() var ipnetwork = IPNetwork2.Parse("0.0.0.0/0"); IPAddress ipaddress = null; - bool result = ipnetwork.Contains(ipaddress); + ipnetwork.Contains(ipaddress); } /// diff --git a/src/TestProject/EqualsUnitTest.cs b/src/TestProject/EqualsUnitTest.cs index 602c80ab..a19485f3 100644 --- a/src/TestProject/EqualsUnitTest.cs +++ b/src/TestProject/EqualsUnitTest.cs @@ -21,9 +21,8 @@ public void TestEquals_ipv6_ipv4_0() var network1 = IPNetwork2.Parse("::/32"); var network2 = IPNetwork2.Parse("0.0.0.0/32"); bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } #endregion @@ -39,9 +38,8 @@ public void TestEquals_ipv4_1() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); bool result = network1.Equals(network2); - bool expected = true; - Assert.AreEqual(expected, result, "equals"); + Assert.IsTrue(result, "equals"); } /// @@ -53,9 +51,8 @@ public void TestEquals_ipv4_2() var network1 = IPNetwork2.Parse("192.168.0.1/24"); IPNetwork2 network2 = null; bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -67,9 +64,8 @@ public void TestEquals_ipv4_3() var network1 = IPNetwork2.Parse("192.168.0.1/24"); object network2 = string.Empty; bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -81,9 +77,8 @@ public void TestEquals_ipv4_4() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/25"); bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -95,9 +90,8 @@ public void TestEquals_ipv4_5() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } #endregion @@ -113,9 +107,8 @@ public void TestEquals_ipv6_1() var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::1/128"); bool result = network1.Equals(network2); - bool expected = true; - Assert.AreEqual(expected, result, "equals"); + Assert.IsTrue(result, "equals"); } /// @@ -127,9 +120,8 @@ public void TestEquals_ipv6_2() var network1 = IPNetwork2.Parse("::1/128"); IPNetwork2 network2 = null; bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -141,9 +133,8 @@ public void TestEquals_ipv6_3() var network1 = IPNetwork2.Parse("::1/128"); object network2 = string.Empty; bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -155,9 +146,8 @@ public void TestEquals_ipv6_4() var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::1/127"); bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } /// @@ -169,9 +159,8 @@ public void TestEquals_ipv6_5() var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::10/128"); bool result = network1.Equals(network2); - bool expected = false; - Assert.AreEqual(expected, result, "equals"); + Assert.IsFalse(result, "equals"); } #endregion diff --git a/src/TestProject/GetHashCodeUnitTest.cs b/src/TestProject/GetHashCodeUnitTest.cs index 1558e8d6..1415c2f2 100644 --- a/src/TestProject/GetHashCodeUnitTest.cs +++ b/src/TestProject/GetHashCodeUnitTest.cs @@ -70,12 +70,12 @@ public void TestGetHashCode_Dictionary_failed() bool contains5 = dic.ContainsKey(ipnetwork); bool contains6 = dic.ContainsKey(ipnetwork2); - Assert.AreEqual(false, contains1, "contains1"); - Assert.AreEqual(false, contains2, "contains2"); - Assert.AreEqual(true, contains3, "contains3"); - Assert.AreEqual(true, contains4, "contains4"); - Assert.AreEqual(true, contains5, "contains5"); - Assert.AreEqual(false, contains6, "contains6"); + Assert.IsFalse(contains1, "contains1"); + Assert.IsFalse(contains2, "contains2"); + Assert.IsTrue(contains3, "contains3"); + Assert.IsTrue(contains4, "contains4"); + Assert.IsTrue(contains5, "contains5"); + Assert.IsFalse(contains6, "contains6"); } #region Equals IPv6 vs IPv4 diff --git a/src/TestProject/IPAddressExtensionTests.cs b/src/TestProject/IPAddressExtensionTests.cs index d621963c..ec084766 100644 --- a/src/TestProject/IPAddressExtensionTests.cs +++ b/src/TestProject/IPAddressExtensionTests.cs @@ -19,30 +19,30 @@ public class IPAddressExtensionTests [TestMethod] public void IPAddressToIPNetwork_SingleAddress_IPv4() { - IPAddressToIPNetwork_SingleAddress_Internal( - 4, - "0.0.0.0", - "0.0.0.1", - "0.255.255.254", - "0.255.255.255", - "1.0.0.0", - "1.1.1.1", - "123.45.67.89", - "126.255.255.254", - "126.255.255.255", - "127.0.0.0", - "127.0.0.1", - "127.255.255.254", - "127.255.255.255", - "192.168.0.0", - "192.168.0.1", - "192.168.0.254", - "192.168.0.255", - "192.168.255.255", - "239.255.255.255", - "240.0.0.0", - "255.255.255.255"); - } + IPAddressToIPNetwork_SingleAddress_Internal( + 4, + "0.0.0.0", + "0.0.0.1", + "0.255.255.254", + "0.255.255.255", + "1.0.0.0", + "1.1.1.1", + "123.45.67.89", + "126.255.255.254", + "126.255.255.255", + "127.0.0.0", + "127.0.0.1", + "127.255.255.254", + "127.255.255.255", + "192.168.0.0", + "192.168.0.1", + "192.168.0.254", + "192.168.0.255", + "192.168.255.255", + "239.255.255.255", + "240.0.0.0", + "255.255.255.255"); + } /// /// Test converting a variety of IPv6 addreses into single-address networks. @@ -50,16 +50,16 @@ public void IPAddressToIPNetwork_SingleAddress_IPv4() [TestMethod] public void IPAddressToIPNetwork_SingleAddress_IPv6() { - IPAddressToIPNetwork_SingleAddress_Internal( - 16, - "::1", - "::", - "::1234:ABCD", - "1234::ABCD", - "1234:ABCD::", - "1:2:3:4:5:6:7:8", - "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); - } + IPAddressToIPNetwork_SingleAddress_Internal( + 16, + "::1", + "::", + "::1234:ABCD", + "1234::ABCD", + "1234:ABCD::", + "1:2:3:4:5:6:7:8", + "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); + } /// /// Shared test case, called upon by the above two test cases. @@ -70,22 +70,22 @@ private static void IPAddressToIPNetwork_SingleAddress_Internal( int byteCount, params string[] interestingAddrs) { - /* Start the collection of test cases with the addresses from the caller. */ - var addrs = interestingAddrs.ToList(); + /* Start the collection of test cases with the addresses from the caller. */ + var addrs = interestingAddrs.ToList(); - /* Populate with random but deterministic addresses. */ - addrs.AddRange(RandomIPs(byteCount)); + /* Populate with random but deterministic addresses. */ + addrs.AddRange(RandomIPs(byteCount)); - /* Loop through all of the test cases. */ - foreach (IPAddress ipAddr in addrs.Select(IPAddress.Parse)) - { - /* Convert to network, then pass the network object to a checker. */ - TestForSingleAddressNetwork( - ipAddr, - ipAddr.AsIPNetwork(), - byteCount * 8); - } + /* Loop through all of the test cases. */ + foreach (IPAddress ipAddr in addrs.Select(IPAddress.Parse)) + { + /* Convert to network, then pass the network object to a checker. */ + TestForSingleAddressNetwork( + ipAddr, + ipAddr.AsIPNetwork(), + byteCount * 8); } + } /// /// Generate random but deterministic IPs. @@ -94,38 +94,38 @@ private static void IPAddressToIPNetwork_SingleAddress_Internal( /// Collection of random IP addresses. private static IEnumerable RandomIPs(int byteCount) { - /* Start from a fixed starting byte array. - ng a GUID's bytes so the sequence will be unique, with the first - e XOR'd with the byte count so the two sequences will be different. */ - byte[] hashInput = Guid.Parse("12f2c3ba-7bd1-4ec3-922c-a5625b8f5dd5").ToByteArray(); - hashInput[0] ^= (byte)byteCount; + /* Start from a fixed starting byte array. + ng a GUID's bytes so the sequence will be unique, with the first + e XOR'd with the byte count so the two sequences will be different. */ + byte[] hashInput = Guid.Parse("12f2c3ba-7bd1-4ec3-922c-a5625b8f5dd5").ToByteArray(); + hashInput[0] ^= (byte)byteCount; - /* Loop many times. */ - foreach (int i in Enumerable.Range(1, 1000)) + /* Loop many times. */ + foreach (int i in Enumerable.Range(1, 1000)) + { + /* Hash the current interation to get a new block of deterministic bytes. */ + using (var hash = SHA256.Create()) { - /* Hash the current interation to get a new block of deterministic bytes. */ - using (var hash = SHA256.Create()) - { - hashInput = hash.ComputeHash(hashInput); - } - - /* Convert the first n bytes for an address. 4 will have an IPv4. 16 will make an IPv6. */ - yield return new IPAddress(hashInput.Take(byteCount).ToArray()).ToString(); + hashInput = hash.ComputeHash(hashInput); } + + /* Convert the first n bytes for an address. 4 will have an IPv4. 16 will make an IPv6. */ + yield return new IPAddress(hashInput.Take(byteCount).ToArray()).ToString(); } + } /// /// Test if a single address network is valid. /// /// Expected addresss. /// Actual network. - /// Expected CIDRsize. (32 or 128.) + /// Expected CIDRsize. (32 or 128). private static void TestForSingleAddressNetwork(IPAddress ipAddr, IPNetwork2 net, int expectedSize) { - Assert.AreEqual($"{ipAddr}/{expectedSize}", $"{net}"); - Assert.AreEqual(ipAddr, net.FirstUsable); - Assert.AreEqual(ipAddr, net.LastUsable); - Assert.AreEqual(1, net.Total); - Assert.AreEqual(expectedSize, net.Cidr); - } + Assert.AreEqual($"{ipAddr}/{expectedSize}", $"{net}"); + Assert.AreEqual(ipAddr, net.FirstUsable); + Assert.AreEqual(ipAddr, net.LastUsable); + Assert.AreEqual(1, net.Total); + Assert.AreEqual(expectedSize, net.Cidr); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkCollectionCtorTests.cs b/src/TestProject/IPNetworkCollectionCtorTests.cs index 58fdbea6..7b135fc2 100644 --- a/src/TestProject/IPNetworkCollectionCtorTests.cs +++ b/src/TestProject/IPNetworkCollectionCtorTests.cs @@ -5,7 +5,7 @@ namespace TestProject; /// -/// Test constructor af IPNetworkCollection +/// Test constructor af IPNetworkCollection. /// [TestClass] public class IPNetworkCollectionCtorTests diff --git a/src/TestProject/IPNetworkCollectionCurrentTests.cs b/src/TestProject/IPNetworkCollectionCurrentTests.cs index 79ce1022..f76aeb73 100644 --- a/src/TestProject/IPNetworkCollectionCurrentTests.cs +++ b/src/TestProject/IPNetworkCollectionCurrentTests.cs @@ -5,7 +5,7 @@ namespace TestProject; /// -/// Test IPNetworkCollection Current +/// Test IPNetworkCollection Current. /// [TestClass] public class IPNetworkCollectionCurrentTests diff --git a/src/TestProject/IPNetworkCollectionMoveNextTests.cs b/src/TestProject/IPNetworkCollectionMoveNextTests.cs index 8dd076fd..b47bafb3 100644 --- a/src/TestProject/IPNetworkCollectionMoveNextTests.cs +++ b/src/TestProject/IPNetworkCollectionMoveNextTests.cs @@ -20,7 +20,7 @@ public void MoveNext1() using (IPNetworkCollection ipns = ipn.Subnet(32)) { bool next = ipns.MoveNext(); - Assert.AreEqual(true, next, "next"); + Assert.IsTrue(next, "next"); } } @@ -39,7 +39,7 @@ public void MoveNext2() ipns.MoveNext(); bool next = ipns.MoveNext(); - Assert.AreEqual(false, next, "next"); + Assert.IsFalse(next, "next"); } } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs b/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs index 23761d6c..44c69748 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs @@ -76,7 +76,7 @@ public void TestCompareTo5() var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); string ipn2 = string.Empty; - int comparison = ipn1.CompareTo(ipn2); + ipn1.CompareTo(ipn2); } /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs b/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs index f9d80401..dc48a0cf 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs @@ -178,8 +178,8 @@ public void When_TrySupernet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Sho var network = IPNetwork2.Parse("192.168.0.0/24"); var network2 = IPNetwork2.Parse("192.168.10.0/24"); - bool supernetted = network.TrySupernet(network2, out IPNetwork2 ipnetwork); - Assert.AreEqual(false, supernetted); + bool supernetted = network.TrySupernet(network2, out IPNetwork2 _); + Assert.IsFalse(supernetted); } /// @@ -192,7 +192,7 @@ public void When_TryWideSubnet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_S var network2 = IPNetwork2.Parse("192.168.10.0/24"); bool wideSubnetted = IPNetwork2.TryWideSubnet(new[] { network, network2 }, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, wideSubnetted); + Assert.IsTrue(wideSubnetted); Assert.AreEqual("192.168.0.0/20", ipnetwork.ToString()); Console.WriteLine("Network : {0}", ipnetwork.Network); diff --git a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs index 748010c7..022ff7e3 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs @@ -108,7 +108,7 @@ public void TestIana8() { IPNetwork2 ipnetwork = null; #pragma warning disable 0618 - bool result = IPNetwork2.IsIANAReserved(ipnetwork); + IPNetwork2.IsIANAReserved(ipnetwork); #pragma warning restore 0618 } diff --git a/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs b/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs index 8aea3564..a0cf4ca7 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs @@ -21,7 +21,7 @@ public void TestOperatorGreater1() bool greater = ipn1 > ipn2; - Assert.AreEqual(false, greater, "greater"); + Assert.IsFalse(greater, "greater"); } /// @@ -35,7 +35,7 @@ public void TestOperatorGreater2() bool greater = ipn1 > ipn2; - Assert.AreEqual(true, greater, "greater"); + Assert.IsTrue(greater, "greater"); } /// @@ -49,7 +49,7 @@ public void TestOperatorLower1() bool lower = ipn1 < ipn2; - Assert.AreEqual(true, lower, "lower"); + Assert.IsTrue(lower, "lower"); } /// @@ -63,7 +63,7 @@ public void TestOperatorLower2() bool lower = ipn1 < ipn2; - Assert.AreEqual(false, lower, "lower"); + Assert.IsFalse(lower, "lower"); } /// @@ -77,7 +77,7 @@ public void TestOperatorDifferent1() bool different = ipn1 != ipn2; - Assert.AreEqual(true, different, "different"); + Assert.IsTrue(different, "different"); } /// @@ -91,7 +91,7 @@ public void TestOperatorDifferent2() bool different = ipn1 != ipn2; - Assert.AreEqual(false, different, "different"); + Assert.IsFalse(different, "different"); } /// @@ -105,7 +105,7 @@ public void TestOperatorEqual1() bool eq = ipn1 == ipn2; - Assert.AreEqual(false, eq, "eq"); + Assert.IsFalse(eq, "eq"); } /// @@ -119,6 +119,6 @@ public void TestOperatorEqual2() bool eq = ipn1 == ipn2; - Assert.AreEqual(true, eq, "eq"); + Assert.IsTrue(eq, "eq"); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs index d5318f25..06734fde 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs @@ -21,7 +21,7 @@ public void TestOverlap1() IPNetwork2 network2 = null; #pragma warning disable 0618 - bool result = IPNetwork2.Overlap(network1, network2); + IPNetwork2.Overlap(network1, network2); #pragma warning restore 0618 } diff --git a/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs b/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs index 494bd0a5..f37fd280 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs @@ -5,7 +5,7 @@ namespace TestProject.IPNetworkTest; /// -/// Test parse ip +/// Test parse ip. /// [TestClass] public class IPNetworkParseIpIpTests @@ -33,7 +33,7 @@ public void ParseIpIp2() { IPAddress ip = null; IPAddress netm = null; - var ipnetwork = IPNetwork2.Parse(ip, netm); + IPNetwork2.Parse(ip, netm); } /// @@ -46,6 +46,6 @@ public void ParseIpIp3() string ipaddress = "192.168.168.100"; var ip = IPAddress.Parse(ipaddress); IPAddress netm = null; - var ipnetwork = IPNetwork2.Parse(ip, netm); + IPNetwork2.Parse(ip, netm); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs b/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs index 2d8e3ee0..eec473fc 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs @@ -33,7 +33,7 @@ public void TestParseStringString2() string ipaddress = null; string netmask = null; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } /// @@ -46,7 +46,7 @@ public void TestParseStringString3() string ipaddress = "192.168.168.100"; string netmask = null; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } /// @@ -59,7 +59,7 @@ public void TestParseStringString4() string ipaddress = string.Empty; string netmask = string.Empty; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } /// @@ -72,6 +72,6 @@ public void TestParseStringString5() string ipaddress = "192.168.168.100"; string netmask = string.Empty; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs b/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs index a5b65cd3..97b32220 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs @@ -64,8 +64,8 @@ public void TestParseIPAddressNetmaskAne5() [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne8() { - var ipnet = IPNetwork2.Parse("x.x.x.x", "x.x.x.x"); - } + IPNetwork2.Parse("x.x.x.x", "x.x.x.x"); + } /// /// Test. @@ -75,8 +75,8 @@ public void TestParseIPAddressNetmaskAne8() [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne9() { - var ipnet = IPNetwork2.Parse("0.0.0.0", "x.x.x.x"); - } + IPNetwork2.Parse("0.0.0.0", "x.x.x.x"); + } /// /// Test. @@ -86,8 +86,8 @@ public void TestParseIPAddressNetmaskAne9() [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne10() { - var ipnet = IPNetwork2.Parse("x.x.x.x", 0); - } + IPNetwork2.Parse("x.x.x.x", 0); + } /// /// Test. @@ -97,8 +97,8 @@ public void TestParseIPAddressNetmaskAne10() [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne11() { - var ipnet = IPNetwork2.Parse("0.0.0.0", 33); - } + IPNetwork2.Parse("0.0.0.0", 33); + } /// /// Tests Parse functionality with Parse IPAddress Netmask. @@ -565,8 +565,7 @@ public void TestParseIPAddressNoNetmask5() public void TestParseIPAddressNoNetmask127001() { string ipaddress = "127.0.0.1"; - IPNetwork2 result = null; - IPNetwork2.TryParse(ipaddress, out result); + IPNetwork2.TryParse(ipaddress, out IPNetwork2 result); Assert.AreEqual(result.Cidr, 8); } @@ -577,9 +576,9 @@ public void TestParseIPAddressNoNetmask127001() [ExpectedException(typeof(ArgumentException))] public void TestParseStringAe1() { - string ipaddress = "garbage"; - var ipnetwork = IPNetwork2.Parse(ipaddress); - } + string ipaddress = "garbage"; + IPNetwork2.Parse(ipaddress); + } /// /// Test. @@ -588,9 +587,9 @@ public void TestParseStringAe1() [ExpectedException(typeof(ArgumentException))] public void TestParseStringAe2() { - string ipaddress = "0.0.0.0 0.0.1.0"; - var ipnetwork = IPNetwork2.Parse(ipaddress); - } + string ipaddress = "0.0.0.0 0.0.1.0"; + IPNetwork2.Parse(ipaddress); + } /// /// Test. @@ -599,7 +598,7 @@ public void TestParseStringAe2() [ExpectedException(typeof(ArgumentNullException))] public void TestParseStringAne1() { - string ipaddress = null; - var ipnetwork = IPNetwork2.Parse(ipaddress); - } + string ipaddress = null; + IPNetwork2.Parse(ipaddress); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs index 017552fc..517ee119 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs @@ -38,11 +38,11 @@ public void Print() [ExpectedException(typeof(ArgumentNullException))] public void PrintNull() { - IPNetwork2 ipn = null; + IPNetwork2 ipn = null; #pragma warning disable 0618 - string print = IPNetwork2.Print(ipn); + IPNetwork2.Print(ipn); #pragma warning restore 0618 - } + } /// /// Tests Print functionality. @@ -50,9 +50,9 @@ public void PrintNull() [TestMethod] public void PrintStatic() { - IPNetwork2 ipn = IPNetwork2.IANA_ABLK_RESERVED1; + IPNetwork2 ipn = IPNetwork2.IANA_ABLK_RESERVED1; #pragma warning disable 0618 - string print = IPNetwork2.Print(ipn); + IPNetwork2.Print(ipn); #pragma warning restore 0618 - } + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs b/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs index 0e7fadd2..9b15ddca 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs @@ -17,6 +17,6 @@ public class IPNetworkResizeTests [ExpectedException(typeof(ArgumentException))] public void TestResize1() { - byte[] resut = IPNetwork2.Resize(new byte[33], AddressFamily.InterNetwork); - } + IPNetwork2.Resize(new byte[33], AddressFamily.InterNetwork); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs index c1de933d..1ef4bf9b 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs @@ -20,8 +20,7 @@ public void TestSort1() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } @@ -44,8 +43,7 @@ public void TestSort2() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, out ipn)) + if (IPNetwork2.TryParse(ip, out IPNetwork2 ipn)) { ipns.Add(ipn); } diff --git a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs index 7b0fc6cc..fe2370fa 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs @@ -21,7 +21,7 @@ public void TestSubnet1() byte cidr = 9; #pragma warning disable 0618 - IPNetworkCollection result = IPNetwork2.Subnet(ipnetwork, cidr); + IPNetwork2.Subnet(ipnetwork, cidr); #pragma warning restore 0618 } @@ -35,7 +35,7 @@ public void TestSubnetStatic1() byte cidr = 9; #pragma warning disable 0618 - IPNetworkCollection result = IPNetwork2.Subnet(ipnetwork, cidr); + IPNetwork2.Subnet(ipnetwork, cidr); #pragma warning restore 0618 } @@ -49,7 +49,7 @@ public void TestSubnet3() IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 55; - IPNetworkCollection subnets = ipnetwork.Subnet(cidr); + ipnetwork.Subnet(cidr); } /// @@ -62,7 +62,7 @@ public void TestSubnet4() IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 1; - IPNetworkCollection subnets = ipnetwork.Subnet(cidr); + ipnetwork.Subnet(cidr); } /// @@ -219,5 +219,5 @@ public void TestSubnet13() byte cidr = 20; IPNetworkCollection subnets = ipnetwork.Subnet(cidr); IPNetwork2 error = subnets[1000]; - } + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs index 089410a0..53db8b5c 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs @@ -51,9 +51,9 @@ public void TestTrySupernetArray1() [ExpectedException(typeof(ArgumentNullException))] public void TestTrySupernetArray2() { - IPNetwork2[] ipnetworks = null; - IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks); - } + IPNetwork2[] ipnetworks = null; + IPNetwork2.Supernet(ipnetworks); + } /// /// Tests Supernet Array functionality with Try Supernet Array3. diff --git a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs index b35b19b4..4266043a 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs @@ -16,8 +16,7 @@ public class IPNetworkSupernetTests [TestMethod] public void TestSupernetInternal1() { - IPNetwork2 result; - IPNetwork2.InternalSupernet(true, null, null, out result); + IPNetwork2.InternalSupernet(true, null, null, out IPNetwork2 result); Assert.AreEqual(null, result, "supernet"); } @@ -101,7 +100,7 @@ public void TestSupernet2() { IPNetwork2 network1 = null; var network2 = IPNetwork2.Parse("192.168.1.1/24"); - IPNetwork2 supernet = network1.Supernet(network2); + network1.Supernet(network2); } /// @@ -113,7 +112,7 @@ public void TestSupernet3() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2 network2 = null; - IPNetwork2 supernet = network1.Supernet(network2); + network1.Supernet(network2); } /// @@ -125,7 +124,7 @@ public void TestSupernet4() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/25"); - IPNetwork2 supernet = network1.Supernet(network2); + network1.Supernet(network2); } /// @@ -137,7 +136,7 @@ public void TestSupernet5() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.5.1/24"); - IPNetwork2 supernet = network1.Supernet(network2); + network1.Supernet(network2); } /// @@ -193,7 +192,7 @@ public void TestSupernet8() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); var network2 = IPNetwork2.Parse("192.168.2.1/24"); - IPNetwork2 supernet = network1.Supernet(network2); + network1.Supernet(network2); } /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs index 2be7bc55..c25783a4 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs @@ -16,12 +16,12 @@ public class IPNetworkToBigIntegerTests [TestMethod] public void TestToBigInteger32() { - var mask = IPAddress.Parse("255.255.255.255"); - uint uintMask = 0xffffffff; - var result = IPNetwork2.ToBigInteger(mask); + var mask = IPAddress.Parse("255.255.255.255"); + uint uintMask = 0xffffffff; + var result = IPNetwork2.ToBigInteger(mask); - Assert.AreEqual(uintMask, result, "uint"); - } + Assert.AreEqual(uintMask, result, "uint"); + } /// /// Tests To Big Integer functionality with To Big Integer24. @@ -29,12 +29,12 @@ public void TestToBigInteger32() [TestMethod] public void TestToBigInteger24() { - var mask = IPAddress.Parse("255.255.255.0"); - uint uintMask = 0xffffff00; - BigInteger? result = IPNetwork2.ToBigInteger(mask); + var mask = IPAddress.Parse("255.255.255.0"); + uint uintMask = 0xffffff00; + BigInteger? result = IPNetwork2.ToBigInteger(mask); - Assert.AreEqual(uintMask, result, "uint"); - } + Assert.AreEqual(uintMask, result, "uint"); + } /// /// Tests To Big Integer functionality with To Big Integer16. @@ -42,12 +42,12 @@ public void TestToBigInteger24() [TestMethod] public void TestToBigInteger16() { - var mask = IPAddress.Parse("255.255.0.0"); - uint uintMask = 0xffff0000; - BigInteger? result = IPNetwork2.ToBigInteger(mask); + var mask = IPAddress.Parse("255.255.0.0"); + uint uintMask = 0xffff0000; + BigInteger? result = IPNetwork2.ToBigInteger(mask); - Assert.AreEqual(uintMask, result, "uint"); - } + Assert.AreEqual(uintMask, result, "uint"); + } /// /// Tests To Big Integer functionality with To Big Integer8. @@ -55,12 +55,12 @@ public void TestToBigInteger16() [TestMethod] public void TestToBigInteger8() { - var mask = IPAddress.Parse("255.0.0.0"); - uint uintMask = 0xff000000; - BigInteger? result = IPNetwork2.ToBigInteger(mask); + var mask = IPAddress.Parse("255.0.0.0"); + uint uintMask = 0xff000000; + BigInteger? result = IPNetwork2.ToBigInteger(mask); - Assert.AreEqual(uintMask, result, "uint"); - } + Assert.AreEqual(uintMask, result, "uint"); + } /// /// Tests To Big Integer functionality with To Big Integer0. @@ -68,12 +68,12 @@ public void TestToBigInteger8() [TestMethod] public void TestToBigInteger0() { - var mask = IPAddress.Parse("0.0.0.0"); - uint uintMask = 0x00000000; - BigInteger? result = IPNetwork2.ToBigInteger(mask); + var mask = IPAddress.Parse("0.0.0.0"); + uint uintMask = 0x00000000; + BigInteger? result = IPNetwork2.ToBigInteger(mask); - Assert.AreEqual(uintMask, result, "uint"); - } + Assert.AreEqual(uintMask, result, "uint"); + } /// /// Try to convert from null. @@ -82,8 +82,8 @@ public void TestToBigInteger0() [ExpectedException(typeof(ArgumentNullException))] public void TestToBigIntegerAne() { - BigInteger? result = IPNetwork2.ToBigInteger(null); - } + IPNetwork2.ToBigInteger(null); + } /// /// Try to convert from null IPAddress. @@ -92,9 +92,9 @@ public void TestToBigIntegerAne() [ExpectedException(typeof(ArgumentNullException))] public void TestToBigIntegerAne3() { - IPAddress ip = null; - BigInteger? result = IPNetwork2.ToBigInteger(ip); - } + IPAddress ip = null; + IPNetwork2.ToBigInteger(ip); + } /// /// Tests To Big Integer functionality with To Big Integer ANE2. @@ -102,10 +102,10 @@ public void TestToBigIntegerAne3() [TestMethod] public void TestToBigIntegerAne2() { - BigInteger? result = IPNetwork2.ToBigInteger(IPAddress.IPv6Any); - uint expected = 0; - Assert.AreEqual(expected, result, "result"); - } + BigInteger? result = IPNetwork2.ToBigInteger(IPAddress.IPv6Any); + uint expected = 0; + Assert.AreEqual(expected, result, "result"); + } /// /// Try to convert from invalid cidr. @@ -114,8 +114,8 @@ public void TestToBigIntegerAne2() [ExpectedException(typeof(ArgumentOutOfRangeException))] public void TestToBigIntegerByte() { - BigInteger result = IPNetwork2.ToUint(33, AddressFamily.InterNetwork); - } + IPNetwork2.ToUint(33, AddressFamily.InterNetwork); + } /// /// Tests To Big Integer functionality with To Big Integer Byte2. @@ -123,10 +123,10 @@ public void TestToBigIntegerByte() [TestMethod] public void TestToBigIntegerByte2() { - BigInteger result = IPNetwork2.ToUint(32, AddressFamily.InterNetwork); - uint expected = 4294967295; - Assert.AreEqual(expected, result, "result"); - } + BigInteger result = IPNetwork2.ToUint(32, AddressFamily.InterNetwork); + uint expected = 4294967295; + Assert.AreEqual(expected, result, "result"); + } /// /// Tests To Big Integer functionality with To Big Integer Byte3. @@ -134,10 +134,10 @@ public void TestToBigIntegerByte2() [TestMethod] public void TestToBigIntegerByte3() { - BigInteger result = IPNetwork2.ToUint(0, AddressFamily.InterNetwork); - uint expected = 0; - Assert.AreEqual(expected, result, "result"); - } + BigInteger result = IPNetwork2.ToUint(0, AddressFamily.InterNetwork); + uint expected = 0; + Assert.AreEqual(expected, result, "result"); + } /// /// Tests To Big Integer functionality with To Big Integer Internal1. @@ -145,10 +145,9 @@ public void TestToBigIntegerByte3() [TestMethod] public void TestToBigIntegerInternal1() { - BigInteger? result = null; - IPNetwork2.InternalToBigInteger(true, 33, AddressFamily.InterNetwork, out result); - Assert.AreEqual(null, result, "result"); - } + IPNetwork2.InternalToBigInteger(true, 33, AddressFamily.InterNetwork, out BigInteger? result); + Assert.AreEqual(null, result, "result"); + } /// /// Tests To Big Integer functionality with To Big Integer Internal2. @@ -156,10 +155,9 @@ public void TestToBigIntegerInternal1() [TestMethod] public void TestToBigIntegerInternal2() { - BigInteger? result = null; - IPNetwork2.InternalToBigInteger(true, 129, AddressFamily.InterNetworkV6, out result); - Assert.AreEqual(null, result, "result"); - } + IPNetwork2.InternalToBigInteger(true, 129, AddressFamily.InterNetworkV6, out BigInteger? result); + Assert.AreEqual(null, result, "result"); + } /// /// Try to convert from invalid IPV6 cidr. @@ -168,9 +166,8 @@ public void TestToBigIntegerInternal2() [ExpectedException(typeof(ArgumentOutOfRangeException))] public void TestToBigIntegerInternal3() { - BigInteger? result = null; - IPNetwork2.InternalToBigInteger(false, 129, AddressFamily.InterNetworkV6, out result); - } + IPNetwork2.InternalToBigInteger(false, 129, AddressFamily.InterNetworkV6, out BigInteger? _); + } /// /// Try to convert from invalid AddressFamily. @@ -179,9 +176,8 @@ public void TestToBigIntegerInternal3() [ExpectedException(typeof(NotSupportedException))] public void TestToBigIntegerInternal4() { - BigInteger? result = null; - IPNetwork2.InternalToBigInteger(false, 32, AddressFamily.AppleTalk, out result); - } + IPNetwork2.InternalToBigInteger(false, 32, AddressFamily.AppleTalk, out BigInteger? _); + } /// /// Tests To Big Integer functionality with To Big Integer Internal5. @@ -189,8 +185,7 @@ public void TestToBigIntegerInternal4() [TestMethod] public void TestToBigIntegerInternal5() { - BigInteger? result = null; - IPNetwork2.InternalToBigInteger(true, 32, AddressFamily.AppleTalk, out result); - Assert.AreEqual(null, result, "result"); - } + IPNetwork2.InternalToBigInteger(true, 32, AddressFamily.AppleTalk, out BigInteger? result); + Assert.AreEqual(null, result, "result"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs index e6a0534e..2f5613bb 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs @@ -28,9 +28,9 @@ public void TestToIPAddress() [ExpectedException(typeof(ArgumentException))] public void TestToIPAddress2() { - var ip = new BigInteger(0); - var result = IPNetwork2.ToIPAddress(ip, AddressFamily.AppleTalk); - } + var ip = new BigInteger(0); + IPNetwork2.ToIPAddress(ip, AddressFamily.AppleTalk); + } /// /// Test. @@ -39,7 +39,7 @@ public void TestToIPAddress2() [ExpectedException(typeof(ArgumentException))] public void TestToIPAddress3() { - var ip = new BigInteger(new byte[] + var ip = new BigInteger(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -51,6 +51,6 @@ public void TestToIPAddress3() 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }); - var result = IPNetwork2.ToIPAddress(ip, AddressFamily.AppleTalk); - } + IPNetwork2.ToIPAddress(ip, AddressFamily.AppleTalk); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs index 62201ca9..5f9465f1 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs @@ -31,7 +31,7 @@ public void ToNetmask32() public void ToNetmaskNonInet() { byte cidr = 0; - string result = IPNetwork2.ToNetmask(cidr, AddressFamily.AppleTalk).ToString(); + IPNetwork2.ToNetmask(cidr, AddressFamily.AppleTalk); } /// @@ -43,18 +43,18 @@ public void ToNetmaskNegative() { byte cidr = 0; cidr--; - string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork).ToString(); + IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork); } /// - /// Test with too big of a cidr + /// Test with too big of a cidr. /// [TestMethod] [ExpectedException(typeof(ArgumentOutOfRangeException))] public void ToNetmaskOore1() { byte cidr = 33; - string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork).ToString(); + IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork); } /// @@ -63,8 +63,7 @@ public void ToNetmaskOore1() [TestMethod] public void ToNetmaskInternal1() { - IPAddress result; - IPNetwork2.InternalToNetmask(true, 0, AddressFamily.AppleTalk, out result); + IPNetwork2.InternalToNetmask(true, 0, AddressFamily.AppleTalk, out IPAddress result); Assert.AreEqual(null, result); } diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs index 4590f319..af92332b 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs @@ -16,12 +16,11 @@ public class IPNetworkTryGuessCidrTests [TestMethod] public void TestTryGuessCidrNull() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr(null, out cidr); + bool parsed = IPNetwork2.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(0, cidr, "cidr"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(0, cidr, "cidr"); + } /// /// Tests Try Guess Cidr functionality with Try Guess Cidr A. @@ -29,12 +28,11 @@ public void TestTryGuessCidrNull() [TestMethod] public void TestTryGuessCidrA() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("10.0.0.0", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("10.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(8, cidr, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(8, cidr, "cidr"); + } /// /// Tests Try Guess Cidr functionality with Try Guess Cidr B. @@ -42,12 +40,11 @@ public void TestTryGuessCidrA() [TestMethod] public void TestTryGuessCidrB() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("172.0.0.0", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("172.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(16, cidr, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(16, cidr, "cidr"); + } /// /// Tests Try Guess Cidr functionality with Try Guess Cidr C. @@ -55,12 +52,11 @@ public void TestTryGuessCidrB() [TestMethod] public void TestTryGuessCidrC() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("192.0.0.0", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("192.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(24, cidr, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(24, cidr, "cidr"); + } /// /// Tests Try Guess Cidr functionality with Try Guess Cidr D. @@ -68,12 +64,11 @@ public void TestTryGuessCidrC() [TestMethod] public void TestTryGuessCidrD() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("224.0.0.0", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("224.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(24, cidr, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(24, cidr, "cidr"); + } /// /// Tests Try Guess Cidr functionality with Try Guess Cidr E. @@ -81,10 +76,9 @@ public void TestTryGuessCidrD() [TestMethod] public void TestTryGuessCidrE() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("240.0.0.0", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("240.0.0.0", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(24, cidr, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(24, cidr, "cidr"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs index d2b2003a..960e16aa 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs @@ -17,11 +17,10 @@ public class IPNetworkTryParseCidrTests public void TryParseCidr1() { string sidr = "0"; - byte? cidr; byte? result = 0; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } @@ -32,12 +31,11 @@ public void TryParseCidr1() public void TryParseCidr2() { string sidr = "sadsd"; - byte? cidr; byte? result = null; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out byte? cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } @@ -48,12 +46,11 @@ public void TryParseCidr2() public void TryParseCidr3() { string sidr = "33"; - byte? cidr; byte? result = null; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetwork, out byte? cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs index 6ed27924..41903b70 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs @@ -16,13 +16,12 @@ public class IPNetworkTryParseTests [TestMethod] public void TestTryParseIPAddressNetmaskAne2() { - IPNetwork2 ipnet = null; - IPAddress ip = null; - bool parsed = IPNetwork2.TryParse(ip, ip, out ipnet); + IPAddress ip = null; + bool parsed = IPNetwork2.TryParse(ip, ip, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE3. @@ -30,12 +29,11 @@ public void TestTryParseIPAddressNetmaskAne2() [TestMethod] public void TestTryParseIPAddressNetmaskAne3() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse(string.Empty, 0, out ipnet); + bool parsed = IPNetwork2.TryParse(string.Empty, 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE4. @@ -43,12 +41,11 @@ public void TestTryParseIPAddressNetmaskAne3() [TestMethod] public void TestTryParseIPAddressNetmaskAne4() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse(null, 0, out ipnet); + bool parsed = IPNetwork2.TryParse(null, 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE5. @@ -56,13 +53,12 @@ public void TestTryParseIPAddressNetmaskAne4() [TestMethod] public void TestTryParseIPAddressNetmaskAne5() { - string n = null; - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse(n, n, out ipnet); + string n = null; + bool parsed = IPNetwork2.TryParse(n, n, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE6. @@ -70,11 +66,10 @@ public void TestTryParseIPAddressNetmaskAne5() [TestMethod] public void TestTryParseIPAddressNetmaskAne6() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse(IPAddress.Parse("10.10.10.10"), null, out ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + bool parsed = IPNetwork2.TryParse(IPAddress.Parse("10.10.10.10"), null, out IPNetwork2 ipnet); + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE7. @@ -82,12 +77,11 @@ public void TestTryParseIPAddressNetmaskAne6() [TestMethod] public void TestTryParseIPAddressNetmaskAne7() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse("0.0.0.0", netmask: null, out ipnet); + bool parsed = IPNetwork2.TryParse("0.0.0.0", netmask: null, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE8. @@ -95,12 +89,11 @@ public void TestTryParseIPAddressNetmaskAne7() [TestMethod] public void TestTryParseIPAddressNetmaskAne8() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse("x.x.x.x", "x.x.x.x", out ipnet); + bool parsed = IPNetwork2.TryParse("x.x.x.x", "x.x.x.x", out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE9. @@ -108,12 +101,11 @@ public void TestTryParseIPAddressNetmaskAne8() [TestMethod] public void TestTryParseIPAddressNetmaskAne9() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse("0.0.0.0", "x.x.x.x", out ipnet); + bool parsed = IPNetwork2.TryParse("0.0.0.0", "x.x.x.x", out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE10. @@ -121,12 +113,11 @@ public void TestTryParseIPAddressNetmaskAne9() [TestMethod] public void TestTryParseIPAddressNetmaskAne10() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse("x.x.x.x", 0, out ipnet); + bool parsed = IPNetwork2.TryParse("x.x.x.x", 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE11. @@ -134,12 +125,11 @@ public void TestTryParseIPAddressNetmaskAne10() [TestMethod] public void TestTryParseIPAddressNetmaskAne11() { - IPNetwork2 ipnet = null; - bool parsed = IPNetwork2.TryParse("0.0.0.0", 33, out ipnet); + bool parsed = IPNetwork2.TryParse("0.0.0.0", 33, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(null, ipnet, "ipnet"); - } + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, ipnet, "ipnet"); + } /// /// Tests Try Parse functionality with Try Parse IPAddress Netmask. @@ -147,27 +137,26 @@ public void TestTryParseIPAddressNetmaskAne11() [TestMethod] public void TestTryParseIPAddressNetmask() { - IPNetwork2 ipnetwork = null; - string ipaddress = "192.168.168.100"; - string netmask = "255.255.255.0"; - - string network = "192.168.168.0"; - string broadcast = "192.168.168.255"; - string firstUsable = "192.168.168.1"; - string lastUsable = "192.168.168.254"; - byte cidr = 24; - uint usable = 254; - - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "192.168.168.100"; + string netmask = "255.255.255.0"; + + string network = "192.168.168.0"; + string broadcast = "192.168.168.255"; + string firstUsable = "192.168.168.1"; + string lastUsable = "192.168.168.254"; + byte cidr = 24; + uint usable = 254; + + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String1. @@ -175,27 +164,26 @@ public void TestTryParseIPAddressNetmask() [TestMethod] public void TestTryParseString1() { - IPNetwork2 ipnetwork = null; - string ipaddress = "192.168.168.100 255.255.255.0"; - - string network = "192.168.168.0"; - string netmask = "255.255.255.0"; - string broadcast = "192.168.168.255"; - string firstUsable = "192.168.168.1"; - string lastUsable = "192.168.168.254"; - byte cidr = 24; - uint usable = 254; - - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "192.168.168.100 255.255.255.0"; + + string network = "192.168.168.0"; + string netmask = "255.255.255.0"; + string broadcast = "192.168.168.255"; + string firstUsable = "192.168.168.1"; + string lastUsable = "192.168.168.254"; + byte cidr = 24; + uint usable = 254; + + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String2. @@ -203,27 +191,26 @@ public void TestTryParseString1() [TestMethod] public void TestTryParseString2() { - IPNetwork2 ipnetwork = null; - string ipaddress = "192.168.168.100/24"; - - string network = "192.168.168.0"; - string netmask = "255.255.255.0"; - string broadcast = "192.168.168.255"; - string firstUsable = "192.168.168.1"; - string lastUsable = "192.168.168.254"; - byte cidr = 24; - uint usable = 254; - - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "192.168.168.100/24"; + + string network = "192.168.168.0"; + string netmask = "255.255.255.0"; + string broadcast = "192.168.168.255"; + string firstUsable = "192.168.168.1"; + string lastUsable = "192.168.168.254"; + byte cidr = 24; + uint usable = 254; + + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String3. @@ -231,27 +218,26 @@ public void TestTryParseString2() [TestMethod] public void TestTryParseString3() { - IPNetwork2 ipnetwork = null; - string ipaddress = "0.0.0.0/0"; - - string network = "0.0.0.0"; - string netmask = "0.0.0.0"; - string broadcast = "255.255.255.255"; - string firstUsable = "0.0.0.1"; - string lastUsable = "255.255.255.254"; - byte cidr = 0; - uint usable = 4294967294; - - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "0.0.0.0/0"; + + string network = "0.0.0.0"; + string netmask = "0.0.0.0"; + string broadcast = "255.255.255.255"; + string firstUsable = "0.0.0.1"; + string lastUsable = "255.255.255.254"; + byte cidr = 0; + uint usable = 4294967294; + + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String4. @@ -259,27 +245,26 @@ public void TestTryParseString3() [TestMethod] public void TestTryParseString4() { - IPNetwork2 ipnetwork = null; - string ipaddress = "0.0.0.0/32"; - - string network = "0.0.0.0"; - string netmask = "255.255.255.255"; - string broadcast = "0.0.0.0"; - string firstUsable = "0.0.0.0"; - string lastUsable = "0.0.0.0"; - byte cidr = 32; - uint usable = 0; - - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "0.0.0.0/32"; + + string network = "0.0.0.0"; + string netmask = "255.255.255.255"; + string broadcast = "0.0.0.0"; + string firstUsable = "0.0.0.0"; + string lastUsable = "0.0.0.0"; + byte cidr = 32; + uint usable = 0; + + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String5. @@ -287,27 +272,26 @@ public void TestTryParseString4() [TestMethod] public void TestTryParseString5() { - IPNetwork2 ipnetwork = null; - string ipaddress = "255.255.255.255/32"; - - string network = "255.255.255.255"; - string netmask = "255.255.255.255"; - string broadcast = "255.255.255.255"; - string firstUsable = "255.255.255.255"; - string lastUsable = "255.255.255.255"; - byte cidr = 32; - uint usable = 0; - - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); - Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); - Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); - Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); - Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); - Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); - } + string ipaddress = "255.255.255.255/32"; + + string network = "255.255.255.255"; + string netmask = "255.255.255.255"; + string broadcast = "255.255.255.255"; + string firstUsable = "255.255.255.255"; + string lastUsable = "255.255.255.255"; + byte cidr = 32; + uint usable = 0; + + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); + Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); + Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); + Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); + Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); + Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); + } /// /// Tests Try Parse functionality with Try Parse String AE1. @@ -315,11 +299,10 @@ public void TestTryParseString5() [TestMethod] public void TestTryParseStringAe1() { - string ipaddress = "garbage"; - IPNetwork2 ipnetwork = null; - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(false, parsed, "parsed"); - } + string ipaddress = "garbage"; + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 _); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try Parse functionality with Try Parse String AE2. @@ -327,11 +310,9 @@ public void TestTryParseStringAe1() [TestMethod] public void TestTryParseStringAe2() { - string ipaddress = "0.0.0.0 0.0.1.0"; - IPNetwork2 ipnetwork = null; - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(false, parsed, "parsed"); - } + bool parsed = IPNetwork2.TryParse("0.0.0.0 0.0.1.0", out IPNetwork2 _); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try Parse functionality with Try Parse String ANE1. @@ -339,9 +320,7 @@ public void TestTryParseStringAe2() [TestMethod] public void TestTryParseStringAne1() { - string ipaddress = null; - IPNetwork2 ipnetwork = null; - bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); - Assert.AreEqual(false, parsed, "parsed"); - } + bool parsed = IPNetwork2.TryParse(null, out IPNetwork2 _); + Assert.IsFalse(parsed, "parsed"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs index 5df0f416..78bee1a7 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs @@ -16,10 +16,9 @@ public class IPNetworkTrySubnetTests [TestMethod] public void TestInternalSubnet1() { - IPNetworkCollection subnets = null; - IPNetwork2.InternalSubnet(true, null, 0, out subnets); - Assert.AreEqual(null, subnets, "subnets"); - } + IPNetwork2.InternalSubnet(true, null, 0, out IPNetworkCollection subnets); + Assert.AreEqual(null, subnets, "subnets"); + } /// /// Test a null collection. @@ -28,24 +27,20 @@ public void TestInternalSubnet1() [ExpectedException(typeof(ArgumentNullException))] public void TestInternalSubnet2() { - IPNetworkCollection subnets = null; - IPNetwork2.InternalSubnet(false, null, 0, out subnets); - } + IPNetwork2.InternalSubnet(false, null, 0, out IPNetworkCollection _); + } /// - /// Test a null network + /// Test a null network. /// [TestMethod] [ExpectedException(typeof(ArgumentNullException))] public void TestTrySubnet1() { - IPNetwork2 ipnetwork = null; - byte cidr = 9; - #pragma warning disable 0618 - bool subnetted = IPNetwork2.TrySubnet(ipnetwork, cidr, out var _); + IPNetwork2.TrySubnet(null, 9, out var _); #pragma warning restore 0618 - } + } /// /// Tests Try Subnet functionality with Try Subnet Static1. @@ -53,14 +48,13 @@ public void TestTrySubnet1() [TestMethod] public void TestTrySubnetStatic1() { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 9; + IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; + byte cidr = 9; - IPNetworkCollection subnets = null; #pragma warning disable 0618 - bool subnetted = IPNetwork2.TrySubnet(ipnetwork, cidr, out subnets); + IPNetwork2.TrySubnet(ipnetwork, cidr, out IPNetworkCollection _); #pragma warning restore 0618 - } + } /// /// Tests Try Subnet functionality with Try Subnet3. @@ -68,14 +62,13 @@ public void TestTrySubnetStatic1() [TestMethod] public void TestTrySubnet3() { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 55; + IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; + byte cidr = 55; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection _); - Assert.AreEqual(false, subnetted, "subnetted"); - } + Assert.IsFalse(subnetted, "subnetted"); + } /// /// Tests Try Subnet functionality with Try Subnet4. @@ -83,14 +76,13 @@ public void TestTrySubnet3() [TestMethod] public void TestTrySubnet4() { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 1; + IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; + byte cidr = 1; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection _); - Assert.AreEqual(false, subnetted, "subnetted"); - } + Assert.IsFalse(subnetted, "subnetted"); + } /// /// Tests Try Subnet functionality with Try Subnet5. @@ -98,17 +90,16 @@ public void TestTrySubnet4() [TestMethod] public void TestTrySubnet5() { - IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; - byte cidr = 9; + IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; + byte cidr = 9; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection subnets); - Assert.AreEqual(true, subnetted, "subnetted"); - Assert.AreEqual(2, subnets.Count, "count"); - Assert.AreEqual("10.0.0.0/9", subnets[0].ToString(), "subnet1"); - Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2"); - } + Assert.IsTrue(subnetted, "subnetted"); + Assert.AreEqual(2, subnets.Count, "count"); + Assert.AreEqual("10.0.0.0/9", subnets[0].ToString(), "subnet1"); + Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2"); + } /// /// Tests Try Subnet functionality with Try Subnet6. @@ -116,29 +107,28 @@ public void TestTrySubnet5() [TestMethod] public void TestTrySubnet6() { - IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; - byte cidr = 20; - - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); - - Assert.AreEqual(true, subnetted, "subnetted"); - Assert.AreEqual(16, subnets.Count, "count"); - Assert.AreEqual("192.168.0.0/20", subnets[0].ToString(), "subnet1"); - Assert.AreEqual("192.168.16.0/20", subnets[1].ToString(), "subnet2"); - Assert.AreEqual("192.168.32.0/20", subnets[2].ToString(), "subnet3"); - Assert.AreEqual("192.168.48.0/20", subnets[3].ToString(), "subnet4"); - Assert.AreEqual("192.168.64.0/20", subnets[4].ToString(), "subnet5"); - Assert.AreEqual("192.168.80.0/20", subnets[5].ToString(), "subnet6"); - Assert.AreEqual("192.168.96.0/20", subnets[6].ToString(), "subnet7"); - Assert.AreEqual("192.168.112.0/20", subnets[7].ToString(), "subnet8"); - Assert.AreEqual("192.168.128.0/20", subnets[8].ToString(), "subnet9"); - Assert.AreEqual("192.168.144.0/20", subnets[9].ToString(), "subnet10"); - Assert.AreEqual("192.168.160.0/20", subnets[10].ToString(), "subnet11"); - Assert.AreEqual("192.168.176.0/20", subnets[11].ToString(), "subnet12"); - Assert.AreEqual("192.168.192.0/20", subnets[12].ToString(), "subnet13"); - Assert.AreEqual("192.168.208.0/20", subnets[13].ToString(), "subnet14"); - Assert.AreEqual("192.168.224.0/20", subnets[14].ToString(), "subnet15"); - Assert.AreEqual("192.168.240.0/20", subnets[15].ToString(), "subnet16"); - } + IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; + byte cidr = 20; + + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection subnets); + + Assert.IsTrue(subnetted, "subnetted"); + Assert.AreEqual(16, subnets.Count, "count"); + Assert.AreEqual("192.168.0.0/20", subnets[0].ToString(), "subnet1"); + Assert.AreEqual("192.168.16.0/20", subnets[1].ToString(), "subnet2"); + Assert.AreEqual("192.168.32.0/20", subnets[2].ToString(), "subnet3"); + Assert.AreEqual("192.168.48.0/20", subnets[3].ToString(), "subnet4"); + Assert.AreEqual("192.168.64.0/20", subnets[4].ToString(), "subnet5"); + Assert.AreEqual("192.168.80.0/20", subnets[5].ToString(), "subnet6"); + Assert.AreEqual("192.168.96.0/20", subnets[6].ToString(), "subnet7"); + Assert.AreEqual("192.168.112.0/20", subnets[7].ToString(), "subnet8"); + Assert.AreEqual("192.168.128.0/20", subnets[8].ToString(), "subnet9"); + Assert.AreEqual("192.168.144.0/20", subnets[9].ToString(), "subnet10"); + Assert.AreEqual("192.168.160.0/20", subnets[10].ToString(), "subnet11"); + Assert.AreEqual("192.168.176.0/20", subnets[11].ToString(), "subnet12"); + Assert.AreEqual("192.168.192.0/20", subnets[12].ToString(), "subnet13"); + Assert.AreEqual("192.168.208.0/20", subnets[13].ToString(), "subnet14"); + Assert.AreEqual("192.168.224.0/20", subnets[14].ToString(), "subnet15"); + Assert.AreEqual("192.168.240.0/20", subnets[15].ToString(), "subnet16"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs index fb56166f..ca209f14 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs @@ -19,9 +19,8 @@ public void TestTrySupernet1() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); var supernetExpected = IPNetwork2.Parse("192.168.0.0/23"); - IPNetwork2 supernet; bool parsed = true; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -39,7 +38,7 @@ public void TestTrySupernet2() IPNetwork2 supernet; #pragma warning disable 0618 - bool result = IPNetwork2.TrySupernet(network1, network2, out supernet); + IPNetwork2.TrySupernet(network1, network2, out supernet); #pragma warning restore 0618 } @@ -54,7 +53,7 @@ public void TestTrySupernetStatic2() IPNetwork2 supernet; #pragma warning disable 0618 - bool result = IPNetwork2.TrySupernet(network1, network2, out supernet); + IPNetwork2.TrySupernet(network1, network2, out supernet); #pragma warning restore 0618 } @@ -67,9 +66,8 @@ public void TestTrySupernet3() var network1 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2 network2 = null; IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -84,9 +82,8 @@ public void TestTrySupernet4() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/25"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -101,9 +98,8 @@ public void TestTrySupernet5() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.5.1/24"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -118,9 +114,8 @@ public void TestTrySupernet6() var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/25"); var supernetExpected = IPNetwork2.Parse("192.168.0.0/24"); - IPNetwork2 supernet; bool parsed = true; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -135,9 +130,8 @@ public void TestTrySupernet7() var network1 = IPNetwork2.Parse("192.168.0.1/25"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); var supernetExpected = IPNetwork2.Parse("192.168.0.0/24"); - IPNetwork2 supernet; bool parsed = true; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -152,9 +146,8 @@ public void TestTrySupernet8() var network1 = IPNetwork2.Parse("192.168.1.1/24"); var network2 = IPNetwork2.Parse("192.168.2.1/24"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -170,9 +163,8 @@ public void TestTrySupernet9() var network2 = IPNetwork2.Parse("192.168.2.1/24"); IPNetwork2[] network3 = { network1, network2 }; IPNetwork2[] supernetExpected = { network1, network2 }; - IPNetwork2[] supernet; bool parsed = true; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(supernetExpected[0], supernet[0], "supernet"); Assert.AreEqual(supernetExpected[1], supernet[1], "supernet"); @@ -189,9 +181,8 @@ public void TestTrySupernet10() var network2 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2[] network3 = { network1, network2 }; IPNetwork2[] supernetExpected = { IPNetwork2.Parse("192.168.0.0/23") }; - IPNetwork2[] supernet; bool parsed = true; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(supernetExpected[0], supernet[0], "supernet"); Assert.AreEqual(parsed, result, "parsed"); @@ -204,10 +195,9 @@ public void TestTrySupernet10() public void TestTrySupernet11() { IPNetwork2[] network3 = null; - IPNetwork2[] supernetExpected = { IPNetwork2.Parse("192.168.0.0/23") }; - IPNetwork2[] supernet; + _ = new[] { IPNetwork2.Parse("192.168.0.0/23") }; bool parsed = false; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(null, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs index 6ea33970..b573099c 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs @@ -16,14 +16,13 @@ public class IPNetworkTryToBigIntegerTests [TestMethod] public void TestTryToBigInteger32() { - var mask = IPAddress.Parse("255.255.255.255"); - uint uintMask = 0xffffffff; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + var mask = IPAddress.Parse("255.255.255.255"); + uint uintMask = 0xffffffff; + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); - Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(uintMask, result, "uint"); + Assert.IsTrue(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer24. @@ -31,14 +30,13 @@ public void TestTryToBigInteger32() [TestMethod] public void TestTryToBigInteger24() { - var mask = IPAddress.Parse("255.255.255.0"); - uint uintMask = 0xffffff00; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + var mask = IPAddress.Parse("255.255.255.0"); + uint uintMask = 0xffffff00; + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); - Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(uintMask, result, "uint"); + Assert.IsTrue(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer16. @@ -46,14 +44,13 @@ public void TestTryToBigInteger24() [TestMethod] public void TestTryToBigInteger16() { - var mask = IPAddress.Parse("255.255.0.0"); - uint uintMask = 0xffff0000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + var mask = IPAddress.Parse("255.255.0.0"); + uint uintMask = 0xffff0000; + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); - Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(uintMask, result, "uint"); + Assert.IsTrue(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer8. @@ -61,15 +58,14 @@ public void TestTryToBigInteger16() [TestMethod] public void TestTryToBigInteger8() { - var mask = IPAddress.Parse("255.0.0.0"); - uint uintMask = 0xff000000; + var mask = IPAddress.Parse("255.0.0.0"); + uint uintMask = 0xff000000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); - Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(uintMask, result, "uint"); + Assert.IsTrue(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer0. @@ -77,14 +73,13 @@ public void TestTryToBigInteger8() [TestMethod] public void TestTryToBigInteger0() { - var mask = IPAddress.Parse("0.0.0.0"); - uint uintMask = 0x00000000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + var mask = IPAddress.Parse("0.0.0.0"); + uint uintMask = 0x00000000; + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); - Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(uintMask, result, "uint"); + Assert.IsTrue(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer ANE. @@ -92,12 +87,11 @@ public void TestTryToBigInteger0() [TestMethod] public void TestTryToBigIntegerAne() { - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(null, out result); + bool parsed = IPNetwork2.TryToBigInteger(null, out BigInteger? result); - Assert.AreEqual(null, result, "uint"); - Assert.AreEqual(false, parsed, "parsed"); - } + Assert.AreEqual(null, result, "uint"); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer ANE3. @@ -105,13 +99,11 @@ public void TestTryToBigIntegerAne() [TestMethod] public void TestTryToBigIntegerAne3() { - IPAddress ip = null; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(ip, out result); + bool parsed = IPNetwork2.TryToBigInteger(null, out BigInteger? result); - Assert.AreEqual(null, result, "uint"); - Assert.AreEqual(false, parsed, "parsed"); - } + Assert.AreEqual(null, result, "uint"); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try To Big Integer functionality with Try To Big Integer ANE2. @@ -119,10 +111,9 @@ public void TestTryToBigIntegerAne3() [TestMethod] public void TestTryToBigIntegerAne2() { - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(IPAddress.IPv6Any, out result); + bool parsed = IPNetwork2.TryToBigInteger(IPAddress.IPv6Any, out BigInteger? result); - Assert.AreEqual(0, result, "result"); - Assert.AreEqual(true, parsed, "parsed"); - } + Assert.AreEqual(0, result, "result"); + Assert.IsTrue(parsed, "parsed"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs index 68c18676..348c2d1e 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs @@ -16,10 +16,9 @@ public class IPNetworkTryToCidrTests [TestMethod] public void TestTryToCidrAne() { - byte? cidr = null; - bool parsed = IPNetwork2.TryToCidr(null, out cidr); - Assert.AreEqual(false, parsed, "parsed"); - } + bool parsed = IPNetwork2.TryToCidr(null, out byte? _); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try To Cidr functionality with Try To Cidr AE. @@ -27,11 +26,10 @@ public void TestTryToCidrAne() [TestMethod] public void TestTryToCidrAe() { - byte? cidr = null; - bool parsed = IPNetwork2.TryToCidr(IPAddress.IPv6Any, out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual((byte)0, cidr, "cidr"); - } + bool parsed = IPNetwork2.TryToCidr(IPAddress.IPv6Any, out byte? cidr); + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual((byte)0, cidr, "cidr"); + } /// /// Tests Try To Cidr functionality with Try To Cidr AE2. @@ -39,10 +37,9 @@ public void TestTryToCidrAe() [TestMethod] public void TestTryToCidrAe2() { - byte? cidr = null; - bool parsed = IPNetwork2.TryToCidr(IPAddress.Parse("6.6.6.6"), out cidr); - Assert.AreEqual(false, parsed, "parsed"); - } + bool parsed = IPNetwork2.TryToCidr(IPAddress.Parse("6.6.6.6"), out byte? _); + Assert.IsFalse(parsed, "parsed"); + } /// /// Tests Try To Cidr functionality with Try To Cidr32. @@ -50,14 +47,13 @@ public void TestTryToCidrAe2() [TestMethod] public void TestTryToCidr32() { - byte? cidr = null; - var mask = IPAddress.Parse("255.255.255.255"); - byte result = 32; - bool parsed = IPNetwork2.TryToCidr(mask, out cidr); + var mask = IPAddress.Parse("255.255.255.255"); + byte result = 32; + bool parsed = IPNetwork2.TryToCidr(mask, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(cidr, result, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(cidr, result, "cidr"); + } /// /// Tests Try To Cidr functionality with Try To Cidr24. @@ -65,14 +61,13 @@ public void TestTryToCidr32() [TestMethod] public void TestTryToCidr24() { - byte? cidr = null; - var mask = IPAddress.Parse("255.255.255.0"); - byte result = 24; - bool parsed = IPNetwork2.TryToCidr(mask, out cidr); + var mask = IPAddress.Parse("255.255.255.0"); + byte result = 24; + bool parsed = IPNetwork2.TryToCidr(mask, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(cidr, result, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(cidr, result, "cidr"); + } /// /// Tests Try To Cidr functionality with Try To Cidr16. @@ -80,14 +75,13 @@ public void TestTryToCidr24() [TestMethod] public void TestTryToCidr16() { - byte? cidr = null; - var mask = IPAddress.Parse("255.255.0.0"); - byte result = 16; - bool parsed = IPNetwork2.TryToCidr(mask, out cidr); + var mask = IPAddress.Parse("255.255.0.0"); + byte result = 16; + bool parsed = IPNetwork2.TryToCidr(mask, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(cidr, result, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(cidr, result, "cidr"); + } /// /// Tests Try To Cidr functionality with Try To Cidr8. @@ -95,14 +89,13 @@ public void TestTryToCidr16() [TestMethod] public void TestTryToCidr8() { - byte? cidr = null; - var mask = IPAddress.Parse("255.0.0.0"); - byte result = 8; - bool parsed = IPNetwork2.TryToCidr(mask, out cidr); + var mask = IPAddress.Parse("255.0.0.0"); + byte result = 8; + bool parsed = IPNetwork2.TryToCidr(mask, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(cidr, result, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(cidr, result, "cidr"); + } /// /// Tests Try To Cidr functionality with Try To Cidr0. @@ -110,12 +103,11 @@ public void TestTryToCidr8() [TestMethod] public void TestTryToCidr0() { - byte? cidr = null; - var mask = IPAddress.Parse("0.0.0.0"); - byte result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out cidr); + var mask = IPAddress.Parse("0.0.0.0"); + byte result = 0; + bool parsed = IPNetwork2.TryToCidr(mask, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(cidr, result, "cidr"); - } + Assert.IsTrue(parsed, "parsed"); + Assert.AreEqual(cidr, result, "cidr"); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs index 94ed7e51..db306f11 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs @@ -16,12 +16,11 @@ public class IPNetworkTryToNetmaskTests [TestMethod] public void TryToNetmask1() { - IPAddress result = null; - bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetwork, out result); + bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetwork, out IPAddress result); var expected = IPAddress.Parse("0.0.0.0"); Assert.AreEqual(expected, result, "Netmask"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -30,11 +29,10 @@ public void TryToNetmask1() [TestMethod] public void TryToNetmask2() { - IPAddress result = null; - bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetwork, out result); + bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetwork, out IPAddress result); IPAddress expected = null; Assert.AreEqual(expected, result, "Netmask"); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs index 54ba71ab..7d715835 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs @@ -16,10 +16,9 @@ public class IPNetworkTryToUintTests [TestMethod] public void TestTryToUint1() { - BigInteger? result = null; - bool parsed = IPNetwork2.TryToUint(32, AddressFamily.InterNetwork, out result); + bool parsed = IPNetwork2.TryToUint(32, AddressFamily.InterNetwork, out BigInteger? result); Assert.IsNotNull(result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs index 275149e2..def2e01a 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs @@ -20,16 +20,14 @@ public void TryWideSubnet1() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } } - IPNetwork2 ipnetwork = null; - bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out ipnetwork); - Assert.AreEqual(true, wide, "wide"); + bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out IPNetwork2 ipnetwork); + Assert.IsTrue(wide, "wide"); Assert.AreEqual("0.0.0.0/0", ipnetwork.ToString(), "ipnetwork"); } @@ -43,16 +41,14 @@ public void TryWideSubnet2() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } } - IPNetwork2 ipnetwork = null; - bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out ipnetwork); - Assert.AreEqual(true, wide, "wide"); + bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out IPNetwork2 ipnetwork); + Assert.IsTrue(wide, "wide"); Assert.AreEqual("0.0.0.0/4", ipnetwork.ToString(), "ipnetwork"); } @@ -66,16 +62,14 @@ public void TryWideSubnet3() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } } - IPNetwork2 ipnetwork = null; - bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out ipnetwork); - Assert.AreEqual(false, wide, "wide"); + bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out IPNetwork2 _); + Assert.IsFalse(wide, "wide"); } /// @@ -88,16 +82,14 @@ public void TryWideSubnet4() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } } - IPNetwork2 ipnetwork = null; - bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out ipnetwork); - Assert.AreEqual(true, wide, "wide"); + bool wide = IPNetwork2.TryWideSubnet(ipns.ToArray(), out IPNetwork2 ipnetwork); + Assert.IsTrue(wide, "wide"); Assert.AreEqual("1.1.1.1/32", ipnetwork.ToString(), "ipnetwork"); } @@ -107,8 +99,7 @@ public void TryWideSubnet4() [TestMethod] public void TryWideSubnetNull() { - IPNetwork2 ipnetwork = null; - bool wide = IPNetwork2.TryWideSubnet(null, out ipnetwork); - Assert.AreEqual(false, wide, "wide"); + bool wide = IPNetwork2.TryWideSubnet(null, out IPNetwork2 _); + Assert.IsFalse(wide, "wide"); } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs b/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs index 79786976..55ea95d0 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs @@ -17,7 +17,7 @@ public class IPNetworkValidNetmaskTests [ExpectedException(typeof(ArgumentException))] public void TestValidNetmaskInvalid1() { - bool resut = IPNetwork2.InternalValidNetmask(BigInteger.Zero, AddressFamily.AppleTalk); + IPNetwork2.InternalValidNetmask(BigInteger.Zero, AddressFamily.AppleTalk); } /// diff --git a/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs index 2c7a79b4..45d2c9a3 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs @@ -20,8 +20,7 @@ public void WideSubnet1() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } @@ -41,8 +40,7 @@ public void WideSubnet2() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } @@ -59,8 +57,8 @@ public void WideSubnet2() [ExpectedException(typeof(ArgumentNullException))] public void WideSubnetNull() { - var ipnetwork = IPNetwork2.WideSubnet(null); - } + IPNetwork2.WideSubnet(null); + } /// /// Tests WideSubnet with invalid IP addresses to ensure it throws ArgumentException. @@ -73,14 +71,13 @@ public void WideSubnetNull2() var ipns = new List(); foreach (string ip in ips) { - IPNetwork2 ipn; - if (IPNetwork2.TryParse(ip, 32, out ipn)) + if (IPNetwork2.TryParse(ip, 32, out IPNetwork2 ipn)) { ipns.Add(ipn); } } - var ipnetwork = IPNetwork2.WideSubnet(ipns.ToArray()); + IPNetwork2.WideSubnet(ipns.ToArray()); } /// @@ -90,11 +87,11 @@ public void WideSubnetNull2() [ExpectedException(typeof(ArgumentException))] public void WideSubnetMixed() { - var ipns = new List + var ipns = new List { IPNetwork2.IANA_ABLK_RESERVED1, IPNetwork2.Parse("2001:0db8::/64"), }; - var ipnetwork = IPNetwork2.WideSubnet(ipns.ToArray()); - } + IPNetwork2.WideSubnet(ipns.ToArray()); + } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkV6UnitTest.cs b/src/TestProject/IPNetworkV6UnitTest.cs index db13ebbf..3278c4d6 100644 --- a/src/TestProject/IPNetworkV6UnitTest.cs +++ b/src/TestProject/IPNetworkV6UnitTest.cs @@ -5,7 +5,7 @@ namespace TestProject; /// -/// Test parsing of IPV6 IPNetworks +/// Test parsing of IPV6 IPNetworks. /// [TestClass] public class IPNetworkV6UnitTest @@ -15,29 +15,29 @@ public class IPNetworkV6UnitTest /// /// Test parse of IPv6 networks. /// - /// First parameter - /// Second parameter + /// First parameter. + /// Second parameter. [DataTestMethod] [DataRow("xxxx::", "xxxx::")] [DataRow("::", "xxxx::")] [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne8(string withFirst, string andSecond) { - var ipnet = IPNetwork2.Parse(withFirst, andSecond); + IPNetwork2.Parse(withFirst, andSecond); } /// /// Test parse of IPv6 networks. /// - /// First parameter - /// Second parameter + /// First parameter. + /// Second parameter. [DataTestMethod] [DataRow("xxxx::", 0)] [DataRow("::", 129)] [ExpectedException(typeof(ArgumentException))] public void TestParseIPAddressNetmaskAne10(string withFirst, string andSecond) { - var ipnet = IPNetwork2.Parse(withFirst, andSecond); + IPNetwork2.Parse(withFirst, andSecond); } /// @@ -46,7 +46,6 @@ public void TestParseIPAddressNetmaskAne10(string withFirst, string andSecond) [TestMethod] public void TestParsev6_128() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -59,8 +58,8 @@ public void TestParsev6_128() byte cidr = 128; BigInteger usable = 1; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -76,7 +75,6 @@ public void TestParsev6_128() [TestMethod] public void TestParsev6_127() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"; @@ -89,8 +87,8 @@ public void TestParsev6_127() byte cidr = 127; BigInteger usable = 2; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -106,7 +104,6 @@ public void TestParsev6_127() [TestMethod] public void TestParsev6_126() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc"; @@ -119,8 +116,8 @@ public void TestParsev6_126() byte cidr = 126; BigInteger usable = 4; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -136,7 +133,6 @@ public void TestParsev6_126() [TestMethod] public void TestParsev6_125() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff8"; @@ -149,8 +145,8 @@ public void TestParsev6_125() byte cidr = 125; BigInteger usable = 8; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -166,7 +162,6 @@ public void TestParsev6_125() [TestMethod] public void TestParsev6_124() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"; @@ -179,8 +174,8 @@ public void TestParsev6_124() byte cidr = 124; BigInteger usable = 16; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -196,7 +191,6 @@ public void TestParsev6_124() [TestMethod] public void TestParsev6_123() { - IPNetwork2 ipnetwork = null; string ipaddress = "2001:0db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffe0"; @@ -209,8 +203,8 @@ public void TestParsev6_123() byte cidr = 123; BigInteger usable = 32; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -226,7 +220,6 @@ public void TestParsev6_123() [TestMethod] public void TestParsev6_112() { - IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"; @@ -239,8 +232,8 @@ public void TestParsev6_112() byte cidr = 112; uint usable = 65536; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -256,7 +249,6 @@ public void TestParsev6_112() [TestMethod] public void TestParsev6_64() { - IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:1234:1234:1234:1234"; string netmask = "ffff:ffff:ffff:ffff:0000:0000:0000:0000"; @@ -269,8 +261,8 @@ public void TestParsev6_64() byte cidr = 64; var usable = BigInteger.Pow(2, 128 - cidr); - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -286,7 +278,6 @@ public void TestParsev6_64() [TestMethod] public void TestParsev6_16() { - IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; string netmask = "ffff:0000:0000:0000:0000:0000:0000:0000"; @@ -299,8 +290,8 @@ public void TestParsev6_16() byte cidr = 16; var usable = BigInteger.Pow(2, 128 - cidr); - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask2, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -316,7 +307,6 @@ public void TestParsev6_16() [TestMethod] public void TestParsev6_EDGE() { - IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -326,9 +316,9 @@ public void TestParsev6_EDGE() byte cidr = 128; uint usable = 1; - bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out ipnetwork); + bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); @@ -379,14 +369,13 @@ public void TestParseString3() string netmask = "::"; string firstUsable = "::"; string lastUsable = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; - byte cidr = 0; - var usable = BigInteger.Pow(2, 128 - cidr); + var usable = BigInteger.Pow(2, 128); var ipnetwork = IPNetwork2.Parse(ipaddress); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(0, ipnetwork.Cidr, "Cidr"); Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); @@ -404,14 +393,13 @@ public void TestParseString4() string netmask = "::"; string firstUsable = "::"; string lastUsable = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; - byte cidr = 0; - var usable = BigInteger.Pow(2, 128 - cidr); + var usable = BigInteger.Pow(2, 128); var ipnetwork = IPNetwork2.Parse(ipaddress); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(null, ipnetwork.Broadcast, "Broadcast"); - Assert.AreEqual(cidr, ipnetwork.Cidr, "Cidr"); + Assert.AreEqual(0, ipnetwork.Cidr, "Cidr"); Assert.AreEqual(usable, ipnetwork.Usable, "Usable"); Assert.AreEqual(firstUsable, ipnetwork.FirstUsable.ToString(), "FirstUsable"); Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); @@ -842,7 +830,7 @@ public void TestParseIPAddressNoNetmask5_ClassLess() public void TestParseStringAe1() { string ipaddress = "garbage"; - var ipnetwork = IPNetwork2.Parse(ipaddress); + IPNetwork2.Parse(ipaddress); } /// @@ -853,7 +841,7 @@ public void TestParseStringAe1() public void TestParseStringAe2() { string ipaddress = "0:0:0:0:0:0:1:0:0 0:1:2:3:4:5:6:7:8"; - var ipnetwork = IPNetwork2.Parse(ipaddress); + IPNetwork2.Parse(ipaddress); } /// @@ -863,8 +851,7 @@ public void TestParseStringAe2() [ExpectedException(typeof(ArgumentNullException))] public void TestParseStringAne1() { - string ipaddress = null; - var ipnetwork = IPNetwork2.Parse(ipaddress); + IPNetwork2.Parse(null); } #endregion @@ -894,11 +881,11 @@ public void TestParseStringString3() string ipaddress = "2001:0db8::"; string netmask = null; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } /// - /// Test ParseString with string string + /// Test ParseString with string string. /// [TestMethod] [ExpectedException(typeof(ArgumentNullException))] @@ -907,7 +894,7 @@ public void TestParseStringString5() string ipaddress = "2001:0db8::"; string netmask = string.Empty; - var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); + IPNetwork2.Parse(ipaddress, netmask); } #endregion @@ -915,7 +902,7 @@ public void TestParseStringString5() #region ParseIpIp /// - /// Test ParseString with IP + /// Test ParseString with IP. /// [TestMethod] public void ParseIpIp1() @@ -929,7 +916,7 @@ public void ParseIpIp1() } /// - /// Test ParseString with IP + /// Test ParseString with IP. /// [TestMethod] [ExpectedException(typeof(ArgumentNullException))] @@ -938,7 +925,7 @@ public void ParseIpIp3() string ipaddress = "2001:0db8::"; var ip = IPAddress.Parse(ipaddress); IPAddress netm = null; - var ipnetwork = IPNetwork2.Parse(ip, netm); + IPNetwork2.Parse(ip, netm); } #endregion @@ -966,7 +953,7 @@ public void CtorWithIpAndCidr2() { string ipaddress = "2001:db8::"; var ip = IPAddress.Parse(ipaddress); - var ipnetwork = new IPNetwork2(ip, 129); + var ipn = new IPNetwork2(ip, 129); } #endregion @@ -1304,10 +1291,9 @@ public void TestTryToCidr128() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); byte cidr = 128; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1319,10 +1305,9 @@ public void TestTryToCidr127() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"); byte cidr = 127; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1334,10 +1319,9 @@ public void TestTryToCidr126() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc"); byte cidr = 126; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1349,10 +1333,9 @@ public void TestTryToCidr125() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff8"); byte cidr = 125; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1364,10 +1347,9 @@ public void TestTryToCidr124() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); byte cidr = 124; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1379,10 +1361,9 @@ public void TestTryToCidr123() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffe0"); byte cidr = 123; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1394,10 +1375,9 @@ public void TestTryToCidr122() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffc0"); byte cidr = 122; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1409,10 +1389,9 @@ public void TestTryToCidr121() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff80"); byte cidr = 121; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1424,10 +1403,9 @@ public void TestTryToCidr120() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00"); byte cidr = 120; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1439,10 +1417,9 @@ public void TestTryToCidr119() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fe00"); byte cidr = 119; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1454,10 +1431,9 @@ public void TestTryToCidr118() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fc00"); byte cidr = 118; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1469,10 +1445,9 @@ public void TestTryToCidr117() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f800"); byte cidr = 117; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1484,10 +1459,9 @@ public void TestTryToCidr116() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f000"); byte cidr = 116; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1499,10 +1473,9 @@ public void TestTryToCidr115() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:e000"); byte cidr = 115; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1514,10 +1487,9 @@ public void TestTryToCidr114() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:c000"); byte cidr = 114; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1529,10 +1501,9 @@ public void TestTryToCidr113() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000"); byte cidr = 113; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1544,10 +1515,9 @@ public void TestTryToCidr112() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); byte cidr = 112; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1559,10 +1529,9 @@ public void TestTryToCidr111() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffe:0"); byte cidr = 111; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1574,10 +1543,9 @@ public void TestTryToCidr110() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffc:0"); byte cidr = 110; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1589,10 +1557,9 @@ public void TestTryToCidr109() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff8:0"); byte cidr = 109; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1604,10 +1571,9 @@ public void TestTryToCidr108() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff0:0"); byte cidr = 108; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1619,10 +1585,9 @@ public void TestTryToCidr001() { var mask = IPAddress.Parse("8000::"); byte cidr = 1; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1634,10 +1599,9 @@ public void TestTryToCidr000() { var mask = IPAddress.Parse("::"); byte cidr = 0; - byte? result = 0; - bool parsed = IPNetwork2.TryToCidr(mask, out result); + bool parsed = IPNetwork2.TryToCidr(mask, out byte? result); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(cidr, result, "cidr"); } @@ -1722,11 +1686,10 @@ public void TestTryToBigInteger32() { var mask = IPAddress.Parse("::ffff:ffff"); uint uintMask = 0xffffffff; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -1737,11 +1700,10 @@ public void TestTryToBigInteger24() { var mask = IPAddress.Parse("::ffff:ff00"); uint uintMask = 0xffffff00; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -1752,11 +1714,10 @@ public void TestTryToBigInteger16() { var mask = IPAddress.Parse("::ffff:0"); uint uintMask = 0xffff0000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -1768,11 +1729,10 @@ public void TestTryToBigInteger8() var mask = IPAddress.Parse("::ff00:0"); uint uintMask = 0xff000000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -1783,11 +1743,10 @@ public void TestTryToBigInteger0() { var mask = IPAddress.Parse("::"); uint uintMask = 0x00000000; - BigInteger? result = null; - bool parsed = IPNetwork2.TryToBigInteger(mask, out result); + bool parsed = IPNetwork2.TryToBigInteger(mask, out BigInteger? result); Assert.AreEqual(uintMask, result, "uint"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } #endregion @@ -1800,12 +1759,11 @@ public void TestTryToBigInteger0() [TestMethod] public void TryToNetmask1() { - IPAddress result = null; - bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetworkV6, out result); + bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetworkV6, out IPAddress result); var expected = IPAddress.Parse("::"); Assert.AreEqual(expected, result, "Netmask"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } /// @@ -1814,12 +1772,11 @@ public void TryToNetmask1() [TestMethod] public void TryToNetmask2() { - IPAddress result = null; - bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetworkV6, out result); + bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetworkV6, out IPAddress result); var expected = IPAddress.Parse("ffff:ffff:8000::"); Assert.AreEqual(expected, result, "Netmask"); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); } #endregion @@ -1899,7 +1856,7 @@ public void ToNetmask0() public void ToNetmaskOore1() { byte cidr = 129; - string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetworkV6).ToString(); + IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetworkV6).ToString(); } #endregion @@ -1913,10 +1870,9 @@ public void ToNetmaskOore1() public void TestValidNetmask0() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); - bool expected = true; bool result = IPNetwork2.ValidNetmask(mask); - Assert.AreEqual(expected, result, "ValidNetmask"); + Assert.IsTrue(result, "ValidNetmask"); } /// @@ -1926,10 +1882,9 @@ public void TestValidNetmask0() public void TestValidNetmask1() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); - bool expected = true; bool result = IPNetwork2.ValidNetmask(mask); - Assert.AreEqual(expected, result, "ValidNetmask"); + Assert.IsTrue(result, "ValidNetmask"); } /// @@ -1939,10 +1894,9 @@ public void TestValidNetmask1() public void TestValidNetmask2() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); - bool expected = true; bool result = IPNetwork2.ValidNetmask(mask); - Assert.AreEqual(expected, result, "ValidNetmask"); + Assert.IsTrue(result, "ValidNetmask"); } /// @@ -1952,10 +1906,9 @@ public void TestValidNetmask2() public void TestValidNetmaskEae1() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:0000:ffff"); - bool expected = false; bool result = IPNetwork2.ValidNetmask(mask); - Assert.AreEqual(expected, result, "ValidNetmask"); + Assert.IsFalse(result, "ValidNetmask"); } /// @@ -1965,10 +1918,9 @@ public void TestValidNetmaskEae1() public void TestValidNetmaskEae3() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:0000:0001"); - bool expected = false; bool result = IPNetwork2.ValidNetmask(mask); - Assert.AreEqual(expected, result, "ValidNetmask"); + Assert.IsFalse(result, "ValidNetmask"); } #endregion @@ -2041,9 +1993,8 @@ public void TestContains1() var ipaddress = IPAddress.Parse("2001:0db8::1"); bool result = ipnetwork.Contains(ipaddress); - bool expected = true; - Assert.AreEqual(expected, result, "contains"); + Assert.IsTrue(result, "contains"); } /// @@ -2056,9 +2007,8 @@ public void TestContains2() var ipaddress = IPAddress.Parse("2001:0db8:0:1::"); bool result = ipnetwork.Contains(ipaddress); - bool expected = false; - Assert.AreEqual(expected, result, "contains"); + Assert.IsFalse(result, "contains"); } /// @@ -2071,9 +2021,8 @@ public void TestContains3() var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/64"); bool result = ipnetwork.Contains(ipnetwork2); - bool expected = true; - Assert.AreEqual(expected, result, "contains"); + Assert.IsTrue(result, "contains"); } /// @@ -2086,9 +2035,8 @@ public void TestContains4() var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/65"); bool result = ipnetwork.Contains(ipnetwork2); - bool expected = true; - Assert.AreEqual(expected, result, "contains"); + Assert.IsTrue(result, "contains"); } /// @@ -2101,9 +2049,8 @@ public void TestContains5() var ipnetwork2 = IPNetwork2.Parse("2001:0db8:1::/65"); bool result = ipnetwork.Contains(ipnetwork2); - bool expected = false; - Assert.AreEqual(expected, result, "contains"); + Assert.IsFalse(result, "contains"); } /// @@ -2116,9 +2063,8 @@ public void TestContains6() var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/63"); bool result = ipnetwork.Contains(ipnetwork2); - bool expected = false; - Assert.AreEqual(expected, result, "contains"); + Assert.IsFalse(result, "contains"); } /// @@ -2131,7 +2077,7 @@ public void TestContains10() var ipnetwork = IPNetwork2.Parse("::/0"); IPAddress ipaddress = null; - bool result = ipnetwork.Contains(ipaddress); + ipnetwork.Contains(ipaddress); } /// @@ -2144,7 +2090,7 @@ public void TestContains11_different_address_family_returns_false() var ipaddress = IPAddress.Parse("127.0.0.1"); // IPv4 bool result = ipnetwork.Contains(ipaddress); - Assert.AreEqual(false, result, "contains"); + Assert.IsFalse(result, "contains"); } #endregion @@ -2172,9 +2118,8 @@ public void TestOverlap3() var network1 = IPNetwork2.Parse("2001:0db8::/64"); var network2 = IPNetwork2.Parse("2001:0db8::/64"); bool result = network1.Overlap(network2); - bool expected = true; - Assert.AreEqual(expected, result, "overlap"); + Assert.IsTrue(result, "overlap"); } /// @@ -2186,9 +2131,8 @@ public void TestOverlap4() var network1 = IPNetwork2.Parse("2001:0db8::/64"); var network2 = IPNetwork2.Parse("2001:0db8:0:0:1::/65"); bool result = network1.Overlap(network2); - bool expected = true; - Assert.AreEqual(expected, result, "overlap"); + Assert.IsTrue(result, "overlap"); } /// @@ -2200,9 +2144,8 @@ public void TestOverlap5() var network1 = IPNetwork2.Parse("2001:0db8:0:1::/68"); var network2 = IPNetwork2.Parse("2001:0db8:0:2::/68"); bool result = network1.Overlap(network2); - bool expected = false; - Assert.AreEqual(expected, result, "overlap"); + Assert.IsFalse(result, "overlap"); } /// @@ -2214,9 +2157,8 @@ public void TestOverlap6() var network1 = IPNetwork2.Parse("2001:0db8:0:1::/68"); var network2 = IPNetwork2.Parse("2001:0db8:0:2::/62"); bool result = network1.Overlap(network2); - bool expected = true; - Assert.AreEqual(expected, result, "overlap"); + Assert.IsTrue(result, "overlap"); } #endregion @@ -2423,7 +2365,7 @@ public void TestSubnet3() var ipnetwork = IPNetwork2.Parse("::"); byte cidr = 129; - IPNetworkCollection subnets = ipnetwork.Subnet(cidr); + ipnetwork.Subnet(cidr); } /// @@ -2436,7 +2378,7 @@ public void TestSubnet4() var ipnetwork = IPNetwork2.Parse("::"); byte cidr = 1; - IPNetworkCollection subnets = ipnetwork.Subnet(cidr); + ipnetwork.Subnet(cidr); } /// @@ -2593,10 +2535,9 @@ public void TestTrySubnet3() var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 255; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection _); - Assert.AreEqual(false, subnetted, "subnetted"); + Assert.IsFalse(subnetted, "subnetted"); } /// @@ -2608,10 +2549,9 @@ public void TestTrySubnet4() var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 63; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection _); - Assert.AreEqual(false, subnetted, "subnetted"); + Assert.IsFalse(subnetted, "subnetted"); } /// @@ -2623,10 +2563,9 @@ public void TestTrySubnet5() var ipnetwork = IPNetwork2.Parse("2001:db8::/64"); byte cidr = 65; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection subnets); - Assert.AreEqual(true, subnetted, "subnetted"); + Assert.IsTrue(subnetted, "subnetted"); Assert.AreEqual(2, subnets.Count, "count"); Assert.AreEqual("2001:db8::/65", subnets[0].ToString(), "subnet1"); Assert.AreEqual("2001:db8:0:0:8000::/65", subnets[1].ToString(), "subnet2"); @@ -2641,10 +2580,9 @@ public void TestTrySubnet6() var ipnetwork = IPNetwork2.Parse("2001:db8::/64"); byte cidr = 68; - IPNetworkCollection subnets = null; - bool subnetted = ipnetwork.TrySubnet(cidr, out subnets); + bool subnetted = ipnetwork.TrySubnet(cidr, out IPNetworkCollection subnets); - Assert.AreEqual(true, subnetted, "subnetted"); + Assert.IsTrue(subnetted, "subnetted"); Assert.AreEqual(16, subnets.Count, "count"); Assert.AreEqual("2001:db8::/68", subnets[0].ToString(), "subnet1"); Assert.AreEqual("2001:db8:0:0:1000::/68", subnets[1].ToString(), "subnet2"); @@ -2677,11 +2615,9 @@ public void TestTrySupernet1() var network1 = IPNetwork2.Parse("2001:db8::/65"); var network2 = IPNetwork2.Parse("2001:db8:0:0:8000::/65"); var supernetExpected = IPNetwork2.Parse("2001:db8::/64"); - IPNetwork2 supernet; - bool supernetted = true; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); - Assert.AreEqual(supernetted, result, "supernetted"); + Assert.IsTrue(result, "supernetted"); Assert.AreEqual(supernetExpected, supernet, "supernet"); } @@ -2696,7 +2632,7 @@ public void TestTrySupernet2() var network2 = IPNetwork2.Parse("2001:db8::/64"); IPNetwork2 supernet; #pragma warning disable 0618 - bool result = IPNetwork2.TrySupernet(network1, network2, out supernet); + IPNetwork2.TrySupernet(network1, network2, out supernet); #pragma warning restore 0618 } @@ -2709,12 +2645,10 @@ public void TestTrySupernet3() var network1 = IPNetwork2.Parse("2001:db8::/64"); IPNetwork2 network2 = null; IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; - bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsFalse(result, "parsed"); } /// @@ -2726,12 +2660,10 @@ public void TestTrySupernet4() var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:db9::/65"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; - bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsFalse(result, "parsed"); } /// @@ -2743,12 +2675,10 @@ public void TestTrySupernet5() var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:dba::/64"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; - bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsFalse(result, "parsed"); } /// @@ -2760,12 +2690,10 @@ public void TestTrySupernet6() var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:db8::1/65"); var supernetExpected = IPNetwork2.Parse("2001:db8::/64"); - IPNetwork2 supernet; - bool parsed = true; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsTrue(result, "parsed"); } /// @@ -2777,12 +2705,10 @@ public void TestTrySupernet8() var network1 = IPNetwork2.Parse("2001:db0::/64"); var network2 = IPNetwork2.Parse("2001:dbf::/64"); IPNetwork2 supernetExpected = null; - IPNetwork2 supernet; - bool parsed = false; - bool result = network1.TrySupernet(network2, out supernet); + bool result = network1.TrySupernet(network2, out IPNetwork2 supernet); Assert.AreEqual(supernetExpected, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsFalse(result, "parsed"); } /// @@ -2795,13 +2721,11 @@ public void TestTrySupernet9() var network2 = IPNetwork2.Parse("192.168.2.1/24"); IPNetwork2[] network3 = { network1, network2 }; IPNetwork2[] supernetExpected = { network1, network2 }; - IPNetwork2[] supernet; - bool parsed = true; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(supernetExpected[0], supernet[0], "supernet"); Assert.AreEqual(supernetExpected[1], supernet[1], "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsTrue(result, "parsed"); } /// @@ -2814,12 +2738,10 @@ public void TestTrySupernet10() var network2 = IPNetwork2.Parse("2001:db8:0:0:8000::/65"); IPNetwork2[] network3 = { network1, network2 }; IPNetwork2[] supernetExpected = { IPNetwork2.Parse("2001:db8::/64") }; - IPNetwork2[] supernet; - bool parsed = true; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(supernetExpected[0], supernet[0], "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsTrue(result, "parsed"); } /// @@ -2829,13 +2751,11 @@ public void TestTrySupernet10() public void TestTrySupernet11() { IPNetwork2[] network3 = null; - IPNetwork2[] supernetExpected = { IPNetwork2.Parse("2001:db8::/64") }; - IPNetwork2[] supernet; - bool parsed = false; - bool result = IPNetwork2.TrySupernet(network3, out supernet); + _ = new[] { IPNetwork2.Parse("2001:db8::/64") }; + bool result = IPNetwork2.TrySupernet(network3, out IPNetwork2[] supernet); Assert.AreEqual(null, supernet, "supernet"); - Assert.AreEqual(parsed, result, "parsed"); + Assert.IsFalse(result, "parsed"); } #endregion @@ -2843,15 +2763,14 @@ public void TestTrySupernet11() #region TryGuessCidr /// - /// Test TryGuessCidrNull + /// Test TryGuessCidrNull. /// [TestMethod] public void TestTryGuessCidrNull() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr(null, out cidr); + bool parsed = IPNetwork2.TryGuessCidr(null, out byte cidr); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(0, cidr, "cidr"); } @@ -2861,10 +2780,9 @@ public void TestTryGuessCidrNull() [TestMethod] public void TestTryGuessCidr1() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("::", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(64, cidr, "cidr"); } @@ -2874,10 +2792,9 @@ public void TestTryGuessCidr1() [TestMethod] public void TestTryGuessCidr2() { - byte cidr; - bool parsed = IPNetwork2.TryGuessCidr("2001:0db8::", out cidr); + bool parsed = IPNetwork2.TryGuessCidr("2001:0db8::", out byte cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(64, cidr, "cidr"); } @@ -2886,7 +2803,7 @@ public void TestTryGuessCidr2() #region Count /// - /// Test Total32 + /// Test Total32. /// [TestMethod] public void Total32() @@ -2967,7 +2884,7 @@ public void Total0() #region Usable /// - /// Test Usable32 + /// Test Usable32. /// [TestMethod] public void Usable32() @@ -3054,11 +2971,10 @@ public void Usable0() public void TryParseCidr1() { string sidr = "0"; - byte? cidr; byte? result = 0; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } @@ -3069,13 +2985,11 @@ public void TryParseCidr1() public void TryParseCidr2() { string sidr = "sadsd"; - byte? cidr; - byte? result = null; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out byte? cidr); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(result, cidr, "cidr"); + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, cidr, "cidr"); } /// @@ -3085,12 +2999,11 @@ public void TryParseCidr2() public void TryParseCidr33() { string sidr = "33"; - byte? cidr; byte result = 33; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } @@ -3101,12 +3014,11 @@ public void TryParseCidr33() public void TryParseCidr128() { string sidr = "128"; - byte? cidr; byte result = 128; - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out cidr); + bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out byte? cidr); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(result, cidr, "cidr"); } @@ -3116,14 +3028,10 @@ public void TryParseCidr128() [TestMethod] public void TryParseCidr129() { - string sidr = "129"; - byte? cidr; - byte? result = null; - - bool parsed = IPNetwork2.TryParseCidr(sidr, AddressFamily.InterNetworkV6, out cidr); + bool parsed = IPNetwork2.TryParseCidr("129", AddressFamily.InterNetworkV6, out byte? cidr); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(result, cidr, "cidr"); + Assert.IsFalse(parsed, "parsed"); + Assert.AreEqual(null, cidr, "cidr"); } #endregion diff --git a/src/TestProject/SerializeJsonTest.cs b/src/TestProject/SerializeJsonTest.cs index f3688baa..067a00e2 100644 --- a/src/TestProject/SerializeJsonTest.cs +++ b/src/TestProject/SerializeJsonTest.cs @@ -63,7 +63,7 @@ public void Test_1_000_000_Serialize_Json() for (int i = 0; i < 1000000; i++) { - string json = JsonConvert.SerializeObject(ipnetwork); + JsonConvert.SerializeObject(ipnetwork); } // 3.06 seconds(Ad hoc). @@ -80,7 +80,7 @@ public void Test_1_000_000_Deserialize_Json() for (int i = 0; i < 1000000; i++) { - IPNetwork2 result = JsonConvert.DeserializeObject(json); + JsonConvert.DeserializeObject(json); } // 10.20 seconds(Ad hoc). @@ -98,7 +98,7 @@ public void Test_1_000_000_Serialize_Deserialize_Json() for (int i = 0; i < 1000000; i++) { string json = JsonConvert.SerializeObject(ipnetwork); - IPNetwork2 result = JsonConvert.DeserializeObject(json); + JsonConvert.DeserializeObject(json); } // 13.49 seconds(Ad hoc). diff --git a/src/TestProject/SerializeXmlTest.cs b/src/TestProject/SerializeXmlTest.cs index c2101375..ba9e70b1 100644 --- a/src/TestProject/SerializeXmlTest.cs +++ b/src/TestProject/SerializeXmlTest.cs @@ -112,7 +112,7 @@ public void Test_1_000_000_Deserialize_Xml() for (int i = 0; i < 1000000; i++) { - object result = serializer.Deserialize(mem); + serializer.Deserialize(mem); mem.Position = 0; } @@ -136,7 +136,7 @@ public void Test_1_000_000_Serialize_Deserialize_Xml() serializer.Serialize(mem, ipnetwork); mem.Position = 0; - object ipnetwork2 = serializer.Deserialize(mem); + serializer.Deserialize(mem); mem.SetLength(0); } diff --git a/src/TestProject/TryParseUnitTest.cs b/src/TestProject/TryParseUnitTest.cs index 0f443e0e..aa240d80 100644 --- a/src/TestProject/TryParseUnitTest.cs +++ b/src/TestProject/TryParseUnitTest.cs @@ -18,8 +18,8 @@ public class TryParseUnitTest [TestMethod] public void Test_IPNetwork_TryParse_Issue294() { - bool result = IPNetwork2.TryParse("*", out IPNetwork2 ipaddress1); - Assert.AreEqual(false, result, "parsed1"); + bool result = IPNetwork2.TryParse("*", out IPNetwork2 _); + Assert.IsFalse(result, "parsed1"); } #endregion @@ -35,7 +35,7 @@ public void TestTryParseIPAddressNetmaskAne2() IPAddress ip = null; bool parsed = IPNetwork2.TryParse(ip, ip, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -47,7 +47,7 @@ public void TestTryParseIPAddressNetmaskAne3() { bool parsed = IPNetwork2.TryParse(string.Empty, 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -59,7 +59,7 @@ public void TestTryParseIPAddressNetmaskAne4() { bool parsed = IPNetwork2.TryParse(null, 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -73,7 +73,7 @@ public void TestTryParseIPAddressNetmaskAne5() bool parsed = IPNetwork2.TryParse(n, n, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -85,7 +85,7 @@ public void TestTryParseIPAddressNetmaskAne6() { bool parsed = IPNetwork2.TryParse(IPAddress.Parse("10.10.10.10"), null, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -97,7 +97,7 @@ public void TestTryParseIPAddressNetmaskAne7() { bool parsed = IPNetwork2.TryParse("0.0.0.0", netmask: null, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -109,7 +109,7 @@ public void TestTryParseIPAddressNetmaskAne8() { bool parsed = IPNetwork2.TryParse("x.x.x.x", "x.x.x.x", out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -121,7 +121,7 @@ public void TestTryParseIPAddressNetmaskAne9() { bool parsed = IPNetwork2.TryParse("0.0.0.0", "x.x.x.x", out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -133,7 +133,7 @@ public void TestTryParseIPAddressNetmaskAne10() { bool parsed = IPNetwork2.TryParse("x.x.x.x", 0, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -145,7 +145,7 @@ public void TestTryParseIPAddressNetmaskAne11() { bool parsed = IPNetwork2.TryParse("0.0.0.0", 33, out IPNetwork2 ipnet); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } @@ -167,7 +167,7 @@ public void TestTryParseIPAddressNetmask() bool parsed = IPNetwork2.TryParse(ipaddress, netmask, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -195,7 +195,7 @@ public void TestTryParseString1() bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -223,7 +223,7 @@ public void TestTryParseString2() bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -251,7 +251,7 @@ public void TestTryParseString3() bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -279,7 +279,7 @@ public void TestTryParseString4() bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -307,7 +307,7 @@ public void TestTryParseString5() bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); - Assert.AreEqual(true, parsed, "parsed"); + Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(network, ipnetwork.Network.ToString(), "Network"); Assert.AreEqual(netmask, ipnetwork.Netmask.ToString(), "Netmask"); Assert.AreEqual(broadcast, ipnetwork.Broadcast.ToString(), "Broadcast"); @@ -324,9 +324,9 @@ public void TestTryParseString5() public void TestTryParseStringAe1() { string ipaddress = "garbage"; - bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 _); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); } /// @@ -336,9 +336,9 @@ public void TestTryParseStringAe1() public void TestTryParseStringAe2() { string ipaddress = "0.0.0.0 0.0.1.0"; - bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 _); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); } /// @@ -348,9 +348,9 @@ public void TestTryParseStringAe2() public void TestTryParseStringAne1() { string ipaddress = null; - bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); + bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 _); - Assert.AreEqual(false, parsed, "parsed"); + Assert.IsFalse(parsed, "parsed"); } #endregion @@ -366,8 +366,8 @@ public void Test_TryParse_InvalidIpv6_return_valid_ipv6network() bool parsed1 = IPNetwork2.TryParse("g001:02b8::/64", out IPNetwork2 ipnetwork1); bool parsed2 = IPNetwork2.TryParse("1:2b8::/64", out IPNetwork2 ipnetwork2); - Assert.AreEqual(true, parsed1, "parsed1"); - Assert.AreEqual(true, parsed2, "parsed2"); + Assert.IsTrue(parsed1, "parsed1"); + Assert.IsTrue(parsed2, "parsed2"); Assert.AreEqual(ipnetwork1, ipnetwork2, "ipnetwork1 == ipnetwork2"); } @@ -392,7 +392,7 @@ public void Test_TryParse_InvalidIpv6_return_valid_ipv6network() [DataRow("001:02b8::/64", false, true)] public void Test_TryParse(string ipnetwork, bool sanitanize, bool parsed) { - bool result = IPNetwork2.TryParse(ipnetwork, sanitanize, out IPNetwork2 ipnetwork1); + bool result = IPNetwork2.TryParse(ipnetwork, sanitanize, out IPNetwork2 _); Assert.AreEqual(parsed, result, "parsed1"); } @@ -412,7 +412,7 @@ public void Test_TryParse(string ipnetwork, bool sanitanize, bool parsed) [DataRow("001:02b8:: ", false)] public void Test_IPAddress_TryParse(string ipaddress, bool parsed) { - bool result = IPAddress.TryParse(ipaddress, out IPAddress ipaddress1); + bool result = IPAddress.TryParse(ipaddress, out IPAddress _); Assert.AreEqual(parsed, result, "parsed1"); }