diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6d841cdd..179221ad 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet tool install --global coveralls.net - name: Restore dependencies diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a3b0bab2..00000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: csharp -dist: focal -sudo: required -mono: none -dotnet: 5.0 -script: - - cd src - - dotnet restore - - dotnet pack ./System.Net.IPNetwork - - dotnet test -f net5.0 ./TestProject/TestProject.csproj -global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true - - DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/README.md b/README.md index d7ec5f24..dd32bb05 100644 --- a/README.md +++ b/README.md @@ -377,7 +377,7 @@ Below some examples : ```JS Provide at least one ipnetwork Usage: ipnetwork [-inmcbflu] [-d cidr|-D] [-h|-s cidr|-S|-w|-W|-x|-C network|-o network] networks ... -Version: 3.0.0.0 +Version: 3.1.0 Print options -i : network diff --git a/appveyor.yml b/appveyor.yml index 186ee554..701d12a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '3.0.{build}' +version: '3.1.{build}' image: Visual Studio 2022 assembly_info: @@ -41,8 +41,8 @@ build_script: - cmd: dotnet build -c release ./src/ConsoleApplication test_script: - - cmd: dotnet test ./src/TestProject/TestProject.csproj --settings ./src/TestProject/coverlet.runsettings -f "net8.0" - - vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\TestProject\bin\Debug\net8.0\TestProject.dll + - cmd: dotnet test ./src/TestProject/TestProject.csproj --settings ./src/TestProject/coverlet.runsettings -f "net9.0" + - vstest.console /logger:Appveyor c:\Projects\ipnetwork\src\TestProject\bin\Debug\net9.0\TestProject.dll - ps: copy ./src/TestProject/TestResults/**/coverage.opencover.xml ./src/TestProject/TestResults - csmacnz.Coveralls.exe --opencover -i C:\projects\ipnetwork\src\TestProject\TestResults\coverage.opencover.xml --useRelativePaths diff --git a/src/ConsoleApplication/ActionEnum.cs b/src/ConsoleApplication/ActionEnum.cs index fbdfd7f0..0a71229f 100644 --- a/src/ConsoleApplication/ActionEnum.cs +++ b/src/ConsoleApplication/ActionEnum.cs @@ -2,18 +2,17 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace System.Net.ConsoleApplication +namespace System.Net; + +public enum ActionEnum { - public enum ActionEnum - { - Usage, - PrintNetworks, - Subnet, - Supernet, - WideSupernet, - ListIPAddress, - ContainNetwork, - OverlapNetwork, - SubtractNetwork, - } -} + Usage, + PrintNetworks, + Subnet, + Supernet, + WideSupernet, + ListIPAddress, + ContainNetwork, + OverlapNetwork, + SubtractNetwork, +} \ No newline at end of file diff --git a/src/ConsoleApplication/ArgParsed.cs b/src/ConsoleApplication/ArgParsed.cs index e0913925..cc64ad9f 100644 --- a/src/ConsoleApplication/ArgParsed.cs +++ b/src/ConsoleApplication/ArgParsed.cs @@ -2,25 +2,24 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace System.Net.ConsoleApplication +namespace System.Net; + +public class ArgParsed { - public class ArgParsed - { - public int Arg { get; set; } + public int Arg { get; set; } - private event ArgParsedDelegate OnArgParsed; + private event ArgParsedDelegate OnArgParsed; - public delegate void ArgParsedDelegate(ProgramContext ac, string arg); + public delegate void ArgParsedDelegate(ProgramContext ac, string arg); - public void Run(ProgramContext ac, string arg) - { + public void Run(ProgramContext ac, string arg) + { this.OnArgParsed?.Invoke(ac, arg); } - public ArgParsed(int arg, ArgParsedDelegate onArgParsed) - { + public ArgParsed(int arg, ArgParsedDelegate onArgParsed) + { this.Arg = arg; this.OnArgParsed += onArgParsed; } - } -} +} \ No newline at end of file diff --git a/src/ConsoleApplication/CidrParseTypeEnum.cs b/src/ConsoleApplication/CidrParseTypeEnum.cs index 5de6308f..b287de63 100644 --- a/src/ConsoleApplication/CidrParseTypeEnum.cs +++ b/src/ConsoleApplication/CidrParseTypeEnum.cs @@ -2,11 +2,10 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace System.Net.ConsoleApplication +namespace System.Net; + +public enum CidrParseEnum { - public enum CidrParseEnum - { - Default, - Value, - } -} + Default, + Value, +} \ No newline at end of file diff --git a/src/ConsoleApplication/ConsoleApplication.csproj b/src/ConsoleApplication/ConsoleApplication.csproj index 027c216f..2290125d 100644 --- a/src/ConsoleApplication/ConsoleApplication.csproj +++ b/src/ConsoleApplication/ConsoleApplication.csproj @@ -2,11 +2,14 @@ Exe - net462;net47;net48;net6.0;net8.0 - net8.0 + net8.0;net9.0 + net9.0 disable True ..\System.Net.IPNetwork.snk + 3.1.0 + System.Net + latestmajor diff --git a/src/ConsoleApplication/Program.cs b/src/ConsoleApplication/Program.cs index 47ee748a..722cd691 100644 --- a/src/ConsoleApplication/Program.cs +++ b/src/ConsoleApplication/Program.cs @@ -2,490 +2,486 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace System.Net.ConsoleApplication -{ - using System.Collections.Generic; - using System.Diagnostics; - using System.IO; - using System.Numerics; - using System.Reflection; - using Gnu.Getopt; +namespace System.Net; - /// - /// Console app for IPNetwork. - /// - public class Program - { - private static readonly Dictionary Args = new Dictionary(); - - private static readonly ArgParsed[] ArgsList = new[] - { - new ArgParsed('i', (ac, arg) => { ac.IPNetwork = true; }), - new ArgParsed('n', (ac, arg) => { ac.Network = true; }), - new ArgParsed('m', (ac, arg) => { ac.Netmask = true; }), - new ArgParsed('c', (ac, arg) => { ac.Cidr = true; }), - new ArgParsed('b', (ac, arg) => { ac.Broadcast = true; }), - new ArgParsed('f', (ac, arg) => { ac.FirstUsable = true; }), - new ArgParsed('l', (ac, arg) => { ac.LastUsable = true; }), - new ArgParsed('u', (ac, arg) => { ac.Usable = true; }), - new ArgParsed('t', (ac, arg) => { ac.Total = true; }), - new ArgParsed('w', (ac, arg) => { ac.Action = ActionEnum.Supernet; }), - new ArgParsed('W', (ac, arg) => { ac.Action = ActionEnum.WideSupernet; }), - new ArgParsed('h', (ac, arg) => { ac.Action = ActionEnum.Usage; }), - new ArgParsed('x', (ac, arg) => { ac.Action = ActionEnum.ListIPAddress; }), - new ArgParsed('?', (ac, arg) => { }), - new ArgParsed('D', (ac, arg) => { ac.CidrParse = CidrParseEnum.Default; }), - new ArgParsed('d', (ac, arg) => - { - if (!IPNetwork2.TryParseCidr(arg, Sockets.AddressFamily.InterNetwork, out byte? cidr)) - { - Console.WriteLine("Invalid cidr {0}", cidr); - ac.Action = ActionEnum.Usage; - return; - } - - ac.CidrParse = CidrParseEnum.Value; - ac.CidrParsed = (byte)cidr; - }), - new ArgParsed('s', (ac, arg) => - { - if (!IPNetwork2.TryParseCidr(arg, Sockets.AddressFamily.InterNetwork, out byte? cidr)) - { - Console.WriteLine("Invalid cidr {0}", cidr); - ac.Action = ActionEnum.Usage; - return; - } - - ac.Action = ActionEnum.Subnet; - ac.SubnetCidr = (byte)cidr; - }), - new ArgParsed('C', (ac, arg) => - { - if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) - { - Console.WriteLine("Unable to parse ipnetwork {0}", arg); - ac.Action = ActionEnum.Usage; - return; - } +using System.Diagnostics; +using System.IO; +using System.Numerics; +using System.Reflection; +using Gnu.Getopt; - ac.Action = ActionEnum.ContainNetwork; - ac.ContainNetwork = ipnetwork; - }), - new ArgParsed('o', (ac, arg) => - { - if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) - { - Console.WriteLine("Unable to parse ipnetwork {0}", arg); - ac.Action = ActionEnum.Usage; - return; - } - ac.Action = ActionEnum.OverlapNetwork; - ac.OverlapNetwork = ipnetwork; - }), - new ArgParsed('S', (ac, arg) => - { - if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) - { - Console.WriteLine("Unable to parse ipnetwork {0}", arg); - ac.Action = ActionEnum.Usage; - return; - } +using System.Collections.Generic; - ac.Action = ActionEnum.SubtractNetwork; - ac.SubtractNetwork = ipnetwork; - }), - }; +/// +/// Console app for IPNetwork. +/// +public class Program +{ + private static readonly Dictionary Args = new(); - /// - /// Program entry point. - /// - /// program arguments. - public static void Main(string[] args) + private static readonly ArgParsed[] ArgsList = new[] + { + new ArgParsed('i', (ac, arg) => { ac.IPNetwork = true; }), + new ArgParsed('n', (ac, arg) => { ac.Network = true; }), + new ArgParsed('m', (ac, arg) => { ac.Netmask = true; }), + new ArgParsed('c', (ac, arg) => { ac.Cidr = true; }), + new ArgParsed('b', (ac, arg) => { ac.Broadcast = true; }), + new ArgParsed('f', (ac, arg) => { ac.FirstUsable = true; }), + new ArgParsed('l', (ac, arg) => { ac.LastUsable = true; }), + new ArgParsed('u', (ac, arg) => { ac.Usable = true; }), + new ArgParsed('t', (ac, arg) => { ac.Total = true; }), + new ArgParsed('w', (ac, arg) => { ac.Action = ActionEnum.Supernet; }), + new ArgParsed('W', (ac, arg) => { ac.Action = ActionEnum.WideSupernet; }), + new ArgParsed('h', (ac, arg) => { ac.Action = ActionEnum.Usage; }), + new ArgParsed('x', (ac, arg) => { ac.Action = ActionEnum.ListIPAddress; }), + new ArgParsed('?', (ac, arg) => { }), + new ArgParsed('D', (ac, arg) => { ac.CidrParse = CidrParseEnum.Default; }), + new ArgParsed('d', (ac, arg) => { - ProgramContext ac = Program.ParseArgs(args); - - if (ac.Action == ActionEnum.Subnet) - { - Program.SubnetNetworks(ac); - } - else if (ac.Action == ActionEnum.Supernet) + if (!IPNetwork2.TryParseCidr(arg, Sockets.AddressFamily.InterNetwork, out byte? cidr)) { - Program.SupernetNetworks(ac); - } - else if (ac.Action == ActionEnum.WideSupernet) - { - Program.WideSupernetNetworks(ac); - } - else if (ac.Action == ActionEnum.PrintNetworks) - { - Program.PrintNetworks(ac); - } - else if (ac.Action == ActionEnum.ContainNetwork) - { - Program.ContainNetwork(ac); - } - else if (ac.Action == ActionEnum.OverlapNetwork) - { - Program.OverlapNetwork(ac); - } - else if (ac.Action == ActionEnum.ListIPAddress) - { - Program.ListIPAddress(ac); - /** - * Need a better way to do it - * - } else if (ac.Action == ActionEnum.SubtractNetwork) { - Program.SubtractNetwork(ac); - * - */ - } - else - { - Program.Usage(); + Console.WriteLine("Invalid cidr {0}", cidr); + ac.Action = ActionEnum.Usage; + return; } - } - private static void ListIPAddress(ProgramContext ac) + ac.CidrParse = CidrParseEnum.Value; + ac.CidrParsed = (byte)cidr; + }), + new ArgParsed('s', (ac, arg) => { - foreach (IPNetwork2 ipnetwork in ac.Networks) + if (!IPNetwork2.TryParseCidr(arg, Sockets.AddressFamily.InterNetwork, out byte? cidr)) { - foreach (IPAddress ipaddress in ipnetwork.ListIPAddress()) - { - Console.WriteLine("{0}", ipaddress.ToString()); - } + Console.WriteLine("Invalid cidr {0}", cidr); + ac.Action = ActionEnum.Usage; + return; } - } - private static void ContainNetwork(ProgramContext ac) + ac.Action = ActionEnum.Subnet; + ac.SubnetCidr = (byte)cidr; + }), + new ArgParsed('C', (ac, arg) => { - foreach (IPNetwork2 ipnetwork in ac.Networks) + if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) { - bool contain = ac.ContainNetwork.Contains(ipnetwork); - Console.WriteLine("{0} contains {1} : {2}", ac.ContainNetwork, ipnetwork, contain); + Console.WriteLine("Unable to parse ipnetwork {0}", arg); + ac.Action = ActionEnum.Usage; + return; } - } - private static void OverlapNetwork(ProgramContext ac) + ac.Action = ActionEnum.ContainNetwork; + ac.ContainNetwork = ipnetwork; + }), + new ArgParsed('o', (ac, arg) => { - foreach (IPNetwork2 ipnetwork in ac.Networks) + if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) { - bool overlap = ac.OverlapNetwork.Overlap(ipnetwork); - Console.WriteLine("{0} overlaps {1} : {2}", ac.OverlapNetwork, ipnetwork, overlap); + Console.WriteLine("Unable to parse ipnetwork {0}", arg); + ac.Action = ActionEnum.Usage; + return; } - } - private static void WideSupernetNetworks(ProgramContext ac) + ac.Action = ActionEnum.OverlapNetwork; + ac.OverlapNetwork = ipnetwork; + }), + new ArgParsed('S', (ac, arg) => { - if (!IPNetwork2.TryWideSubnet(ac.Networks, out IPNetwork2 widesubnet)) + if (!Program.TryParseIPNetwork(arg, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) { - Console.WriteLine("Unable to wide subnet these networks"); + Console.WriteLine("Unable to parse ipnetwork {0}", arg); + ac.Action = ActionEnum.Usage; + return; } - Program.PrintNetwork(ac, widesubnet); - } + ac.Action = ActionEnum.SubtractNetwork; + ac.SubtractNetwork = ipnetwork; + }), + }; - private static void SupernetNetworks(ProgramContext ac) - { - if (!IPNetwork2.TrySupernet(ac.Networks, out IPNetwork2[] supernet)) - { - Console.WriteLine("Unable to supernet these networks"); - } + /// + /// Program entry point. + /// + /// program arguments. + public static void Main(string[] args) + { + ProgramContext ac = Program.ParseArgs(args); - Program.PrintNetworks(ac, supernet, supernet.Length); + if (ac.Action == ActionEnum.Subnet) + { + Program.SubnetNetworks(ac); } - - private static void PrintNetworks(ProgramContext ac, IEnumerable ipnetworks, BigInteger networkLength) + else if (ac.Action == ActionEnum.Supernet) { - int i = 0; - foreach (IPNetwork2 ipn in ipnetworks) - { - i++; - Program.PrintNetwork(ac, ipn); - Program.PrintSeparator(networkLength, i); - } + Program.SupernetNetworks(ac); } - - private static void SubnetNetworks(ProgramContext ac) + else if (ac.Action == ActionEnum.WideSupernet) { - BigInteger i = 0; - foreach (IPNetwork2 ipnetwork in ac.Networks) - { - i++; - int networkLength = ac.Networks.Length; - if (!ipnetwork.TrySubnet(ac.SubnetCidr, out IPNetworkCollection ipnetworks)) - { - Console.WriteLine("Unable to subnet ipnetwork {0} into cidr {1}", ipnetwork, ac.SubnetCidr); - Program.PrintSeparator(networkLength, i); - continue; - } - - Program.PrintNetworks(ac, ipnetworks, ipnetworks.Count); - Program.PrintSeparator(networkLength, i); - } + Program.WideSupernetNetworks(ac); } - - // private static void PrintSeparator(Array network, int index) { - // if (network.Length > 1 && index != network.Length) { - // Console.WriteLine("--"); - // } - // } - private static void PrintSeparator(BigInteger max, BigInteger index) + else if (ac.Action == ActionEnum.PrintNetworks) { - if (max > 1 && index != max) - { - Console.WriteLine("--"); - } + Program.PrintNetworks(ac); + } + else if (ac.Action == ActionEnum.ContainNetwork) + { + Program.ContainNetwork(ac); + } + else if (ac.Action == ActionEnum.OverlapNetwork) + { + Program.OverlapNetwork(ac); + } + else if (ac.Action == ActionEnum.ListIPAddress) + { + Program.ListIPAddress(ac); + } + else + { + Program.Usage(); } + } - private static void PrintNetworks(ProgramContext ac) + private static void ListIPAddress(ProgramContext ac) + { + foreach (IPNetwork2 ipnetwork in ac.Networks) { - int i = 0; - foreach (IPNetwork2 ipnetwork in ac.Networks) + foreach (IPAddress ipaddress in ipnetwork.ListIPAddress()) { - i++; - Program.PrintNetwork(ac, ipnetwork); - Program.PrintSeparator(ac.Networks.Length, i); + Console.WriteLine("{0}", ipaddress.ToString()); } } + } - private static void PrintNetwork(ProgramContext ac, IPNetwork2 ipn) + private static void ContainNetwork(ProgramContext ac) + { + foreach (IPNetwork2 ipnetwork in ac.Networks) { - using (var sw = new StringWriter()) - { - if (ac.IPNetwork) - { - sw.WriteLine("IPNetwork : {0}", ipn.ToString()); - } + bool contain = ac.ContainNetwork.Contains(ipnetwork); + Console.WriteLine("{0} contains {1} : {2}", ac.ContainNetwork, ipnetwork, contain); + } + } - if (ac.Network) - { - sw.WriteLine("Network : {0}", ipn.Network.ToString()); - } + private static void OverlapNetwork(ProgramContext ac) + { + foreach (IPNetwork2 ipnetwork in ac.Networks) + { + bool overlap = ac.OverlapNetwork.Overlap(ipnetwork); + Console.WriteLine("{0} overlaps {1} : {2}", ac.OverlapNetwork, ipnetwork, overlap); + } + } - if (ac.Netmask) - { - sw.WriteLine("Netmask : {0}", ipn.Netmask.ToString()); - } + private static void WideSupernetNetworks(ProgramContext ac) + { + if (!IPNetwork2.TryWideSubnet(ac.Networks, out IPNetwork2 widesubnet)) + { + Console.WriteLine("Unable to wide subnet these networks"); + } - if (ac.Cidr) - { - sw.WriteLine("Cidr : {0}", ipn.Cidr); - } + Program.PrintNetwork(ac, widesubnet); + } - if (ac.Broadcast) - { - sw.WriteLine("Broadcast : {0}", ipn.Broadcast.ToString()); - } + private static void SupernetNetworks(ProgramContext ac) + { + if (!IPNetwork2.TrySupernet(ac.Networks, out IPNetwork2[] supernet)) + { + Console.WriteLine("Unable to supernet these networks"); + } - if (ac.FirstUsable) - { - sw.WriteLine("FirstUsable : {0}", ipn.FirstUsable.ToString()); - } + Program.PrintNetworks(ac, supernet, supernet.Length); + } - if (ac.LastUsable) - { - sw.WriteLine("LastUsable : {0}", ipn.LastUsable.ToString()); - } + private static void PrintNetworks(ProgramContext ac, IEnumerable ipnetworks, BigInteger networkLength) + { + int i = 0; + foreach (IPNetwork2 ipn in ipnetworks) + { + i++; + Program.PrintNetwork(ac, ipn); + Program.PrintSeparator(networkLength, i); + } + } - if (ac.Usable) - { - sw.WriteLine("Usable : {0}", ipn.Usable); - } + private static void SubnetNetworks(ProgramContext ac) + { + BigInteger i = 0; + foreach (IPNetwork2 ipnetwork in ac.Networks) + { + i++; + int networkLength = ac.Networks.Length; + if (!ipnetwork.TrySubnet(ac.SubnetCidr, out IPNetworkCollection ipnetworks)) + { + Console.WriteLine("Unable to subnet ipnetwork {0} into cidr {1}", ipnetwork, ac.SubnetCidr); + Program.PrintSeparator(networkLength, i); + continue; + } - if (ac.Total) - { - sw.WriteLine("Total : {0}", ipn.Total); - } + Program.PrintNetworks(ac, ipnetworks, ipnetworks.Count); + Program.PrintSeparator(networkLength, i); + } + } - Console.Write(sw.ToString()); - } + // private static void PrintSeparator(Array network, int index) { + // if (network.Length > 1 && index != network.Length) { + // Console.WriteLine("--"); + // } + // } + private static void PrintSeparator(BigInteger max, BigInteger index) + { + if (max > 1 && index != max) + { + Console.WriteLine("--"); } + } - static Program() + private static void PrintNetworks(ProgramContext ac) + { + int i = 0; + foreach (IPNetwork2 ipnetwork in ac.Networks) { - foreach (ArgParsed ap in Program.ArgsList) - { - Program.Args.Add(ap.Arg, ap); - } + i++; + Program.PrintNetwork(ac, ipnetwork); + Program.PrintSeparator(ac.Networks.Length, i); } + } - private static ProgramContext ParseArgs(string[] args) + private static void PrintNetwork(ProgramContext ac, IPNetwork2 ipn) + { + using (var sw = new StringWriter()) { - int c; - var g = new Getopt("ipnetwork", args, "inmcbfltud:Dhs:wWxC:o:S:"); - var ac = new ProgramContext(); + if (ac.IPNetwork) + { + sw.WriteLine("IPNetwork : {0}", ipn.ToString()); + } - while ((c = g.getopt()) != -1) + if (ac.Network) { - string optArg = g.Optarg; - Program.Args[c].Run(ac, optArg); + sw.WriteLine("Network : {0}", ipn.Network.ToString()); } - var ipnetworks = new List(); - for (int i = g.Optind; i < args.Length; i++) + if (ac.Netmask) { - if (!string.IsNullOrEmpty(args[i])) - { - ipnetworks.Add(args[i]); - } + sw.WriteLine("Netmask : {0}", ipn.Netmask.ToString()); } - ac.NetworksString = ipnetworks.ToArray(); - Program.ParseIPNetworks(ac); + if (ac.Cidr) + { + sw.WriteLine("Cidr : {0}", ipn.Cidr); + } - if (ac.Networks.Length == 0) + if (ac.Broadcast) { - Console.WriteLine("Provide at least one ipnetwork"); - ac.Action = ActionEnum.Usage; + sw.WriteLine("Broadcast : {0}", ipn.Broadcast.ToString()); } - if (ac.Action == ActionEnum.Supernet - && ipnetworks.Count < 2) + if (ac.FirstUsable) { - Console.WriteLine("Supernet action required at least two ipnetworks"); - ac.Action = ActionEnum.Usage; + sw.WriteLine("FirstUsable : {0}", ipn.FirstUsable.ToString()); } - if (ac.Action == ActionEnum.WideSupernet - && ipnetworks.Count < 2) + if (ac.LastUsable) { - Console.WriteLine("WideSupernet action required at least two ipnetworks"); - ac.Action = ActionEnum.Usage; + sw.WriteLine("LastUsable : {0}", ipn.LastUsable.ToString()); } - if (Program.PrintNoValue(ac)) + if (ac.Usable) { - Program.PrintAll(ac); + sw.WriteLine("Usable : {0}", ipn.Usable); } - if (g.Optind == 0) + if (ac.Total) { - Program.PrintAll(ac); + sw.WriteLine("Total : {0}", ipn.Total); } - return ac; + Console.Write(sw.ToString()); } + } - private static void ParseIPNetworks(ProgramContext ac) + static Program() + { + foreach (ArgParsed ap in Program.ArgsList) { - var ipnetworks = new List(); - foreach (string ips in ac.NetworksString) - { - if (!Program.TryParseIPNetwork(ips, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) - { - Console.WriteLine("Unable to parse ipnetwork {0}", ips); - continue; - } + Program.Args.Add(ap.Arg, ap); + } + } - ipnetworks.Add(ipnetwork); - } + private static ProgramContext ParseArgs(string[] args) + { + int c; + var g = new Getopt("ipnetwork", args, "inmcbfltud:Dhs:wWxC:o:S:"); + var ac = new ProgramContext(); - ac.Networks = ipnetworks.ToArray(); + while ((c = g.getopt()) != -1) + { + string optArg = g.Optarg; + Program.Args[c].Run(ac, optArg); } - private static bool TryParseIPNetwork(string ip, CidrParseEnum cidrParseEnum, byte cidr, out IPNetwork2 ipn) + var ipnetworks = new List(); + for (int i = g.Optind; i < args.Length; i++) { - IPNetwork2 ipnetwork = null; - if (cidrParseEnum == CidrParseEnum.Default) + if (!string.IsNullOrEmpty(args[i])) { - if (!IPNetwork2.TryParse(ip, out ipnetwork)) - { - ipn = null; - return false; - } - } - else if (cidrParseEnum == CidrParseEnum.Value) - { - if (!IPNetwork2.TryParse(ip, cidr, out ipnetwork)) - { - if (!IPNetwork2.TryParse(ip, out ipnetwork)) - { - ipn = null; - return false; - } - } + ipnetworks.Add(args[i]); } + } + + ac.NetworksString = ipnetworks.ToArray(); + Program.ParseIPNetworks(ac); + + if (ac.Networks.Length == 0) + { + Console.WriteLine("Provide at least one ipnetwork"); + ac.Action = ActionEnum.Usage; + } - ipn = ipnetwork; - return true; + if (ac.Action == ActionEnum.Supernet + && ipnetworks.Count < 2) + { + Console.WriteLine("Supernet action required at least two ipnetworks"); + ac.Action = ActionEnum.Usage; + } + + if (ac.Action == ActionEnum.WideSupernet + && ipnetworks.Count < 2) + { + Console.WriteLine("WideSupernet action required at least two ipnetworks"); + ac.Action = ActionEnum.Usage; + } + + if (Program.PrintNoValue(ac)) + { + Program.PrintAll(ac); } - private static bool PrintNoValue(ProgramContext ac) + if (g.Optind == 0) + { + Program.PrintAll(ac); + } + + return ac; + } + + private static void ParseIPNetworks(ProgramContext ac) + { + var ipnetworks = new List(); + foreach (string ips in ac.NetworksString) { - if (ac == null) + if (!Program.TryParseIPNetwork(ips, ac.CidrParse, ac.CidrParsed, out IPNetwork2 ipnetwork)) { - throw new ArgumentNullException(nameof(ac)); + Console.WriteLine("Unable to parse ipnetwork {0}", ips); + continue; } - return ac.IPNetwork == false - && ac.Network == false - && ac.Netmask == false - && ac.Cidr == false - && ac.Broadcast == false - && ac.FirstUsable == false - && ac.LastUsable == false - && ac.Total == false - && ac.Usable == false; + ipnetworks.Add(ipnetwork); } - private static void PrintAll(ProgramContext ac) + ac.Networks = ipnetworks.ToArray(); + } + + private static bool TryParseIPNetwork(string ip, CidrParseEnum cidrParseEnum, byte cidr, out IPNetwork2 ipn) + { + IPNetwork2 ipnetwork = null; + if (cidrParseEnum == CidrParseEnum.Default) { - if (ac == null) + if (!IPNetwork2.TryParse(ip, out ipnetwork)) { - throw new ArgumentNullException(nameof(ac)); + ipn = null; + return false; } + } + else if (cidrParseEnum == CidrParseEnum.Value) + { + if (!IPNetwork2.TryParse(ip, cidr, out ipnetwork)) + { + if (!IPNetwork2.TryParse(ip, out ipnetwork)) + { + ipn = null; + return false; + } + } + } - ac.IPNetwork = true; - ac.Network = true; - ac.Netmask = true; - ac.Cidr = true; - ac.Broadcast = true; - ac.FirstUsable = true; - ac.LastUsable = true; - ac.Usable = true; - ac.Total = true; + ipn = ipnetwork; + return true; + } + + private static bool PrintNoValue(ProgramContext ac) + { + if (ac == null) + { + throw new ArgumentNullException(nameof(ac)); } - private static void Usage() - { - Assembly assembly = Assembly.GetEntryAssembly() - ?? Assembly.GetExecutingAssembly() - ?? Assembly.GetCallingAssembly() - ; - var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - string version = fvi.FileVersion; - - Console.WriteLine("Usage: ipnetwork [-inmcbflu] [-d cidr|-D] [-h|-s cidr|-S|-w|-W|-x|-C network|-o network] networks ..."); - Console.WriteLine("Version: {0}", version); - Console.WriteLine(); - Console.WriteLine("Print options"); - Console.WriteLine("\t-i : network"); - Console.WriteLine("\t-n : network address"); - Console.WriteLine("\t-m : netmask"); - Console.WriteLine("\t-c : cidr"); - Console.WriteLine("\t-b : broadcast"); - Console.WriteLine("\t-f : first usable ip address"); - Console.WriteLine("\t-l : last usable ip address"); - Console.WriteLine("\t-u : number of usable ip addresses"); - Console.WriteLine("\t-t : total number of ip addresses"); - Console.WriteLine(); - Console.WriteLine("Parse options"); - Console.WriteLine("\t-d cidr : use cidr if not provided (default /32)"); - Console.WriteLine("\t-D : IPv4 only - use default cidr (ClassA/8, ClassB/16, ClassC/24)"); - Console.WriteLine(); - Console.WriteLine("Actions"); - Console.WriteLine("\t-h : help message"); - Console.WriteLine("\t-s cidr : split network into cidr subnets"); - Console.WriteLine("\t-w : supernet networks into smallest possible subnets"); - Console.WriteLine("\t-W : supernet networks into one single subnet"); - Console.WriteLine("\t-x : list all ipaddresses in networks"); - Console.WriteLine("\t-C network : network contain networks"); - Console.WriteLine("\t-o network : network overlap networks"); - Console.WriteLine("\t-S network : subtract network from subnet"); - Console.WriteLine(string.Empty); - Console.WriteLine("networks : one or more network addresses "); - Console.WriteLine(" (1.2.3.4 10.0.0.0/8 10.0.0.0/255.0.0.0 2001:db8::/32 2001:db8:1:2:3:4:5:6/128 )"); + return ac.IPNetwork == false + && ac.Network == false + && ac.Netmask == false + && ac.Cidr == false + && ac.Broadcast == false + && ac.FirstUsable == false + && ac.LastUsable == false + && ac.Total == false + && ac.Usable == false; + } + + private static void PrintAll(ProgramContext ac) + { + if (ac == null) + { + throw new ArgumentNullException(nameof(ac)); } + + ac.IPNetwork = true; + ac.Network = true; + ac.Netmask = true; + ac.Cidr = true; + ac.Broadcast = true; + ac.FirstUsable = true; + ac.LastUsable = true; + ac.Usable = true; + ac.Total = true; + } + + private static void Usage() + { + Assembly assembly = Assembly.GetEntryAssembly() + ?? Assembly.GetExecutingAssembly() + ?? Assembly.GetCallingAssembly() + ; + var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); + string version = fvi.FileVersion; + + Console.WriteLine( + "Usage: ipnetwork [-inmcbflu] [-d cidr|-D] [-h|-s cidr|-S|-w|-W|-x|-C network|-o network] networks ..."); + Console.WriteLine("Version: {0}", version); + Console.WriteLine(); + Console.WriteLine("Print options"); + Console.WriteLine("\t-i : network"); + Console.WriteLine("\t-n : network address"); + Console.WriteLine("\t-m : netmask"); + Console.WriteLine("\t-c : cidr"); + Console.WriteLine("\t-b : broadcast"); + Console.WriteLine("\t-f : first usable ip address"); + Console.WriteLine("\t-l : last usable ip address"); + Console.WriteLine("\t-u : number of usable ip addresses"); + Console.WriteLine("\t-t : total number of ip addresses"); + Console.WriteLine(); + Console.WriteLine("Parse options"); + Console.WriteLine("\t-d cidr : use cidr if not provided (default /32)"); + Console.WriteLine("\t-D : IPv4 only - use default cidr (ClassA/8, ClassB/16, ClassC/24)"); + Console.WriteLine(); + Console.WriteLine("Actions"); + Console.WriteLine("\t-h : help message"); + Console.WriteLine("\t-s cidr : split network into cidr subnets"); + Console.WriteLine("\t-w : supernet networks into smallest possible subnets"); + Console.WriteLine("\t-W : supernet networks into one single subnet"); + Console.WriteLine("\t-x : list all ipaddresses in networks"); + Console.WriteLine("\t-C network : network contain networks"); + Console.WriteLine("\t-o network : network overlap networks"); + Console.WriteLine("\t-S network : subtract network from subnet"); + Console.WriteLine(string.Empty); + Console.WriteLine("networks : one or more network addresses "); + Console.WriteLine( + " (1.2.3.4 10.0.0.0/8 10.0.0.0/255.0.0.0 2001:db8::/32 2001:db8:1:2:3:4:5:6/128 )"); } -} +} \ No newline at end of file diff --git a/src/ConsoleApplication/ProgramContext.cs b/src/ConsoleApplication/ProgramContext.cs index 69ff7300..28fe99ec 100644 --- a/src/ConsoleApplication/ProgramContext.cs +++ b/src/ConsoleApplication/ProgramContext.cs @@ -2,44 +2,43 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace System.Net.ConsoleApplication +namespace System.Net; + +public class ProgramContext { - public class ProgramContext - { - public bool IPNetwork { get; set; } + public bool IPNetwork { get; set; } - public bool Network { get; set; } + public bool Network { get; set; } - public bool Netmask { get; set; } + public bool Netmask { get; set; } - public bool Cidr { get; set; } + public bool Cidr { get; set; } - public bool Broadcast { get; set; } + public bool Broadcast { get; set; } - public bool FirstUsable { get; set; } + public bool FirstUsable { get; set; } - public bool LastUsable { get; set; } + public bool LastUsable { get; set; } - public bool Usable { get; set; } + public bool Usable { get; set; } - public bool Total { get; set; } + public bool Total { get; set; } - public CidrParseEnum CidrParse { get; set; } = CidrParseEnum.Value; + public CidrParseEnum CidrParse { get; set; } = CidrParseEnum.Value; - public byte CidrParsed { get; set; } = 32; + public byte CidrParsed { get; set; } = 32; - public IPNetwork2 ContainNetwork { get; set; } + public IPNetwork2 ContainNetwork { get; set; } - public IPNetwork2 OverlapNetwork { get; set; } + public IPNetwork2 OverlapNetwork { get; set; } - public IPNetwork2 SubtractNetwork { get; set; } + public IPNetwork2 SubtractNetwork { get; set; } - public ActionEnum Action { get; set; } = ActionEnum.PrintNetworks; + public ActionEnum Action { get; set; } = ActionEnum.PrintNetworks; - public byte SubnetCidr { get; set; } + public byte SubnetCidr { get; set; } - public string[] NetworksString { get; set; } + public string[] NetworksString { get; set; } - public IPNetwork2[] Networks { get; set; } - } -} + public IPNetwork2[] Networks { get; set; } +} \ No newline at end of file diff --git a/src/System.Net.IPNetwork/CidrGuess.cs b/src/System.Net.IPNetwork/CidrGuess.cs index 7824bbe4..2baf56e8 100644 --- a/src/System.Net.IPNetwork/CidrGuess.cs +++ b/src/System.Net.IPNetwork/CidrGuess.cs @@ -19,7 +19,7 @@ public static class CidrGuess /// public static ICidrGuess ClassLess { get => _cidr_classless.Value; } - private static readonly Lazy _cidr_classless = new Lazy(() => new CidrClassLess()); - private static readonly Lazy _cidr_classfull = new Lazy(() => new CidrClassFull()); + private static readonly Lazy _cidr_classless = new(() => new CidrClassLess()); + private static readonly Lazy _cidr_classfull = new(() => new CidrClassFull()); } } diff --git a/src/System.Net.IPNetwork/IPNetwork2.cs b/src/System.Net.IPNetwork/IPNetwork2.cs index 64f2593b..5b2a534e 100644 --- a/src/System.Net.IPNetwork/IPNetwork2.cs +++ b/src/System.Net.IPNetwork/IPNetwork2.cs @@ -5,7 +5,6 @@ namespace System.Net { using System.Collections.Generic; - using System.ComponentModel; using System.IO; using System.Net.Sockets; using System.Numerics; @@ -21,7 +20,7 @@ public sealed class IPNetwork2 : IComparable, ISerializable { #region properties - private readonly object _sync = new object(); + private readonly object _sync = new(); private readonly int _hashCode; private BigInteger _ipaddress; private byte _cidr; @@ -1518,9 +1517,9 @@ public override string ToString() #region IANA block - private static readonly Lazy _iana_ablock_reserved = new Lazy(() => IPNetwork2.Parse("10.0.0.0/8")); - private static readonly Lazy _iana_bblock_reserved = new Lazy(() => IPNetwork2.Parse("172.16.0.0/12")); - private static readonly Lazy _iana_cblock_reserved = new Lazy(() => IPNetwork2.Parse("192.168.0.0/16")); + private static readonly Lazy _iana_ablock_reserved = new(() => IPNetwork2.Parse("10.0.0.0/8")); + private static readonly Lazy _iana_bblock_reserved = new(() => IPNetwork2.Parse("172.16.0.0/12")); + private static readonly Lazy _iana_cblock_reserved = new(() => IPNetwork2.Parse("192.168.0.0/16")); /// /// Gets 10.0.0.0/8. diff --git a/src/System.Net.IPNetwork/IPNetworkCollection.cs b/src/System.Net.IPNetwork/IPNetworkCollection.cs index a34331cc..579b3510 100644 --- a/src/System.Net.IPNetwork/IPNetworkCollection.cs +++ b/src/System.Net.IPNetwork/IPNetworkCollection.cs @@ -37,9 +37,6 @@ private BigInteger _network get { return IPNetwork2.ToBigInteger(this._ipnetwork.Network); } } -#if TRAVISCI - public -#else /// /// Initializes a new instance of the class. /// Represents a collection of IP networks based on a given parent IP network and subnet CIDR. @@ -48,6 +45,9 @@ private BigInteger _network /// This class is used to generate a collection of IP networks by dividing the given parent IP network into subnets based on the provided subnet CIDR (Classless Inter-Domain Routing /// ) value. /// +#if TRAVISCI + public +#else internal #endif IPNetworkCollection(IPNetwork2 ipnetwork, byte cidrSubnet) @@ -142,7 +142,6 @@ public IPNetwork2 Current /// held by the object. In this particular implementation, there are no resources /// to dispose of, so the method does nothing. /// - /// public void Dispose() { // nothing to dispose @@ -152,6 +151,7 @@ public void Dispose() #endregion #region IEnumerator Members + /// /// Gets the element in the collection at the current position of the enumerator. /// diff --git a/src/System.Net.IPNetwork/Properties/AssemblyInfo.cs b/src/System.Net.IPNetwork/Properties/AssemblyInfo.cs index b91a2221..6302ac99 100644 --- a/src/System.Net.IPNetwork/Properties/AssemblyInfo.cs +++ b/src/System.Net.IPNetwork/Properties/AssemblyInfo.cs @@ -9,12 +9,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("System.Net.IPNetwork")] +[assembly: AssemblyTitle("System.Net.IPNetwork2")] [assembly: AssemblyDescription("IPNetwork C# library take care of complex network, ip, ipv4, ipv6, netmask, cidr, subnet, subnetting, supernet and supernetting calculation for .Net developpers. It works with IPv4 and IPv6 as well. It is written in C# for .NetStandard and coreclr and has a light and clean API and is fully unit tested.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Luc Dvchosal")] -[assembly: AssemblyProduct("System.Net.IPNetwork")] -[assembly: AssemblyCopyright("Copyright © Luc Dvchosal 2018")] +[assembly: AssemblyProduct("System.Net.IPNetwork2")] +[assembly: AssemblyCopyright("Copyright © Luc Dvchosal 2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -36,8 +36,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.0.0.0")] -#if !TRAVISCI +[assembly: AssemblyVersion("3.1.0.0")] +[assembly: AssemblyFileVersion("3.1.0.0")] [assembly: InternalsVisibleTo("TestProject, PublicKey=00240000048000009400000006020000002400005253413100040000010001004d29ae79cfcf603de0200afc96f4d8304aa857341b78e706fedb3f0ac9c9d613443cea78a1ee687def573ad45b5cdc0abeeb1db304eec7c07331015d8aeeb3fd5e092273a2347e6cb54803a00484807c64bc3092f17619abfc5290133efad358a27747bfe71d1dc23b461d7cf91272844fc7a8390dc63b16236729dadb2c21bc")] -#endif \ No newline at end of file diff --git a/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj b/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj index c7c53dc1..260d2611 100644 --- a/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj +++ b/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj @@ -1,11 +1,10 @@  - netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0 - netstandard2.0;netstandard2.1;net6.0;net8.0 + net9.0;net8.0;netstandard2.0;netstandard2.1 true IPNetwork2 - 3.0.0 + 3.1.0 false https://github.com/lduchosal/ipnetwork/blob/master/LICENSE https://github.com/lduchosal/ipnetwork @@ -18,12 +17,14 @@ IPNetwork utility classes for .Net Luc Dvchosal Luc Dvchosal - Copyright 2022 + Copyright 2025 True false System.Net.IPNetwork.snk https://github.com/lduchosal/ipnetwork.git git + System.Net + latestmajor diff --git a/src/TestProject/BigIntegerBitWiseUnitTest.cs b/src/TestProject/BigIntegerBitWiseUnitTest.cs index a1d1af1f..9d0efa90 100644 --- a/src/TestProject/BigIntegerBitWiseUnitTest.cs +++ b/src/TestProject/BigIntegerBitWiseUnitTest.cs @@ -2,17 +2,17 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class BigIntegerBitWiseUnitTest { - [TestClass] - public class BigIntegerBitWiseUnitTest + [TestMethod] + [DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 4, new byte[] { 0x0 })] + [DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 8, + new byte[] { 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0 })] + public void Test1(byte[] bytes, int reverseLength, byte[] expected) { - [TestMethod] - [DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 4, new byte[] { 0x0 })] - [DataRow(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }, 8, - new byte[] { 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0 })] - public void Test1(byte[] bytes, int reverseLength, byte[] expected) - { var reverseme = new BigInteger(bytes); BigInteger reversed = reverseme.PositiveReverse(reverseLength); byte[] result = reversed.ToByteArray(); @@ -23,5 +23,4 @@ public void Test1(byte[] bytes, int reverseLength, byte[] expected) Assert.AreEqual(expected[i], result[i], i.ToString()); } } - } } \ No newline at end of file diff --git a/src/TestProject/BigIntegerToUnitTest.cs b/src/TestProject/BigIntegerToUnitTest.cs index 0372d1be..43029c26 100644 --- a/src/TestProject/BigIntegerToUnitTest.cs +++ b/src/TestProject/BigIntegerToUnitTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class BigIntegerToUnitTest { - [TestClass] - public class BigIntegerToUnitTest - { - [TestMethod] - public void TestToOctalString1() + [TestMethod] + public void TestToOctalString1() { byte[] bytes = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }; var convertme = new BigInteger(bytes); @@ -17,8 +17,8 @@ public void TestToOctalString1() Assert.AreEqual("037777777777", result); } - [TestMethod] - public void TestToOctalString3() + [TestMethod] + public void TestToOctalString3() { var bigi = BigInteger.Parse("1048576"); bigi++; @@ -27,8 +27,8 @@ public void TestToOctalString3() Assert.AreEqual("04000001", result); } - [TestMethod] - public void TestToOctalString01() + [TestMethod] + public void TestToOctalString01() { BigInteger bigi = BigInteger.Zero; bigi++; @@ -37,8 +37,8 @@ public void TestToOctalString01() Assert.AreEqual("01", result); } - [TestMethod] - public void TestToOctalString02() + [TestMethod] + public void TestToOctalString02() { BigInteger bigi = BigInteger.Zero; bigi--; @@ -47,8 +47,8 @@ public void TestToOctalString02() Assert.AreEqual("377", result); } - [TestMethod] - public void TestToOctalString03() + [TestMethod] + public void TestToOctalString03() { BigInteger bigi = BigInteger.Zero; bigi--; @@ -63,8 +63,8 @@ public void TestToOctalString03() Assert.AreEqual("371", result); } - [TestMethod] - public void TestToHexadecimalString1() + [TestMethod] + public void TestToHexadecimalString1() { byte[] bytes = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }; var convertme = new BigInteger(bytes); @@ -73,8 +73,8 @@ public void TestToHexadecimalString1() Assert.AreEqual("0FFFFFFFF", result); } - [TestMethod] - public void TestToBinaryString1() + [TestMethod] + public void TestToBinaryString1() { byte[] bytes = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00 }; var convertme = new BigInteger(bytes); @@ -83,8 +83,8 @@ public void TestToBinaryString1() Assert.AreEqual("011111111111111111111111111111111", result); } - [TestMethod] - public void TestToBinaryString01() + [TestMethod] + public void TestToBinaryString01() { BigInteger bigi = BigInteger.Zero; bigi++; @@ -93,8 +93,8 @@ public void TestToBinaryString01() Assert.AreEqual("01", result); } - [TestMethod] - public void TestToBinaryString2() + [TestMethod] + public void TestToBinaryString2() { var convertme = new BigInteger(-1); string result = convertme.ToBinaryString(); @@ -102,8 +102,8 @@ public void TestToBinaryString2() Assert.AreEqual("11111111", result); } - [TestMethod] - public void TestToBinaryString3() + [TestMethod] + public void TestToBinaryString3() { byte[] bytes = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; @@ -112,5 +112,4 @@ public void TestToBinaryString3() Assert.AreEqual("11111111", result); } - } } \ No newline at end of file diff --git a/src/TestProject/CidrClassFullIpv4UnitTest.cs b/src/TestProject/CidrClassFullIpv4UnitTest.cs index 6ff5935b..2ab99e2f 100644 --- a/src/TestProject/CidrClassFullIpv4UnitTest.cs +++ b/src/TestProject/CidrClassFullIpv4UnitTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class CidrClassFullIpv4UnitTest { - [TestClass] - public class CidrClassFullIpv4UnitTest - { - [TestMethod] - public void TestTryGuessCidrNull() + [TestMethod] + public void TestTryGuessCidrNull() { var cidrguess = new CidrClassFull(); @@ -19,8 +19,8 @@ public void TestTryGuessCidrNull() Assert.AreEqual(0, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidrA() + [TestMethod] + public void TestTryGuessCidrA() { var cidrguess = new CidrClassFull(); @@ -31,8 +31,8 @@ public void TestTryGuessCidrA() Assert.AreEqual(8, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidrB() + [TestMethod] + public void TestTryGuessCidrB() { var cidrguess = new CidrClassFull(); @@ -43,8 +43,8 @@ public void TestTryGuessCidrB() Assert.AreEqual(16, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidrC() + [TestMethod] + public void TestTryGuessCidrC() { var cidrguess = new CidrClassFull(); @@ -55,8 +55,8 @@ public void TestTryGuessCidrC() Assert.AreEqual(24, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidrD() + [TestMethod] + public void TestTryGuessCidrD() { var cidrguess = new CidrClassFull(); @@ -67,8 +67,8 @@ public void TestTryGuessCidrD() Assert.AreEqual(24, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidrE() + [TestMethod] + public void TestTryGuessCidrE() { var cidrguess = new CidrClassFull(); @@ -78,5 +78,4 @@ public void TestTryGuessCidrE() Assert.AreEqual(true, 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 b85ad3e2..2ed51dd3 100644 --- a/src/TestProject/CidrClassFullIpv6UnitTest.cs +++ b/src/TestProject/CidrClassFullIpv6UnitTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class CidrClassFullIpv6UnitTest { - [TestClass] - public class CidrClassFullIpv6UnitTest - { - [TestMethod] - public void TestIpV6TryGuessCidrNull() + [TestMethod] + public void TestIpV6TryGuessCidrNull() { var cidrguess = new CidrClassFull(); @@ -19,8 +19,8 @@ public void TestIpV6TryGuessCidrNull() Assert.AreEqual(0, cidr, "cidr"); } - [TestMethod] - public void TestIpV6TryGuessCidr1() + [TestMethod] + public void TestIpV6TryGuessCidr1() { var cidrguess = new CidrClassFull(); @@ -31,8 +31,8 @@ public void TestIpV6TryGuessCidr1() Assert.AreEqual(64, cidr, "cidr"); } - [TestMethod] - public void TestIpV6TryGuessCidr2() + [TestMethod] + public void TestIpV6TryGuessCidr2() { var cidrguess = new CidrClassFull(); @@ -42,5 +42,4 @@ public void TestIpV6TryGuessCidr2() Assert.AreEqual(true, 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 5524fe95..14d01add 100644 --- a/src/TestProject/CidrClassLessUnitTest.cs +++ b/src/TestProject/CidrClassLessUnitTest.cs @@ -2,125 +2,124 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class CidrClassLessUnitTest { - [TestClass] - public class CidrClassLessUnitTest - { - #region IPV4 + #region IPV4 - [TestMethod] - public void TestTryGuessCidrNull() + [TestMethod] + public void TestTryGuessCidrNull() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr(null, out cidr); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(0, cidr, "cidr"); - } + Assert.AreEqual(false, parsed, "parsed"); + Assert.AreEqual(0, cidr, "cidr"); + } - [TestMethod] - public void TestTryGuessCidrA() + [TestMethod] + public void TestTryGuessCidrA() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("10.0.0.0", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(32, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(32, cidr, "cidr"); + } - [TestMethod] - public void TestTryGuessCidrB() + [TestMethod] + public void TestTryGuessCidrB() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("172.0.0.0", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(32, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(32, cidr, "cidr"); + } - [TestMethod] - public void TestTryGuessCidrC() + [TestMethod] + public void TestTryGuessCidrC() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("192.0.0.0", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(32, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(32, cidr, "cidr"); + } - [TestMethod] - public void TestTryGuessCidrD() + [TestMethod] + public void TestTryGuessCidrD() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("224.0.0.0", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(32, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(32, cidr, "cidr"); + } - [TestMethod] - public void TestTryGuessCidrE() + [TestMethod] + public void TestTryGuessCidrE() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("240.0.0.0", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(32, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(32, cidr, "cidr"); + } - #endregion + #endregion - #region IPV6 + #region IPV6 - [TestMethod] - public void TestIpV6TryGuessCidrNull() + [TestMethod] + public void TestIpV6TryGuessCidrNull() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr(null, out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr(null, out cidr); - Assert.AreEqual(false, parsed, "parsed"); - Assert.AreEqual(0, cidr, "cidr"); - } + Assert.AreEqual(false, parsed, "parsed"); + Assert.AreEqual(0, cidr, "cidr"); + } - [TestMethod] - public void TestIpV6TryGuessCidr1() + [TestMethod] + public void TestIpV6TryGuessCidr1() { - var cidrguess = new CidrClassLess(); + var cidrguess = new CidrClassLess(); - byte cidr; - bool parsed = cidrguess.TryGuessCidr("::", out cidr); + byte cidr; + bool parsed = cidrguess.TryGuessCidr("::", out cidr); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(128, cidr, "cidr"); - } + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(128, cidr, "cidr"); + } - [TestMethod] - public void TestIpV6TryGuessCidr2() + [TestMethod] + public void TestIpV6TryGuessCidr2() { - var cidrguess = new CidrClassLess(); - - byte cidr; - bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr); + var cidrguess = new CidrClassLess(); - Assert.AreEqual(true, parsed, "parsed"); - Assert.AreEqual(128, cidr, "cidr"); - } + byte cidr; + bool parsed = cidrguess.TryGuessCidr("2001:0db8::", out cidr); - #endregion + Assert.AreEqual(true, parsed, "parsed"); + Assert.AreEqual(128, cidr, "cidr"); } + + #endregion } \ No newline at end of file diff --git a/src/TestProject/ConsoleUnitTest.cs b/src/TestProject/ConsoleUnitTest.cs index ebc0349a..44a335a6 100644 --- a/src/TestProject/ConsoleUnitTest.cs +++ b/src/TestProject/ConsoleUnitTest.cs @@ -3,38 +3,37 @@ // -namespace TestProject +namespace TestProject; + +[TestClass] +public class ConsoleUnitTest { - [TestClass] - public class ConsoleUnitTest + [DataTestMethod] + [DataRow(new[] { "10.0.0.0/8" })] + [DataRow(new[] { "-Nnmcbflu", "10.0.0.0/8" })] + [DataRow(new[] { "-N", "-n", "-m", "-c", "-b", "-f", "-l", "-u", "10.0.0.0/8" })] + [DataRow(new[] { "10.0.0.0" })] + [DataRow(new[] { "-s", "16", "10.0.0.0/8" })] + [DataRow(new[] + { + "-d", "24", "-x", "-S", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", + "192.168.172.3/24", "1.1.1.1" + })] + [DataRow(new[] + { + "-i", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", "192.168.172.3/24", + "1.1.1.1" + })] + [DataRow(new[] + { + "-d", "24", "-w", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", + "192.168.172.3/24", "1.1.1.1" + })] + [DataRow(new[] { ":" })] + [DataRow(new[] { "-C", "10.0.0.0/8", "1.1.1.1" })] + [DataRow(new[] { "-o", "10.0.0.0/8", "1.1.1.1" })] + public void TestProgramMain(string[] args) { - [DataTestMethod] - [DataRow(new[] { "10.0.0.0/8" })] - [DataRow(new[] { "-Nnmcbflu", "10.0.0.0/8" })] - [DataRow(new[] { "-N", "-n", "-m", "-c", "-b", "-f", "-l", "-u", "10.0.0.0/8" })] - [DataRow(new[] { "10.0.0.0" })] - [DataRow(new[] { "-s", "16", "10.0.0.0/8" })] - [DataRow(new[] - { - "-d", "24", "-x", "-S", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", - "192.168.172.3/24", "1.1.1.1" - })] - [DataRow(new[] - { - "-i", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", "192.168.172.3/24", - "1.1.1.1" - })] - [DataRow(new[] - { - "-d", "24", "-w", "192.168.168.0/24", "192.168.169.1/24", "192.168.170.2/24", "192.168.171.3/24", - "192.168.172.3/24", "1.1.1.1" - })] - [DataRow(new[] { ":" })] - [DataRow(new[] { "-C", "10.0.0.0/8", "1.1.1.1" })] - [DataRow(new[] { "-o", "10.0.0.0/8", "1.1.1.1" })] - public void TestProgramMain(string[] args) - { Program.Main(args); } - } } \ No newline at end of file diff --git a/src/TestProject/ContainsUnitTest.cs b/src/TestProject/ContainsUnitTest.cs index 67b1a9d3..6d87376d 100644 --- a/src/TestProject/ContainsUnitTest.cs +++ b/src/TestProject/ContainsUnitTest.cs @@ -2,20 +2,20 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +/// +/// ContainsUnitTest test every Contiains method. +/// +[TestClass] +public class ContainsUnitTest { - /// - /// ContainsUnitTest test every Contiains method. - /// - [TestClass] - public class ContainsUnitTest - { - [DataTestMethod] - [DataRow("192.168.0.1/24", "192.168.0.1/24", true)] - [DataRow("192.168.0.1/16", "192.168.1.1/24", true)] - [DataRow("192.168.0.1/16", "10.10.10.0/24", false)] - [DataRow("192.168.1.1/24", "192.168.0.0/16", false)] - public void TestContainsNetwork(string network1, string networkOrAddress, bool expected) + [DataTestMethod] + [DataRow("192.168.0.1/24", "192.168.0.1/24", true)] + [DataRow("192.168.0.1/16", "192.168.1.1/24", true)] + [DataRow("192.168.0.1/16", "10.10.10.0/24", false)] + [DataRow("192.168.1.1/24", "192.168.0.0/16", false)] + public void TestContainsNetwork(string network1, string networkOrAddress, bool expected) { var ipnetwork = IPNetwork2.Parse(network1); @@ -25,10 +25,10 @@ public void TestContainsNetwork(string network1, string networkOrAddress, bool e Assert.AreEqual(expected, result, "contains"); } - [DataTestMethod] - [DataRow("192.168.0.1/24", "192.168.0.100", true)] - [DataRow("192.168.0.1/24", "10.10.10.10", false)] - public void TestContainsAdrress(string network1, string networkOrAddress, bool expected) + [DataTestMethod] + [DataRow("192.168.0.1/24", "192.168.0.100", true)] + [DataRow("192.168.0.1/24", "10.10.10.10", false)] + public void TestContainsAdrress(string network1, string networkOrAddress, bool expected) { var ipnetwork = IPNetwork2.Parse(network1); bool result; @@ -38,9 +38,9 @@ public void TestContainsAdrress(string network1, string networkOrAddress, bool e Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestContainsStatic3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestContainsStatic3() { IPNetwork2 ipnetwork = null; IPNetwork2 ipnetwork2 = null; @@ -50,8 +50,8 @@ public void TestContainsStatic3() #pragma warning restore 0618 } - [TestMethod] - public void TestContainsStatic4() + [TestMethod] + public void TestContainsStatic4() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; IPNetwork2 ipnetwork2 = IPNetwork2.IANA_CBLK_RESERVED1; @@ -63,9 +63,9 @@ public void TestContainsStatic4() Assert.IsTrue(result, "result"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestContains8() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestContains8() { var ipnetwork = IPNetwork2.Parse("0.0.0.0/0"); IPNetwork2 ipnetwork2 = null; @@ -73,9 +73,9 @@ public void TestContains8() bool result = ipnetwork.Contains(ipnetwork2); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestContainsStatic1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestContainsStatic1() { IPNetwork2 ipnetwork = null; IPAddress ipaddress = null; @@ -85,8 +85,8 @@ public void TestContainsStatic1() #pragma warning restore 0618 } - [TestMethod] - public void TestContainsStatic2() + [TestMethod] + public void TestContainsStatic2() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; var ipaddress = IPAddress.Parse("10.0.0.1"); @@ -97,9 +97,9 @@ public void TestContainsStatic2() Assert.IsTrue(result, "result"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestContains10() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestContains10() { var ipnetwork = IPNetwork2.Parse("0.0.0.0/0"); IPAddress ipaddress = null; @@ -107,16 +107,16 @@ public void TestContains10() bool result = ipnetwork.Contains(ipaddress); } - [DataTestMethod] - [DataRow("1.1.1.0/8", "1.1.1.1", true)] - [DataRow("1.1.1.0/8", "2.1.1.1", false)] - [DataRow("192.168.0.1/24", "192.168.0.100", true)] - [DataRow("192.168.0.1/24", "10.10.10.10", false)] - [DataRow("192.168.0.1/24", "192.168.0.1", true)] - [DataRow("192.168.0.1/16", "192.168.1.1", true)] - [DataRow("192.168.0.1/16", "10.10.10.0", false)] - [DataRow("192.168.1.1/24", "192.168.0.0", false)] - public void Test_Contains2_IPAddress_Should_Match_Contains(string contains1, string contains2, bool expected) + [DataTestMethod] + [DataRow("1.1.1.0/8", "1.1.1.1", true)] + [DataRow("1.1.1.0/8", "2.1.1.1", false)] + [DataRow("192.168.0.1/24", "192.168.0.100", true)] + [DataRow("192.168.0.1/24", "10.10.10.10", false)] + [DataRow("192.168.0.1/24", "192.168.0.1", true)] + [DataRow("192.168.0.1/16", "192.168.1.1", true)] + [DataRow("192.168.0.1/16", "10.10.10.0", false)] + [DataRow("192.168.1.1/24", "192.168.0.0", false)] + public void Test_Contains2_IPAddress_Should_Match_Contains(string contains1, string contains2, bool expected) { var ipnetwork = IPNetwork2.Parse(contains1); var ipaddress = IPAddress.Parse(contains2); @@ -126,17 +126,17 @@ public void Test_Contains2_IPAddress_Should_Match_Contains(string contains1, str Assert.AreEqual(expected, result1, "contains1"); } - [DataTestMethod] - [DataRow("0.0.0.0/0", "255.255.255.255", true)] - [DataRow("1.1.1.0/8", "1.1.1.1", true)] - [DataRow("1.1.1.0/8", "2.1.1.1", false)] - [DataRow("192.168.0.1/24", "192.168.0.100/32", true)] - [DataRow("192.168.0.1/24", "10.10.10.10/32", false)] - [DataRow("192.168.0.1/24", "192.168.0.1/24", true)] - [DataRow("192.168.0.1/16", "192.168.1.1/24", true)] - [DataRow("192.168.0.1/16", "10.10.10.0/24", false)] - [DataRow("192.168.1.1/24", "192.168.0.0/16", false)] - public void Test_Contains2_IPNetwork_Should_Match_Contains(string contains1, string contains2, bool expected) + [DataTestMethod] + [DataRow("0.0.0.0/0", "255.255.255.255", true)] + [DataRow("1.1.1.0/8", "1.1.1.1", true)] + [DataRow("1.1.1.0/8", "2.1.1.1", false)] + [DataRow("192.168.0.1/24", "192.168.0.100/32", true)] + [DataRow("192.168.0.1/24", "10.10.10.10/32", false)] + [DataRow("192.168.0.1/24", "192.168.0.1/24", true)] + [DataRow("192.168.0.1/16", "192.168.1.1/24", true)] + [DataRow("192.168.0.1/16", "10.10.10.0/24", false)] + [DataRow("192.168.1.1/24", "192.168.0.0/16", false)] + public void Test_Contains2_IPNetwork_Should_Match_Contains(string contains1, string contains2, bool expected) { var ipnetwork = IPNetwork2.Parse(contains1); var ipaddress = IPNetwork2.Parse(contains2); @@ -145,5 +145,4 @@ public void Test_Contains2_IPNetwork_Should_Match_Contains(string contains1, str Assert.AreEqual(expected, result1, "contains1"); } - } } \ No newline at end of file diff --git a/src/TestProject/DataContractSerializeHelper.cs b/src/TestProject/DataContractSerializeHelper.cs index 28ba69a0..96ed67c2 100644 --- a/src/TestProject/DataContractSerializeHelper.cs +++ b/src/TestProject/DataContractSerializeHelper.cs @@ -2,12 +2,12 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +public static class DataContractSerializeHelper { - public static class DataContractSerializeHelper - { - public static string Serialize(T obj, bool formatting = true) - where T : new() + public static string Serialize(T obj, bool formatting = true) + where T : new() { if (obj == null) { @@ -32,8 +32,8 @@ public static string Serialize(T obj, bool formatting = true) } } - public static T Deserialize(string xml) - where T : new() + public static T Deserialize(string xml) + where T : new() { if (string.IsNullOrWhiteSpace(xml)) { @@ -48,5 +48,4 @@ public static T Deserialize(string xml) return result; } } - } } \ No newline at end of file diff --git a/src/TestProject/EqualsUnitTest.cs b/src/TestProject/EqualsUnitTest.cs index d9dcc2b9..24d740a7 100644 --- a/src/TestProject/EqualsUnitTest.cs +++ b/src/TestProject/EqualsUnitTest.cs @@ -2,15 +2,15 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class EqualsUnitTest { - [TestClass] - public class EqualsUnitTest - { - #region Equals IPv6 vs IPv4 + #region Equals IPv6 vs IPv4 - [TestMethod] - public void TestEquals_ipv6_ipv4_0() + [TestMethod] + public void TestEquals_ipv6_ipv4_0() { var network1 = IPNetwork2.Parse("::/32"); var network2 = IPNetwork2.Parse("0.0.0.0/32"); @@ -20,12 +20,12 @@ public void TestEquals_ipv6_ipv4_0() Assert.AreEqual(expected, result, "equals"); } - #endregion + #endregion - #region Equals IPv4 + #region Equals IPv4 - [TestMethod] - public void TestEquals_ipv4_1() + [TestMethod] + public void TestEquals_ipv4_1() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); @@ -35,8 +35,8 @@ public void TestEquals_ipv4_1() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv4_2() + [TestMethod] + public void TestEquals_ipv4_2() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); IPNetwork2 network2 = null; @@ -46,8 +46,8 @@ public void TestEquals_ipv4_2() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv4_3() + [TestMethod] + public void TestEquals_ipv4_3() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); object network2 = string.Empty; @@ -57,8 +57,8 @@ public void TestEquals_ipv4_3() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv4_4() + [TestMethod] + public void TestEquals_ipv4_4() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/25"); @@ -68,8 +68,8 @@ public void TestEquals_ipv4_4() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv4_5() + [TestMethod] + public void TestEquals_ipv4_5() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -79,12 +79,12 @@ public void TestEquals_ipv4_5() Assert.AreEqual(expected, result, "equals"); } - #endregion + #endregion - #region Equals IPv6 + #region Equals IPv6 - [TestMethod] - public void TestEquals_ipv6_1() + [TestMethod] + public void TestEquals_ipv6_1() { var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::1/128"); @@ -94,8 +94,8 @@ public void TestEquals_ipv6_1() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv6_2() + [TestMethod] + public void TestEquals_ipv6_2() { var network1 = IPNetwork2.Parse("::1/128"); IPNetwork2 network2 = null; @@ -105,8 +105,8 @@ public void TestEquals_ipv6_2() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv6_3() + [TestMethod] + public void TestEquals_ipv6_3() { var network1 = IPNetwork2.Parse("::1/128"); object network2 = string.Empty; @@ -116,8 +116,8 @@ public void TestEquals_ipv6_3() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv6_4() + [TestMethod] + public void TestEquals_ipv6_4() { var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::1/127"); @@ -127,8 +127,8 @@ public void TestEquals_ipv6_4() Assert.AreEqual(expected, result, "equals"); } - [TestMethod] - public void TestEquals_ipv6_5() + [TestMethod] + public void TestEquals_ipv6_5() { var network1 = IPNetwork2.Parse("::1/128"); var network2 = IPNetwork2.Parse("::10/128"); @@ -138,6 +138,5 @@ public void TestEquals_ipv6_5() Assert.AreEqual(expected, result, "equals"); } - #endregion - } + #endregion } \ No newline at end of file diff --git a/src/TestProject/GetHashCodeUnitTest.cs b/src/TestProject/GetHashCodeUnitTest.cs index 23f6dd5f..69563ef1 100644 --- a/src/TestProject/GetHashCodeUnitTest.cs +++ b/src/TestProject/GetHashCodeUnitTest.cs @@ -3,13 +3,13 @@ // -namespace TestProject +namespace TestProject; + +[TestClass] +public class GetHashCodeUnitTest { - [TestClass] - public class GetHashCodeUnitTest - { - [TestMethod] - public void TestGetHashCode_SameNetwork_DifferentIpAddress1() + [TestMethod] + public void TestGetHashCode_SameNetwork_DifferentIpAddress1() { var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); var ipnetwork2 = IPNetwork2.Parse("1.1.1.1/0"); @@ -18,8 +18,8 @@ public void TestGetHashCode_SameNetwork_DifferentIpAddress1() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - [TestMethod] - public void TestGetHashCode_SameNetwork_DifferentIpAddress2() + [TestMethod] + public void TestGetHashCode_SameNetwork_DifferentIpAddress2() { var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); @@ -28,8 +28,8 @@ public void TestGetHashCode_SameNetwork_DifferentIpAddress2() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - [TestMethod] - public void TestGetHashCode_Refactor__to_not_reference_mutable_fields() + [TestMethod] + public void TestGetHashCode_Refactor__to_not_reference_mutable_fields() { var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); int hashCode1 = ipnetwork.GetHashCode(); @@ -39,8 +39,8 @@ public void TestGetHashCode_Refactor__to_not_reference_mutable_fields() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - [TestMethod] - public void TestGetHashCode_Dictionary_failed() + [TestMethod] + public void TestGetHashCode_Dictionary_failed() { var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); @@ -64,10 +64,10 @@ public void TestGetHashCode_Dictionary_failed() Assert.AreEqual(false, contains6, "contains6"); } - #region Equals IPv6 vs IPv4 + #region Equals IPv6 vs IPv4 - [TestMethod] - public void TestGetHashCode_ipv6_ipv4_0() + [TestMethod] + public void TestGetHashCode_ipv6_ipv4_0() { var network1 = IPNetwork2.Parse("::/32"); var network2 = IPNetwork2.Parse("0.0.0.0/32"); @@ -78,12 +78,12 @@ public void TestGetHashCode_ipv6_ipv4_0() Assert.AreNotEqual(hashCode1, hashCode2, "hashcode"); } - #endregion + #endregion - #region GetHashCode + #region GetHashCode - [TestMethod] - public void TestGetHashCode1() + [TestMethod] + public void TestGetHashCode1() { var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); var ipnetwork2 = IPNetwork2.Parse("0.0.1.1/0"); @@ -92,8 +92,8 @@ public void TestGetHashCode1() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - [TestMethod] - public void TestGetHashCode2() + [TestMethod] + public void TestGetHashCode2() { var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/1"); @@ -102,8 +102,8 @@ public void TestGetHashCode2() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - [TestMethod] - public void TestGetHashCode3() + [TestMethod] + public void TestGetHashCode3() { var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/32"); var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/32"); @@ -112,6 +112,5 @@ public void TestGetHashCode3() Assert.AreEqual(hashCode1, hashCode2, "hashcode"); } - #endregion - } + #endregion } \ No newline at end of file diff --git a/src/TestProject/GlobalUsings.cs b/src/TestProject/GlobalUsings.cs index 8b48a6d7..e04593d2 100644 --- a/src/TestProject/GlobalUsings.cs +++ b/src/TestProject/GlobalUsings.cs @@ -8,7 +8,6 @@ global using System.Collections.Generic; global using System.IO; global using System.Net; -global using System.Net.ConsoleApplication; global using System.Net.Sockets; global using System.Numerics; global using System.Runtime.Serialization; diff --git a/src/TestProject/HashSetUnitTest.cs b/src/TestProject/HashSetUnitTest.cs index 35bb0d1e..0b2f8652 100644 --- a/src/TestProject/HashSetUnitTest.cs +++ b/src/TestProject/HashSetUnitTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class HashSetUnitTest { - [TestClass] - public class HashSetUnitTest - { - [TestMethod] - public void TestGetHashCode_HashSet_Add1() + [TestMethod] + public void TestGetHashCode_HashSet_Add1() { var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); var ipnetwork2 = IPNetwork2.Parse("1.1.1.1/0"); @@ -21,8 +21,8 @@ public void TestGetHashCode_HashSet_Add1() Assert.IsFalse(add2, "add2"); } - [TestMethod] - public void TestGetHashCode_HashSet_Add2() + [TestMethod] + public void TestGetHashCode_HashSet_Add2() { var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); @@ -34,5 +34,4 @@ public void TestGetHashCode_HashSet_Add2() Assert.IsTrue(add1, "add1"); Assert.IsFalse(add2, "add2"); } - } } \ No newline at end of file diff --git a/src/TestProject/HashSetUnitTestEqualsIPv6VsIPv4.cs b/src/TestProject/HashSetUnitTestEqualsIPv6VsIPv4.cs index c5ddaf16..0ac5bbe3 100644 --- a/src/TestProject/HashSetUnitTestEqualsIPv6VsIPv4.cs +++ b/src/TestProject/HashSetUnitTestEqualsIPv6VsIPv4.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class HashSetUnitTestEqualsIPv6VsIPv4 { - [TestClass] - public class HashSetUnitTestEqualsIPv6VsIPv4 - { - [TestMethod] - public void TestHashSet_Add_ipv6_ipv4_0() + [TestMethod] + public void TestHashSet_Add_ipv6_ipv4_0() { var ipnetwork1 = IPNetwork2.Parse("::/32"); var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/32"); @@ -20,5 +20,4 @@ public void TestHashSet_Add_ipv6_ipv4_0() Assert.IsTrue(add1, "add1"); Assert.IsTrue(add2, "add2"); } - } } \ No newline at end of file diff --git a/src/TestProject/HashSetUnitTestHashCodeAdd3.cs b/src/TestProject/HashSetUnitTestHashCodeAdd3.cs index ff203dc3..82743db0 100644 --- a/src/TestProject/HashSetUnitTestHashCodeAdd3.cs +++ b/src/TestProject/HashSetUnitTestHashCodeAdd3.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class HashSetUnitTestHashCodeAdd3 { - [TestClass] - public class HashSetUnitTestHashCodeAdd3 - { - [TestMethod] - public void TestGetHashCode_HashSet_Add3() + [TestMethod] + public void TestGetHashCode_HashSet_Add3() { var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/32"); var ipnetwork2 = IPNetwork2.Parse("0.0.0.1/32"); @@ -20,5 +20,4 @@ public void TestGetHashCode_HashSet_Add3() Assert.IsTrue(add1, "add1"); Assert.IsTrue(add2, "add2"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPAddressCollectionUnitTest.cs b/src/TestProject/IPAddressCollectionUnitTest.cs index 81c87901..a8a788e8 100644 --- a/src/TestProject/IPAddressCollectionUnitTest.cs +++ b/src/TestProject/IPAddressCollectionUnitTest.cs @@ -3,16 +3,16 @@ // -namespace TestProject +namespace TestProject; + +/// +/// IPNetworkUnitTest test every single method. +/// +[TestClass] +public class IPAddressCollectionUnitTest { - /// - /// IPNetworkUnitTest test every single method. - /// - [TestClass] - public class IPAddressCollectionUnitTest - { - [TestMethod] - public void Test_Usable_AtIndexIPAddress() + [TestMethod] + public void Test_Usable_AtIndexIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.Usable)) @@ -26,8 +26,8 @@ public void Test_Usable_AtIndexIPAddress() } } - [TestMethod] - public void Test_Usable_IteratorIPAddress() + [TestMethod] + public void Test_Usable_IteratorIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.Usable)) @@ -41,8 +41,8 @@ public void Test_Usable_IteratorIPAddress() } } - [TestMethod] - public void Test_Usable_AtIndexIPAddress_31() + [TestMethod] + public void Test_Usable_AtIndexIPAddress_31() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); using (IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.Usable)) @@ -51,8 +51,8 @@ public void Test_Usable_AtIndexIPAddress_31() } } - [TestMethod] - public void Test_Usable_AtIndexIPAddress_32() + [TestMethod] + public void Test_Usable_AtIndexIPAddress_32() { var ipn = IPNetwork2.Parse("192.168.1.0/32"); using (IPAddressCollection ips = ipn.ListIPAddress(FilterEnum.Usable)) @@ -61,8 +61,8 @@ public void Test_Usable_AtIndexIPAddress_32() } } - [TestMethod] - public void Test_All_AtIndexIPAddress() + [TestMethod] + public void Test_All_AtIndexIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -78,10 +78,10 @@ public void Test_All_AtIndexIPAddress() } } - #region ListIPAddress + #region ListIPAddress - [TestMethod] - public void TestAtIndexIPAddress() + [TestMethod] + public void TestAtIndexIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -97,8 +97,8 @@ public void TestAtIndexIPAddress() } } - [TestMethod] - public void TestAtIndexIPAddress2() + [TestMethod] + public void TestAtIndexIPAddress2() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); #pragma warning disable CS0618 // Type or member is obsolete @@ -116,8 +116,8 @@ public void TestAtIndexIPAddress2() } } - [TestMethod] - public void TestIterateIPAddress() + [TestMethod] + public void TestIterateIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); IPAddress last = null; @@ -144,9 +144,9 @@ public void TestIterateIPAddress() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestOutOfRangeIPAddress() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestOutOfRangeIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -155,8 +155,8 @@ public void TestOutOfRangeIPAddress() } } - [TestMethod] - public void TestCountIPAddress() + [TestMethod] + public void TestCountIPAddress() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -165,8 +165,8 @@ public void TestCountIPAddress() } } - [TestMethod] - public void TestReset() + [TestMethod] + public void TestReset() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -175,8 +175,8 @@ public void TestReset() } } - [TestMethod] - public void TestResetEnumerator() + [TestMethod] + public void TestResetEnumerator() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -195,9 +195,9 @@ public void TestResetEnumerator() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestEnumeratorFailed() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestEnumeratorFailed() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -212,8 +212,8 @@ public void TestEnumeratorFailed() } } - [TestMethod] - public void TestEnumeratorMoveNext() + [TestMethod] + public void TestEnumeratorMoveNext() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -231,8 +231,8 @@ public void TestEnumeratorMoveNext() } } - [TestMethod] - public void TestEnumeratorMoveNext2() + [TestMethod] + public void TestEnumeratorMoveNext2() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -247,16 +247,16 @@ public void TestEnumeratorMoveNext2() } } - [TestMethod] - public void TestEnumerableCurrent() + [TestMethod] + public void TestEnumerableCurrent() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); IEnumerable ips = ipn.ListIPAddress(); Assert.IsNotNull(ips.GetEnumerator()); } - [TestMethod] - public void TestEnumeratorCurrent() + [TestMethod] + public void TestEnumeratorCurrent() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); IEnumerator ips = ipn.ListIPAddress(); @@ -267,9 +267,9 @@ public void TestEnumeratorCurrent() Assert.IsFalse(ips.MoveNext()); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestEnumeratorCurrentOor() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestEnumeratorCurrentOor() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); IEnumerator ips = ipn.ListIPAddress(); @@ -281,8 +281,8 @@ public void TestEnumeratorCurrentOor() Console.WriteLine("This is out of range : {0} ", ips.Current); } - [TestMethod] - public void TestEnumeratorIterate() + [TestMethod] + public void TestEnumeratorIterate() { var ipn = IPNetwork2.Parse("192.168.1.0/31"); IEnumerator ips = ipn.ListIPAddress(); @@ -292,12 +292,12 @@ public void TestEnumeratorIterate() } } - #endregion + #endregion - #region IPv6 + #region IPv6 - [TestMethod] - public void Test_ipv6_AtIndexIPAddress() + [TestMethod] + public void Test_ipv6_AtIndexIPAddress() { var ipn = IPNetwork2.Parse("::/125"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -313,8 +313,8 @@ public void Test_ipv6_AtIndexIPAddress() } } - [TestMethod] - public void Test_ipv6_IterateIPAddress() + [TestMethod] + public void Test_ipv6_IterateIPAddress() { var ipn = IPNetwork2.Parse("::/125"); IPAddress last = null; @@ -341,9 +341,9 @@ public void Test_ipv6_IterateIPAddress() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void Test_ipv6_OutOfRangeIPAddress() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void Test_ipv6_OutOfRangeIPAddress() { var ipn = IPNetwork2.Parse("::/125"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -352,8 +352,8 @@ public void Test_ipv6_OutOfRangeIPAddress() } } - [TestMethod] - public void Test_ipv6_CountIPAddress() + [TestMethod] + public void Test_ipv6_CountIPAddress() { var ipn = IPNetwork2.Parse("::/125"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -362,8 +362,8 @@ public void Test_ipv6_CountIPAddress() } } - [TestMethod] - public void Test_ipv6_CountIPAddress2() + [TestMethod] + public void Test_ipv6_CountIPAddress2() { var ipn = IPNetwork2.Parse("::/0"); var max = BigInteger.Pow(2, 128); @@ -373,8 +373,8 @@ public void Test_ipv6_CountIPAddress2() } } - [TestMethod] - public void Test_ipv6_Reset() + [TestMethod] + public void Test_ipv6_Reset() { var ipn = IPNetwork2.Parse("::/125"); using (IPAddressCollection ips = ipn.ListIPAddress()) @@ -383,8 +383,8 @@ public void Test_ipv6_Reset() } } - [TestMethod] - public void Tes_ipv6_tResetEnumerator() + [TestMethod] + public void Tes_ipv6_tResetEnumerator() { var ipn = IPNetwork2.Parse("::/125"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -403,9 +403,9 @@ public void Tes_ipv6_tResetEnumerator() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void Test_ipv6_EnumeratorFailed() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void Test_ipv6_EnumeratorFailed() { var ipn = IPNetwork2.Parse("::/125"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -420,8 +420,8 @@ public void Test_ipv6_EnumeratorFailed() } } - [TestMethod] - public void Test_ipv6_EnumeratorMoveNext() + [TestMethod] + public void Test_ipv6_EnumeratorMoveNext() { var ipn = IPNetwork2.Parse("::/125"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -439,8 +439,8 @@ public void Test_ipv6_EnumeratorMoveNext() } } - [TestMethod] - public void Test_ipv6_EnumeratorMoveNext2() + [TestMethod] + public void Test_ipv6_EnumeratorMoveNext2() { var ipn = IPNetwork2.Parse("::/127"); using (IEnumerator ips = ipn.ListIPAddress()) @@ -455,8 +455,8 @@ public void Test_ipv6_EnumeratorMoveNext2() } } - [TestMethod] - public void Test_ipv6_EnumeratorCurrent() + [TestMethod] + public void Test_ipv6_EnumeratorCurrent() { var ipn = IPNetwork2.Parse("::/127"); IEnumerator ips = ipn.ListIPAddress(); @@ -467,9 +467,9 @@ public void Test_ipv6_EnumeratorCurrent() Assert.IsFalse(ips.MoveNext()); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void Test_ipv6_EnumeratorCurrentOor() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void Test_ipv6_EnumeratorCurrentOor() { var ipn = IPNetwork2.Parse("::/127"); IEnumerator ips = ipn.ListIPAddress(); @@ -481,8 +481,8 @@ public void Test_ipv6_EnumeratorCurrentOor() Console.WriteLine("This is out of range : {0} ", ips.Current); } - [TestMethod] - public void Test_ipv6_EnumeratorIterate() + [TestMethod] + public void Test_ipv6_EnumeratorIterate() { var ipn = IPNetwork2.Parse("::/127"); IEnumerator ips = ipn.ListIPAddress(); @@ -492,13 +492,12 @@ public void Test_ipv6_EnumeratorIterate() } } - [TestMethod] - public void Test_ipv6_DefaultNetmask() + [TestMethod] + public void Test_ipv6_DefaultNetmask() { var ipnetwork = IPNetwork2.Parse("::1"); Assert.AreEqual(64, ipnetwork.Cidr, "Cidr"); } - #endregion - } + #endregion } \ No newline at end of file diff --git a/src/TestProject/IPAddressExtensionTests.cs b/src/TestProject/IPAddressExtensionTests.cs index 1d4a72de..671e1ad2 100644 --- a/src/TestProject/IPAddressExtensionTests.cs +++ b/src/TestProject/IPAddressExtensionTests.cs @@ -2,19 +2,19 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +/// +/// A collection of unit tests exercising the IPAddressExtensions class. +/// +[TestClass] +public class IPAddressExtensionTests { /// - /// A collection of unit tests exercising the IPAddressExtensions class. + /// Test converting a variety of IPv4 addreses into single-address networks. /// - [TestClass] - public class IPAddressExtensionTests - { - /// - /// Test converting a variety of IPv4 addreses into single-address networks. - /// - [TestMethod] - public void IPAddressToIPNetwork_SingleAddress_IPv4() + [TestMethod] + public void IPAddressToIPNetwork_SingleAddress_IPv4() { IPAddressToIPNetwork_SingleAddress_Internal( 4, @@ -41,11 +41,11 @@ public void IPAddressToIPNetwork_SingleAddress_IPv4() "255.255.255.255"); } - /// - /// Test converting a variety of IPv6 addreses into single-address networks. - /// - [TestMethod] - public void IPAddressToIPNetwork_SingleAddress_IPv6() + /// + /// Test converting a variety of IPv6 addreses into single-address networks. + /// + [TestMethod] + public void IPAddressToIPNetwork_SingleAddress_IPv6() { IPAddressToIPNetwork_SingleAddress_Internal( 16, @@ -58,14 +58,14 @@ public void IPAddressToIPNetwork_SingleAddress_IPv6() "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } - /// - /// Shared test case, called upon by the above two test cases. - /// - /// Number of bytes in the type of address being tester. - /// A collection of interesting IP addresses to include in the test. - private static void IPAddressToIPNetwork_SingleAddress_Internal( - int byteCount, - params string[] interestingAddrs) + /// + /// Shared test case, called upon by the above two test cases. + /// + /// Number of bytes in the type of address being tester. + /// A collection of interesting IP addresses to include in the test. + 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(); @@ -84,16 +84,16 @@ private static void IPAddressToIPNetwork_SingleAddress_Internal( } } - /// - /// Generate random but deterministic IPs. - /// - /// 4 for IPv4. 16 for IPv6. - /// Collection of random IP addresses. - private static IEnumerable RandomIPs(int byteCount) + /// + /// Generate random but deterministic IPs. + /// + /// 4 for IPv4. 16 for IPv6. + /// Collection of random IP addresses. + private static IEnumerable RandomIPs(int byteCount) { - /* Start from a fixed starting byte array. - ing a GUID's bytes so the sequence will be unique, with the first - te XOR'd with the byte count so the two sequences will be different. */ + /* 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; @@ -111,13 +111,13 @@ te XOR'd with the byte count so the two sequences will be different. */ } } - /// - /// Test if a single address network is valid. - /// - /// Expected addresss. - /// Actual network. - /// Expected CIDRsize. (32 or 128.) - private static void TestForSingleAddressNetwork(IPAddress ipAddr, IPNetwork2 net, int expectedSize) + /// + /// Test if a single address network is valid. + /// + /// Expected addresss. + /// Actual network. + /// 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); @@ -125,5 +125,4 @@ private static void TestForSingleAddressNetwork(IPAddress ipAddr, IPNetwork2 net 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 81bd9e95..379c64ed 100644 --- a/src/TestProject/IPNetworkCollectionCtorTests.cs +++ b/src/TestProject/IPNetworkCollectionCtorTests.cs @@ -2,23 +2,22 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkCollectionCtorTests { - [TestClass] - public class IPNetworkCollectionCtorTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestCtor1() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestCtor1() { var ipn = new IPNetworkCollection(IPNetwork2.IANA_ABLK_RESERVED1, 33); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestCtor2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestCtor2() { var ipn = new IPNetworkCollection(IPNetwork2.IANA_ABLK_RESERVED1, 2); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkCollectionCurrentTests.cs b/src/TestProject/IPNetworkCollectionCurrentTests.cs index c4c7d767..bef039bd 100644 --- a/src/TestProject/IPNetworkCollectionCurrentTests.cs +++ b/src/TestProject/IPNetworkCollectionCurrentTests.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkCollectionCurrentTests { - [TestClass] - public class IPNetworkCollectionCurrentTests - { - [TestMethod] - public void TestCurrent() + [TestMethod] + public void TestCurrent() { var ipn = IPNetwork2.Parse("192.168.0.0/32"); using (IPNetworkCollection ipns = ipn.Subnet(32)) @@ -20,5 +20,4 @@ public void TestCurrent() Assert.AreEqual("192.168.0.0/32", ipn0.ToString(), "ipn0"); } } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkCollectionEnumeratorTests.cs b/src/TestProject/IPNetworkCollectionEnumeratorTests.cs index 94c60be7..26956b60 100644 --- a/src/TestProject/IPNetworkCollectionEnumeratorTests.cs +++ b/src/TestProject/IPNetworkCollectionEnumeratorTests.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkCollectionEnumeratorTests { - [TestClass] - public class IPNetworkCollectionEnumeratorTests - { - [TestMethod] - public void TestEnumerator() + [TestMethod] + public void TestEnumerator() { var ipn = IPNetwork2.Parse("192.168.0.0/32"); using (IPNetworkCollection ipns = ipn.Subnet(32)) @@ -20,5 +20,4 @@ public void TestEnumerator() Assert.AreEqual("192.168.0.0/32", ipn0.ToString(), "ipn0"); } } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkCollectionMoveNextTests.cs b/src/TestProject/IPNetworkCollectionMoveNextTests.cs index f20c1c5b..0ed960bf 100644 --- a/src/TestProject/IPNetworkCollectionMoveNextTests.cs +++ b/src/TestProject/IPNetworkCollectionMoveNextTests.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkCollectionMoveNextTests { - [TestClass] - public class IPNetworkCollectionMoveNextTests - { - [TestMethod] - public void MoveNext1() + [TestMethod] + public void MoveNext1() { var ipn = IPNetwork2.Parse("192.168.1.0/30"); using (IPNetworkCollection ipns = ipn.Subnet(32)) @@ -18,8 +18,8 @@ public void MoveNext1() } } - [TestMethod] - public void MoveNext2() + [TestMethod] + public void MoveNext2() { var ipn = IPNetwork2.Parse("192.168.1.0/30"); using (IPNetworkCollection ipns = ipn.Subnet(32)) @@ -33,5 +33,4 @@ public void MoveNext2() Assert.AreEqual(false, next, "next"); } } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkCollectionResetTests.cs b/src/TestProject/IPNetworkCollectionResetTests.cs index 4bd97cce..e9f0694f 100644 --- a/src/TestProject/IPNetworkCollectionResetTests.cs +++ b/src/TestProject/IPNetworkCollectionResetTests.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkCollectionResetTests { - [TestClass] - public class IPNetworkCollectionResetTests - { - [TestMethod] - public void TestReset1() + [TestMethod] + public void TestReset1() { var ipn = IPNetwork2.Parse("192.168.1.0/29"); using (IPNetworkCollection ipns = ipn.Subnet(32)) @@ -21,5 +21,4 @@ public void TestReset1() Assert.AreEqual(ipn0, ipn1, "reset"); } } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkBitsSetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkBitsSetTests.cs index 31470e47..314f1524 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkBitsSetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkBitsSetTests.cs @@ -2,19 +2,19 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +/// +/// Tests for bit set functionality in IPNetwork2. +/// +[TestClass] +public class IPNetworkBitsSetTests { /// - /// Tests for bit set functionality in IPNetwork2. + /// Tests that BitsSet returns 32 for a 255.255.255.255 address. /// - [TestClass] - public class IPNetworkBitsSetTests - { - /// - /// Tests that BitsSet returns 32 for a 255.255.255.255 address. - /// - [TestMethod] - public void TestBitsSet32() + [TestMethod] + public void TestBitsSet32() { var ip = IPAddress.Parse("255.255.255.255"); uint bits = 32; @@ -23,11 +23,11 @@ public void TestBitsSet32() Assert.AreEqual(bits, result, "BitsSet"); } - /// - /// Tests that BitsSet returns 24 for a 255.255.255.0 address. - /// - [TestMethod] - public void TestBitsSet24() + /// + /// Tests that BitsSet returns 24 for a 255.255.255.0 address. + /// + [TestMethod] + public void TestBitsSet24() { var ip = IPAddress.Parse("255.255.255.0"); uint bits = 24; @@ -36,11 +36,11 @@ public void TestBitsSet24() Assert.AreEqual(bits, result, "BitsSet"); } - /// - /// Tests that BitsSet returns 16 for a 255.255.0.0 address. - /// - [TestMethod] - public void TestBitsSet16() + /// + /// Tests that BitsSet returns 16 for a 255.255.0.0 address. + /// + [TestMethod] + public void TestBitsSet16() { var ip = IPAddress.Parse("255.255.0.0"); uint bits = 16; @@ -49,11 +49,11 @@ public void TestBitsSet16() Assert.AreEqual(bits, result, "BitsSet"); } - /// - /// Tests that BitsSet returns 4 for a 128.128.128.128 address. - /// - [TestMethod] - public void TestBitsSet4() + /// + /// Tests that BitsSet returns 4 for a 128.128.128.128 address. + /// + [TestMethod] + public void TestBitsSet4() { var ip = IPAddress.Parse("128.128.128.128"); uint bits = 4; @@ -61,5 +61,4 @@ public void TestBitsSet4() Assert.AreEqual(bits, result, "BitsSet"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs b/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs index 4dfaa9db..19e3abf6 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkCompareTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkCompareTests { - [TestClass] - public class IPNetworkCompareTests - { - /// - /// Tests Compare functionality with Compare To1. - /// - [TestMethod] - public void TestCompareTo1() + /// + /// Tests Compare functionality with Compare To1. + /// + [TestMethod] + public void TestCompareTo1() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); var ipn2 = IPNetwork2.Parse("10.0.0.2/16"); @@ -21,11 +21,11 @@ public void TestCompareTo1() Assert.AreEqual(0, comparison, "compare"); } - /// - /// Tests Compare functionality with Compare To2. - /// - [TestMethod] - public void TestCompareTo2() + /// + /// Tests Compare functionality with Compare To2. + /// + [TestMethod] + public void TestCompareTo2() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); object ipn2 = IPNetwork2.Parse("10.0.0.2/16"); @@ -35,11 +35,11 @@ public void TestCompareTo2() Assert.AreEqual(0, comparison, "compare"); } - /// - /// Tests Compare functionality with Compare To3. - /// - [TestMethod] - public void TestCompareTo3() + /// + /// Tests Compare functionality with Compare To3. + /// + [TestMethod] + public void TestCompareTo3() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); object ipn2 = null; @@ -49,11 +49,11 @@ public void TestCompareTo3() Assert.AreEqual(1, comparison, "compare"); } - /// - /// Tests Compare functionality with Compare To4. - /// - [TestMethod] - public void TestCompareTo4() + /// + /// Tests Compare functionality with Compare To4. + /// + [TestMethod] + public void TestCompareTo4() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); IPNetwork2 ipn2 = null; @@ -63,9 +63,9 @@ public void TestCompareTo4() Assert.AreEqual(1, comparison, "compare"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestCompareTo5() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestCompareTo5() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); string ipn2 = string.Empty; @@ -73,11 +73,11 @@ public void TestCompareTo5() int comparison = ipn1.CompareTo(ipn2); } - /// - /// Tests Compare functionality with Compare To6. - /// - [TestMethod] - public void TestCompareTo6() + /// + /// Tests Compare functionality with Compare To6. + /// + [TestMethod] + public void TestCompareTo6() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); int comparison = ipn1.CompareTo(ipn1); @@ -85,11 +85,11 @@ public void TestCompareTo6() Assert.AreEqual(0, comparison, "compare"); } - /// - /// Tests Compare functionality with Compare1. - /// - [TestMethod] - public void TestCompare1() + /// + /// Tests Compare functionality with Compare1. + /// + [TestMethod] + public void TestCompare1() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); int comparison = IPNetwork2.Compare(null, ipn1); @@ -97,11 +97,11 @@ public void TestCompare1() Assert.AreEqual(-1, comparison, "compare"); } - /// - /// Tests Compare functionality with Compare2. - /// - [TestMethod] - public void TestCompare2() + /// + /// Tests Compare functionality with Compare2. + /// + [TestMethod] + public void TestCompare2() { var ipn1 = IPNetwork2.Parse("10.0.0.1/16"); var ipn2 = IPNetwork2.Parse("20.0.0.1/16"); @@ -109,5 +109,4 @@ public void TestCompare2() Assert.AreEqual(-1, comparison, "compare"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkCountTests.cs b/src/TestProject/IPNetworkTest/IPNetworkCountTests.cs index 9662cee0..ed97b208 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkCountTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkCountTests.cs @@ -2,89 +2,88 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +/// +/// Tests for the Count property in IPNetwork2. +/// +[TestClass] +public class IPNetworkCountTests { /// - /// Tests for the Count property in IPNetwork2. + /// Tests Count functionality with Total32. /// - [TestClass] - public class IPNetworkCountTests - { - /// - /// Tests Count functionality with Total32. - /// - [TestMethod] - public void TestTotal32() + [TestMethod] + public void TestTotal32() { var network = IPNetwork2.Parse("0.0.0.0/32"); int total = 1; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total31. - /// - [TestMethod] - public void TestTotal31() + /// + /// Tests Count functionality with Total31. + /// + [TestMethod] + public void TestTotal31() { var network = IPNetwork2.Parse("0.0.0.0/31"); int total = 2; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total30. - /// - [TestMethod] - public void TestTotal30() + /// + /// Tests Count functionality with Total30. + /// + [TestMethod] + public void TestTotal30() { var network = IPNetwork2.Parse("0.0.0.0/30"); int total = 4; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total24. - /// - [TestMethod] - public void TestTotal24() + /// + /// Tests Count functionality with Total24. + /// + [TestMethod] + public void TestTotal24() { var network = IPNetwork2.Parse("0.0.0.0/24"); int total = 256; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total16. - /// - [TestMethod] - public void TestTotal16() + /// + /// Tests Count functionality with Total16. + /// + [TestMethod] + public void TestTotal16() { var network = IPNetwork2.Parse("0.0.0.0/16"); int total = 65536; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total8. - /// - [TestMethod] - public void TestTotal8() + /// + /// Tests Count functionality with Total8. + /// + [TestMethod] + public void TestTotal8() { var network = IPNetwork2.Parse("0.0.0.0/8"); int total = 16777216; Assert.AreEqual(total, network.Total, "Total"); } - /// - /// Tests Count functionality with Total0. - /// - [TestMethod] - public void TestTotal0() + /// + /// Tests Count functionality with Total0. + /// + [TestMethod] + public void TestTotal0() { var network = IPNetwork2.Parse("0.0.0.0/0"); long total = 4294967296; Assert.AreEqual(total, network.Total, "Total"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkCtorTests.cs b/src/TestProject/IPNetworkTest/IPNetworkCtorTests.cs index c2c63df6..1a576c83 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkCtorTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkCtorTests.cs @@ -2,16 +2,15 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkCtorTests { - [TestClass] - public class IPNetworkCtorTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestCtor1() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestCtor1() { new IPNetwork2(BigInteger.Zero, AddressFamily.InterNetwork, 33); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkCtorWithIpAndCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkCtorWithIpAndCidrTests.cs index 98b11101..6c2284cb 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkCtorWithIpAndCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkCtorWithIpAndCidrTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkCtorWithIpAndCidrTests { - [TestClass] - public class IPNetworkCtorWithIpAndCidrTests - { - /// - /// Tests Ctor With Ip And Cidr functionality with a /1 network. - /// - [TestMethod] - public void CtorWithIpAndCidr1() + /// + /// Tests Ctor With Ip And Cidr functionality with a /1 network. + /// + [TestMethod] + public void CtorWithIpAndCidr1() { string ipaddress = "192.168.168.100"; var ip = IPAddress.Parse(ipaddress); @@ -19,21 +19,20 @@ public void CtorWithIpAndCidr1() Assert.AreEqual("192.168.168.0/24", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void CtorWithIpAndCidr2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void CtorWithIpAndCidr2() { IPAddress ip = null; var ipnetwork = new IPNetwork2(ip, 24); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void CtorWithIpAndCidr3() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void CtorWithIpAndCidr3() { string ipaddress = "192.168.168.100"; var ip = IPAddress.Parse(ipaddress); var ipnetwork = new IPNetwork2(ip, 33); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs b/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs index cb952b78..21cc6870 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkExamplesTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkExamplesTests { - [TestClass] - public class IPNetworkExamplesTests - { - /// - /// Tests Examples functionality with a /1 network. - /// - [TestMethod] - public void Example1() + /// + /// Tests Examples functionality with a /1 network. + /// + [TestMethod] + public void Example1() { var ipnetwork = IPNetwork2.Parse("192.168.168.100/24"); @@ -24,11 +24,11 @@ public void Example1() Console.WriteLine("Cidr : {0}", ipnetwork.Cidr); } - /// - /// Tests Examples functionality with a /2 network. - /// - [TestMethod] - public void Example2() + /// + /// Tests Examples functionality with a /2 network. + /// + [TestMethod] + public void Example2() { var ipnetwork = IPNetwork2.Parse("192.168.0.0/24"); var ipaddress = IPAddress.Parse("192.168.0.100"); @@ -54,11 +54,11 @@ public void Example2() Console.WriteLine("{0} overlap {1} : {2}", ipnetwork, ipnetwork3, overlap2); } - /// - /// Tests Examples functionality. - /// - [TestMethod] - public void Example2B() + /// + /// Tests Examples functionality. + /// + [TestMethod] + public void Example2B() { var ipnetwork1 = IPNetwork2.Parse("10.1.0.0/16"); var ipnetwork2 = IPNetwork2.Parse("192.168.1.0/24"); @@ -79,11 +79,11 @@ public void Example2B() Console.WriteLine("{0} contains {1} : {2}", ipnetwork2, ipaddress4, contains4); } - /// - /// Tests Examples functionality with a /3 network. - /// - [TestMethod] - public void Example3() + /// + /// Tests Examples functionality with a /3 network. + /// + [TestMethod] + public void Example3() { IPNetwork2 ianaABlock = IPNetwork2.IANA_ABLK_RESERVED1; IPNetwork2 ianaBBlock = IPNetwork2.IANA_BBLK_RESERVED1; @@ -94,11 +94,11 @@ public void Example3() Console.WriteLine("IANA_CBLK_RESERVED1 is {0}", ianaCBlock); } - /// - /// Tests Examples functionality with a /4 network. - /// - [TestMethod] - public void Example4() + /// + /// Tests Examples functionality with a /4 network. + /// + [TestMethod] + public void Example4() { var wholeInternet = IPNetwork2.Parse("0.0.0.0/0"); byte newCidr = 2; @@ -115,11 +115,11 @@ public void Example4() } } - /// - /// Tests Examples functionality with a /5 network. - /// - [TestMethod] - public void Example5() + /// + /// Tests Examples functionality with a /5 network. + /// + [TestMethod] + public void Example5() { var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/24"); var ipnetwork2 = IPNetwork2.Parse("192.168.1.0/24"); @@ -128,11 +128,11 @@ public void Example5() Console.WriteLine("{0} + {1} = {2}", ipnetwork1, ipnetwork2, ipnetwork3[0]); } - /// - /// Tests Examples functionality with a /7 network. - /// - [TestMethod] - public void Example7() + /// + /// Tests Examples functionality with a /7 network. + /// + [TestMethod] + public void Example7() { var ipnetwork = IPNetwork2.Parse("192.168.168.100/24"); @@ -146,11 +146,11 @@ public void Example7() Console.WriteLine("{0} contains {1} : {2}", ipnetwork, ipaddress2, contains2); } - /// - /// Tests Examples functionality with a /9 network. - /// - [TestMethod] - public void Example9() + /// + /// Tests Examples functionality with a /9 network. + /// + [TestMethod] + public void Example9() { var network = IPNetwork2.Parse("192.168.0.1"); var network2 = IPNetwork2.Parse("192.168.0.254"); @@ -166,11 +166,11 @@ public void Example9() Console.WriteLine("Cidr : {0}", ipnetwork.Cidr); } - /// - /// Tests Examples with invalid input to ensure proper error handling. - /// - [TestMethod] - public void When_TrySupernet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Should_Invalid() + /// + /// Tests Examples with invalid input to ensure proper error handling. + /// + [TestMethod] + public void When_TrySupernet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Should_Invalid() { var network = IPNetwork2.Parse("192.168.0.0/24"); var network2 = IPNetwork2.Parse("192.168.10.0/24"); @@ -179,11 +179,11 @@ public void When_TrySupernet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Sho Assert.AreEqual(false, supernetted); } - /// - /// Tests Examples with invalid input to ensure proper error handling. - /// - [TestMethod] - public void When_TryWideSubnet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Should_Invalid() + /// + /// Tests Examples with invalid input to ensure proper error handling. + /// + [TestMethod] + public void When_TryWideSubnet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_Should_Invalid() { var network = IPNetwork2.Parse("192.168.0.0/24"); var network2 = IPNetwork2.Parse("192.168.10.0/24"); @@ -201,11 +201,11 @@ public void When_TryWideSubnet_192_168_0_0_cidr24_add_192_168_10_0_cidr24_Then_S Console.WriteLine("Cidr : {0}", ipnetwork.Cidr); } - /// - /// Tests Examples functionality with a /10 network. - /// - [TestMethod] - public void Example10() + /// + /// Tests Examples functionality with a /10 network. + /// + [TestMethod] + public void Example10() { var ipnetwork = IPNetwork2.Parse("192.168.0.1/25"); @@ -218,11 +218,11 @@ public void Example10() Console.WriteLine("Cidr : {0}", ipnetwork.Cidr); } - /// - /// Tests Examples functionality with a /11 network. - /// - [TestMethod] - public void Example11() + /// + /// Tests Examples functionality with a /11 network. + /// + [TestMethod] + public void Example11() { var defaultParse = IPNetwork2.Parse("192.168.0.0"); // default to ClassFull var classFullParse = IPNetwork2.Parse("192.168.0.0", CidrGuess.ClassFull); @@ -232,5 +232,4 @@ public void Example11() Console.WriteLine("IPV4 ClassFull Parse : {0}", classFullParse); Console.WriteLine("IPV4 ClassLess Parse : {0}", classLessParse); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs index 28612bec..93397e1f 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkIanaBlocksTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkIanaBlocksTests { - [TestClass] - public class IPNetworkIanaBlocksTests - { - /// - /// Tests IANA_blocks functionality with IANA1. - /// - [TestMethod] - public void TestIana1() + /// + /// Tests IANA_blocks functionality with IANA1. + /// + [TestMethod] + public void TestIana1() { var ipaddress = IPAddress.Parse("192.168.66.66"); bool expected = true; @@ -20,11 +20,11 @@ public void TestIana1() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA2. - /// - [TestMethod] - public void TestIana2() + /// + /// Tests IANA_blocks functionality with IANA2. + /// + [TestMethod] + public void TestIana2() { var ipaddress = IPAddress.Parse("10.0.0.0"); bool expected = true; @@ -33,11 +33,11 @@ public void TestIana2() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA3. - /// - [TestMethod] - public void TestIana3() + /// + /// Tests IANA_blocks functionality with IANA3. + /// + [TestMethod] + public void TestIana3() { var ipaddress = IPAddress.Parse("172.17.10.10"); bool expected = true; @@ -46,11 +46,11 @@ public void TestIana3() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA4. - /// - [TestMethod] - public void TestIana4() + /// + /// Tests IANA_blocks functionality with IANA4. + /// + [TestMethod] + public void TestIana4() { var ipnetwork = IPNetwork2.Parse("192.168.66.66/24"); bool expected = true; @@ -59,11 +59,11 @@ public void TestIana4() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA5. - /// - [TestMethod] - public void TestIana5() + /// + /// Tests IANA_blocks functionality with IANA5. + /// + [TestMethod] + public void TestIana5() { var ipnetwork = IPNetwork2.Parse("10.10.10/18"); bool expected = true; @@ -72,11 +72,11 @@ public void TestIana5() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA6. - /// - [TestMethod] - public void TestIana6() + /// + /// Tests IANA_blocks functionality with IANA6. + /// + [TestMethod] + public void TestIana6() { var ipnetwork = IPNetwork2.Parse("172.31.10.10/24"); bool expected = true; @@ -85,17 +85,17 @@ public void TestIana6() Assert.AreEqual(expected, result, "IANA"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestIana7() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestIana7() { IPAddress ipaddress = null; IPNetwork2.IsIANAReserved(ipaddress); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestIana8() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestIana8() { IPNetwork2 ipnetwork = null; #pragma warning disable 0618 @@ -103,11 +103,11 @@ public void TestIana8() #pragma warning restore 0618 } - /// - /// Tests IANA_blocks functionality with IANABlk1. - /// - [TestMethod] - public void TestIanaBlk1() + /// + /// Tests IANA_blocks functionality with IANABlk1. + /// + [TestMethod] + public void TestIanaBlk1() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; #pragma warning disable 0618 @@ -116,11 +116,11 @@ public void TestIanaBlk1() Assert.IsTrue(result, "result"); } - /// - /// Tests IANA_blocks functionality with IANA9. - /// - [TestMethod] - public void TestIana9() + /// + /// Tests IANA_blocks functionality with IANA9. + /// + [TestMethod] + public void TestIana9() { var ipaddress = IPAddress.Parse("1.2.3.4"); bool expected = false; @@ -129,11 +129,11 @@ public void TestIana9() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA10. - /// - [TestMethod] - public void TestIana10() + /// + /// Tests IANA_blocks functionality with IANA10. + /// + [TestMethod] + public void TestIana10() { var ipnetwork = IPNetwork2.Parse("172.16.0.0/8"); bool expected = false; @@ -142,11 +142,11 @@ public void TestIana10() Assert.AreEqual(expected, result, "IANA"); } - /// - /// Tests IANA_blocks functionality with IANA11. - /// - [TestMethod] - public void TestIana11() + /// + /// Tests IANA_blocks functionality with IANA11. + /// + [TestMethod] + public void TestIana11() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/8"); bool expected = false; @@ -154,5 +154,4 @@ public void TestIana11() Assert.AreEqual(expected, result, "IANA"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs b/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs index 0843502b..3e4de18f 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkOperatorTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkOperatorTests { - [TestClass] - public class IPNetworkOperatorTests - { - /// - /// Tests Operator functionality with Operator Greater1. - /// - [TestMethod] - public void TestOperatorGreater1() + /// + /// Tests Operator functionality with Operator Greater1. + /// + [TestMethod] + public void TestOperatorGreater1() { var ipn1 = IPNetwork2.Parse("10.0.0.1/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -21,11 +21,11 @@ public void TestOperatorGreater1() Assert.AreEqual(false, greater, "greater"); } - /// - /// Tests Operator functionality with Operator Greater2. - /// - [TestMethod] - public void TestOperatorGreater2() + /// + /// Tests Operator functionality with Operator Greater2. + /// + [TestMethod] + public void TestOperatorGreater2() { var ipn1 = IPNetwork2.Parse("10.0.0.100/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -35,11 +35,11 @@ public void TestOperatorGreater2() Assert.AreEqual(true, greater, "greater"); } - /// - /// Tests Operator functionality with Operator Lower1. - /// - [TestMethod] - public void TestOperatorLower1() + /// + /// Tests Operator functionality with Operator Lower1. + /// + [TestMethod] + public void TestOperatorLower1() { var ipn1 = IPNetwork2.Parse("10.0.0.1/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -49,11 +49,11 @@ public void TestOperatorLower1() Assert.AreEqual(true, lower, "lower"); } - /// - /// Tests Operator functionality with Operator Lower2. - /// - [TestMethod] - public void TestOperatorLower2() + /// + /// Tests Operator functionality with Operator Lower2. + /// + [TestMethod] + public void TestOperatorLower2() { var ipn1 = IPNetwork2.Parse("10.0.0.100/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -63,11 +63,11 @@ public void TestOperatorLower2() Assert.AreEqual(false, lower, "lower"); } - /// - /// Tests Operator functionality with Operator Different1. - /// - [TestMethod] - public void TestOperatorDifferent1() + /// + /// Tests Operator functionality with Operator Different1. + /// + [TestMethod] + public void TestOperatorDifferent1() { var ipn1 = IPNetwork2.Parse("10.0.0.100/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -77,11 +77,11 @@ public void TestOperatorDifferent1() Assert.AreEqual(true, different, "different"); } - /// - /// Tests Operator functionality with Operator Different2. - /// - [TestMethod] - public void TestOperatorDifferent2() + /// + /// Tests Operator functionality with Operator Different2. + /// + [TestMethod] + public void TestOperatorDifferent2() { var ipn1 = IPNetwork2.Parse("10.0.0.1/32"); var ipn2 = IPNetwork2.Parse("10.0.0.1/32"); @@ -91,11 +91,11 @@ public void TestOperatorDifferent2() Assert.AreEqual(false, different, "different"); } - /// - /// Tests Operator functionality with Operator Equal1. - /// - [TestMethod] - public void TestOperatorEqual1() + /// + /// Tests Operator functionality with Operator Equal1. + /// + [TestMethod] + public void TestOperatorEqual1() { var ipn1 = IPNetwork2.Parse("10.0.0.100/32"); var ipn2 = IPNetwork2.Parse("10.0.0.2/32"); @@ -105,11 +105,11 @@ public void TestOperatorEqual1() Assert.AreEqual(false, eq, "eq"); } - /// - /// Tests Operator functionality with Operator Equal2. - /// - [TestMethod] - public void TestOperatorEqual2() + /// + /// Tests Operator functionality with Operator Equal2. + /// + [TestMethod] + public void TestOperatorEqual2() { var ipn1 = IPNetwork2.Parse("10.0.0.1/32"); var ipn2 = IPNetwork2.Parse("10.0.0.1/32"); @@ -118,5 +118,4 @@ public void TestOperatorEqual2() Assert.AreEqual(true, eq, "eq"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs index dbf2a257..f3f082be 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkOverlapTests.cs @@ -2,14 +2,14 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkOverlapTests { - [TestClass] - public class IPNetworkOverlapTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestOverlap1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestOverlap1() { IPNetwork2 network1 = null; IPNetwork2 network2 = null; @@ -19,11 +19,11 @@ public void TestOverlap1() #pragma warning restore 0618 } - /// - /// Tests Overlap functionality with Overlap Static2. - /// - [TestMethod] - public void TestOverlapStatic2() + /// + /// Tests Overlap functionality with Overlap Static2. + /// + [TestMethod] + public void TestOverlapStatic2() { IPNetwork2 network1 = IPNetwork2.IANA_ABLK_RESERVED1; IPNetwork2 network2 = IPNetwork2.IANA_ABLK_RESERVED1; @@ -35,20 +35,20 @@ public void TestOverlapStatic2() Assert.IsTrue(result, "result"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestOverlap2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestOverlap2() { var network1 = IPNetwork2.Parse("10.0.0.0/0"); IPNetwork2 network2 = null; network1.Overlap(network2); } - /// - /// Tests Overlap functionality with Overlap3. - /// - [TestMethod] - public void TestOverlap3() + /// + /// Tests Overlap functionality with Overlap3. + /// + [TestMethod] + public void TestOverlap3() { var network1 = IPNetwork2.Parse("10.0.0.0/0"); var network2 = IPNetwork2.Parse("10.0.0.0/0"); @@ -58,11 +58,11 @@ public void TestOverlap3() Assert.AreEqual(expected, result, "overlap"); } - /// - /// Tests Overlap functionality with Overlap4. - /// - [TestMethod] - public void TestOverlap4() + /// + /// Tests Overlap functionality with Overlap4. + /// + [TestMethod] + public void TestOverlap4() { var network1 = IPNetwork2.Parse("10.10.0.0/16"); var network2 = IPNetwork2.Parse("10.10.1.0/24"); @@ -72,11 +72,11 @@ public void TestOverlap4() Assert.AreEqual(expected, result, "overlap"); } - /// - /// Tests Overlap functionality with Overlap5. - /// - [TestMethod] - public void TestOverlap5() + /// + /// Tests Overlap functionality with Overlap5. + /// + [TestMethod] + public void TestOverlap5() { var network1 = IPNetwork2.Parse("10.10.0.0/24"); var network2 = IPNetwork2.Parse("10.10.1.0/24"); @@ -86,11 +86,11 @@ public void TestOverlap5() Assert.AreEqual(expected, result, "overlap"); } - /// - /// Tests Overlap functionality with Overlap6. - /// - [TestMethod] - public void TestOverlap6() + /// + /// Tests Overlap functionality with Overlap6. + /// + [TestMethod] + public void TestOverlap6() { var network1 = IPNetwork2.Parse("10.10.1.0/24"); var network2 = IPNetwork2.Parse("10.10.0.0/16"); @@ -99,5 +99,4 @@ public void TestOverlap6() Assert.AreEqual(expected, result, "overlap"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs b/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs index 99abfe1f..6b8940a4 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseIpIpTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkParseIpIpTests { - [TestClass] - public class IPNetworkParseIpIpTests - { - /// - /// Tests Parse Ip Ip functionality with a /1 network. - /// - [TestMethod] - public void ParseIpIp1() + /// + /// Tests Parse Ip Ip functionality with a /1 network. + /// + [TestMethod] + public void ParseIpIp1() { string ipaddress = "192.168.168.100"; string netmask = "255.255.255.0"; @@ -21,23 +21,22 @@ public void ParseIpIp1() Assert.AreEqual("192.168.168.0/24", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void ParseIpIp2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void ParseIpIp2() { IPAddress ip = null; IPAddress netm = null; var ipnetwork = IPNetwork2.Parse(ip, netm); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void ParseIpIp3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void ParseIpIp3() { string ipaddress = "192.168.168.100"; var ip = IPAddress.Parse(ipaddress); IPAddress netm = null; var ipnetwork = 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 7de88bf1..45c45b9c 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseStringStringTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkParseStringStringTests { - [TestClass] - public class IPNetworkParseStringStringTests - { - /// - /// Tests Parse String String functionality with Parse String String1. - /// - [TestMethod] - public void TestParseStringString1() + /// + /// Tests Parse String String functionality with Parse String String1. + /// + [TestMethod] + public void TestParseStringString1() { string ipaddress = "192.168.168.100"; string netmask = "255.255.255.0"; @@ -20,9 +20,9 @@ public void TestParseStringString1() Assert.AreEqual("192.168.168.0/24", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString2() { string ipaddress = null; string netmask = null; @@ -30,9 +30,9 @@ public void TestParseStringString2() var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString3() { string ipaddress = "192.168.168.100"; string netmask = null; @@ -40,9 +40,9 @@ public void TestParseStringString3() var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString4() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString4() { string ipaddress = string.Empty; string netmask = string.Empty; @@ -50,14 +50,13 @@ public void TestParseStringString4() var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString5() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString5() { string ipaddress = "192.168.168.100"; string netmask = string.Empty; var ipnetwork = 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 4e263e5d..9fdb09b4 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkParseTests.cs @@ -2,83 +2,83 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkParseTests { - [TestClass] - public class IPNetworkParseTests - { - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseIPAddressNetmaskAne2() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseIPAddressNetmaskAne2() { IPAddress ip = null; IPNetwork2.Parse(ip, ip); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseIPAddressNetmaskAne3() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseIPAddressNetmaskAne3() { IPNetwork2.Parse(string.Empty, 0); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseIPAddressNetmaskAne4() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseIPAddressNetmaskAne4() { IPNetwork2.Parse(null, 0); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseIPAddressNetmaskAne5() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseIPAddressNetmaskAne5() { string n = null; IPNetwork2.Parse(n, n); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne8() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne8() { var ipnet = IPNetwork2.Parse("x.x.x.x", "x.x.x.x"); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne9() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne9() { var ipnet = IPNetwork2.Parse("0.0.0.0", "x.x.x.x"); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne10() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne10() { var ipnet = IPNetwork2.Parse("x.x.x.x", 0); } - [TestMethod] - [TestCategory("Parse")] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne11() + [TestMethod] + [TestCategory("Parse")] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne11() { var ipnet = IPNetwork2.Parse("0.0.0.0", 33); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse IPAddress Netmask. - /// - [TestMethod] - public void TestParseIPAddressNetmask() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse IPAddress Netmask. + /// + [TestMethod] + public void TestParseIPAddressNetmask() { string ipaddress = "192.168.168.100"; string netmask = "255.255.255.0"; @@ -100,12 +100,12 @@ public void TestParseIPAddressNetmask() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse String1. - /// - [TestMethod] - public void TestParseString1() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse String1. + /// + [TestMethod] + public void TestParseString1() { string ipaddress = "192.168.168.100 255.255.255.0"; @@ -127,12 +127,12 @@ public void TestParseString1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse String2. - /// - [TestMethod] - public void TestParseString2() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse String2. + /// + [TestMethod] + public void TestParseString2() { string ipaddress = "192.168.168.100/24"; @@ -154,12 +154,12 @@ public void TestParseString2() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse String3. - /// - [TestMethod] - public void TestParseString3() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse String3. + /// + [TestMethod] + public void TestParseString3() { string ipaddress = "0.0.0.0/0"; @@ -181,12 +181,12 @@ public void TestParseString3() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse String4. - /// - [TestMethod] - public void TestParseString4() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse String4. + /// + [TestMethod] + public void TestParseString4() { string ipaddress = "0.0.0.0/32"; @@ -208,12 +208,12 @@ public void TestParseString4() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse String5. - /// - [TestMethod] - public void TestParseString5() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse String5. + /// + [TestMethod] + public void TestParseString5() { string ipaddress = "255.255.255.255/32"; @@ -235,12 +235,12 @@ public void TestParseString5() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestCategory("Parse")] - /// - /// Tests Parse functionality with Parse IPAddress No Netmask1. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask1() + [TestCategory("Parse")] + /// + /// Tests Parse functionality with Parse IPAddress No Netmask1. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask1() { string ipaddress = "10.0.0.0"; @@ -262,11 +262,11 @@ public void TestParseIPAddressNoNetmask1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality. - /// - [TestMethod] - public void When_Parse_254_128_0_0_Should_Succeed() + /// + /// Tests Parse functionality. + /// + [TestMethod] + public void When_Parse_254_128_0_0_Should_Succeed() { string ipaddress = "254.128.0.0"; @@ -288,11 +288,11 @@ public void When_Parse_254_128_0_0_Should_Succeed() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask2. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask2() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask2. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask2() { string ipaddress = "172.0.0.0"; @@ -314,11 +314,11 @@ public void TestParseIPAddressNoNetmask2() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask3. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask3() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask3. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask3() { string ipaddress = "192.0.0.0"; @@ -340,11 +340,11 @@ public void TestParseIPAddressNoNetmask3() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask1_Class Full. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask1_ClassFull() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask1_Class Full. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask1_ClassFull() { string ipaddress = "10.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassFull; @@ -368,11 +368,11 @@ public void TestParseIPAddressNoNetmask1_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask2_Class Full. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask2_ClassFull() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask2_Class Full. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask2_ClassFull() { string ipaddress = "172.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassFull; @@ -396,11 +396,11 @@ public void TestParseIPAddressNoNetmask2_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask3_Class Full. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask3_ClassFull() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask3_Class Full. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask3_ClassFull() { string ipaddress = "192.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassFull; @@ -424,11 +424,11 @@ public void TestParseIPAddressNoNetmask3_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask1_Class Less. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask1_ClassLess() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask1_Class Less. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask1_ClassLess() { string ipaddress = "10.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassLess; @@ -452,11 +452,11 @@ public void TestParseIPAddressNoNetmask1_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask2_Class Less. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask2_ClassLess() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask2_Class Less. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask2_ClassLess() { string ipaddress = "172.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassLess; @@ -480,11 +480,11 @@ public void TestParseIPAddressNoNetmask2_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask3_Class Less. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask3_ClassLess() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask3_Class Less. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask3_ClassLess() { string ipaddress = "192.0.0.0"; ICidrGuess guessCidr = CidrGuess.ClassLess; @@ -508,11 +508,11 @@ public void TestParseIPAddressNoNetmask3_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask4. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask4() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask4. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask4() { string ipaddress = "224.0.0.0"; var ipnetwork = IPNetwork2.Parse(ipaddress); @@ -520,22 +520,22 @@ public void TestParseIPAddressNoNetmask4() Assert.AreEqual("224.0.0.0/24", ipnetwork.ToString(), "Network"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask5. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask5() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask5. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask5() { string ipaddress = "240.0.0.0"; var ipnetwork = IPNetwork2.Parse(ipaddress); Assert.AreEqual("240.0.0.0/24", ipnetwork.ToString(), "Network"); } - /// - /// Tests Parse functionality with Parse IPAddress No Netmask127001. - /// - [TestMethod] - public void TestParseIPAddressNoNetmask127001() + /// + /// Tests Parse functionality with Parse IPAddress No Netmask127001. + /// + [TestMethod] + public void TestParseIPAddressNoNetmask127001() { string ipaddress = "127.0.0.1"; IPNetwork2 result = null; @@ -543,28 +543,27 @@ public void TestParseIPAddressNoNetmask127001() Assert.AreEqual(result.Cidr, 8); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseStringAe1() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseStringAe1() { string ipaddress = "garbage"; var ipnetwork = IPNetwork2.Parse(ipaddress); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseStringAe2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseStringAe2() { string ipaddress = "0.0.0.0 0.0.1.0"; var ipnetwork = IPNetwork2.Parse(ipaddress); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringAne1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringAne1() { string ipaddress = null; var ipnetwork = IPNetwork2.Parse(ipaddress); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs index c890ada2..37397ece 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkPrintTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkPrintTests { - [TestClass] - public class IPNetworkPrintTests - { - /// - /// Tests Print functionality. - /// - [TestMethod] - public void Print() + /// + /// Tests Print functionality. + /// + [TestMethod] + public void Print() { var ipn = IPNetwork2.Parse("0.0.0.0/0"); string print = ipn.Print().Replace("\r", string.Empty); @@ -28,9 +28,9 @@ public void Print() Assert.AreEqual(expected, print, "Print"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void PrintNull() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void PrintNull() { IPNetwork2 ipn = null; #pragma warning disable 0618 @@ -38,16 +38,15 @@ public void PrintNull() #pragma warning restore 0618 } - /// - /// Tests Print functionality. - /// - [TestMethod] - public void PrintStatic() + /// + /// Tests Print functionality. + /// + [TestMethod] + public void PrintStatic() { IPNetwork2 ipn = IPNetwork2.IANA_ABLK_RESERVED1; #pragma warning disable 0618 string print = 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 2b8ca2ee..3761aa88 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkResizeTests.cs @@ -2,16 +2,15 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkResizeTests { - [TestClass] - public class IPNetworkResizeTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestResize1() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestResize1() { byte[] resut = 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 ab1ab68b..9cba5109 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSortTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkSortTests { - [TestClass] - public class IPNetworkSortTests - { - /// - /// Tests Sort functionality with Sort1. - /// - [TestMethod] - public void TestSort1() + /// + /// Tests Sort functionality with Sort1. + /// + [TestMethod] + public void TestSort1() { string[] ips = { "1.1.1.1", "255.255.255.255", "2.2.2.2", "0.0.0.0" }; var ipns = new List(); @@ -31,11 +31,11 @@ public void TestSort1() Assert.AreEqual("255.255.255.255/32", ipns[3].ToString(), "3"); } - /// - /// Tests Sort functionality with Sort2. - /// - [TestMethod] - public void TestSort2() + /// + /// Tests Sort functionality with Sort2. + /// + [TestMethod] + public void TestSort2() { string[] ips = { "0.0.0.100/32", "0.0.0.0/24" }; var ipns = new List(); @@ -52,5 +52,4 @@ public void TestSort2() Assert.AreEqual("0.0.0.0/24", ipns[0].ToString(), "0"); Assert.AreEqual("0.0.0.100/32", ipns[1].ToString(), "1"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs index 41d31d6a..cf874e3c 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSubnetTests.cs @@ -2,14 +2,14 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkSubnetTests { - [TestClass] - public class IPNetworkSubnetTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestSubnet1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestSubnet1() { IPNetwork2 ipnetwork = null; byte cidr = 9; @@ -19,11 +19,11 @@ public void TestSubnet1() #pragma warning restore 0618 } - /// - /// Tests Subnet functionality with Subnet Static1. - /// - [TestMethod] - public void TestSubnetStatic1() + /// + /// Tests Subnet functionality with Subnet Static1. + /// + [TestMethod] + public void TestSubnetStatic1() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 9; @@ -33,9 +33,9 @@ public void TestSubnetStatic1() #pragma warning restore 0618 } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestSubnet3() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestSubnet3() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 55; @@ -43,9 +43,9 @@ public void TestSubnet3() IPNetworkCollection subnets = ipnetwork.Subnet(cidr); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestSubnet4() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestSubnet4() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 1; @@ -53,11 +53,11 @@ public void TestSubnet4() IPNetworkCollection subnets = ipnetwork.Subnet(cidr); } - /// - /// Tests Subnet functionality with Subnet5. - /// - [TestMethod] - public void TestSubnet5() + /// + /// Tests Subnet functionality with Subnet5. + /// + [TestMethod] + public void TestSubnet5() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 9; @@ -68,11 +68,11 @@ public void TestSubnet5() Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2"); } - /// - /// Tests Subnet functionality with Subnet6. - /// - [TestMethod] - public void TestSubnet6() + /// + /// Tests Subnet functionality with Subnet6. + /// + [TestMethod] + public void TestSubnet6() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; byte cidr = 20; @@ -97,11 +97,11 @@ public void TestSubnet6() Assert.AreEqual("192.168.240.0/20", subnets[15].ToString(), "subnet16"); } - /// - /// Tests Subnet functionality with Subnet7. - /// - [TestMethod] - public void TestSubnet7() + /// + /// Tests Subnet functionality with Subnet7. + /// + [TestMethod] + public void TestSubnet7() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; byte cidr = 24; @@ -112,11 +112,11 @@ public void TestSubnet7() Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet16"); } - /// - /// Tests Subnet functionality with Subnet8. - /// - [TestMethod] - public void TestSubnet8() + /// + /// Tests Subnet functionality with Subnet8. + /// + [TestMethod] + public void TestSubnet8() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; byte cidr = 24; @@ -127,11 +127,11 @@ public void TestSubnet8() Assert.AreEqual("192.168.255.0/24", subnets[255].ToString(), "subnet256"); } - /// - /// Tests Subnet functionality with Subnet9. - /// - [TestMethod] - public void TestSubnet9() + /// + /// Tests Subnet functionality with Subnet9. + /// + [TestMethod] + public void TestSubnet9() { var ipnetwork = IPNetwork2.Parse("192.168.0.0/24"); byte cidr = 32; @@ -142,11 +142,11 @@ public void TestSubnet9() Assert.AreEqual("192.168.0.255/32", subnets[255].ToString(), "subnet256"); } - /// - /// Tests Subnet functionality with Subnet_Example8. - /// - [TestMethod] - public void TestSubnet_Example8() + /// + /// Tests Subnet functionality with Subnet_Example8. + /// + [TestMethod] + public void TestSubnet_Example8() { var wholeInternet = IPNetwork2.Parse("0.0.0.0/0"); byte newCidr = 2; @@ -163,11 +163,11 @@ public void TestSubnet_Example8() } } - /// - /// Tests Subnet functionality with Subnet10. - /// - [TestMethod] - public void TestSubnet10() + /// + /// Tests Subnet functionality with Subnet10. + /// + [TestMethod] + public void TestSubnet10() { var ipnetwork = IPNetwork2.Parse("0.0.0.0/0"); byte cidr = 32; @@ -179,11 +179,11 @@ public void TestSubnet10() Assert.AreEqual("255.255.255.255/32", subnets[4294967295].ToString(), "subnet256"); } - /// - /// Tests Subnet functionality with Subnet12. - /// - [TestMethod] - public void TestSubnet12() + /// + /// Tests Subnet functionality with Subnet12. + /// + [TestMethod] + public void TestSubnet12() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; byte cidr = 20; @@ -196,14 +196,13 @@ public void TestSubnet12() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestSubnet13() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestSubnet13() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; 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 6b49b765..2bb0d5a7 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkSupernetArrayTests { - [TestClass] - public class IPNetworkSupernetArrayTests - { - /// - /// Tests Supernet Array functionality with Try Supernet Array. - /// - [TestMethod] - public void TestTrySupernetArray() + /// + /// Tests Supernet Array functionality with Try Supernet Array. + /// + [TestMethod] + public void TestTrySupernetArray() { var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/24"); var ipnetwork2 = IPNetwork2.Parse("192.168.1.0/24"); @@ -27,11 +27,11 @@ public void TestTrySupernetArray() Assert.AreEqual(expected[0], expected[0], "suppernet"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array1. - /// - [TestMethod] - public void TestTrySupernetArray1() + /// + /// Tests Supernet Array functionality with Try Supernet Array1. + /// + [TestMethod] + public void TestTrySupernetArray1() { IPNetwork2[] ipnetworks = { }; IPNetwork2[] expected = { }; @@ -41,19 +41,19 @@ public void TestTrySupernetArray1() Assert.AreEqual(expected.Length, result.Length, "supernetarray"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestTrySupernetArray2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestTrySupernetArray2() { IPNetwork2[] ipnetworks = null; IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks); } - /// - /// Tests Supernet Array functionality with Try Supernet Array3. - /// - [TestMethod] - public void TestTrySupernetArray3() + /// + /// Tests Supernet Array functionality with Try Supernet Array3. + /// + [TestMethod] + public void TestTrySupernetArray3() { IPNetwork2 ipnetwork1 = null; IPNetwork2 ipnetwork2 = null; @@ -68,11 +68,11 @@ public void TestTrySupernetArray3() Assert.AreEqual(expected.Length, result.Length, "supernetarray"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array4. - /// - [TestMethod] - public void TestTrySupernetArray4() + /// + /// Tests Supernet Array functionality with Try Supernet Array4. + /// + [TestMethod] + public void TestTrySupernetArray4() { var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/24"); IPNetworkCollection subnetted = ipnetwork1.Subnet(32); @@ -87,11 +87,11 @@ public void TestTrySupernetArray4() Assert.AreEqual(expected[0], ipnetwork1, "suppernet"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array5. - /// - [TestMethod] - public void TestTrySupernetArray5() + /// + /// Tests Supernet Array functionality with Try Supernet Array5. + /// + [TestMethod] + public void TestTrySupernetArray5() { var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/16"); IPNetworkCollection subnetted = ipnetwork1.Subnet(24); @@ -106,11 +106,11 @@ public void TestTrySupernetArray5() Assert.AreEqual(expected[0], ipnetwork1, "suppernet"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array6. - /// - [TestMethod] - public void TestTrySupernetArray6() + /// + /// Tests Supernet Array functionality with Try Supernet Array6. + /// + [TestMethod] + public void TestTrySupernetArray6() { var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/8"); IPNetworkCollection subnetted = ipnetwork1.Subnet(24); @@ -125,11 +125,11 @@ public void TestTrySupernetArray6() Assert.AreEqual(expected[0], ipnetwork1, "suppernet"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array7. - /// - [TestMethod] - public void TestTrySupernetArray7() + /// + /// Tests Supernet Array functionality with Try Supernet Array7. + /// + [TestMethod] + public void TestTrySupernetArray7() { IPNetwork2[] ipnetworks = { @@ -156,11 +156,11 @@ public void TestTrySupernetArray7() Assert.AreEqual(expected[2], result[2], "suppernet2"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array8. - /// - [TestMethod] - public void TestTrySupernetArray8() + /// + /// Tests Supernet Array functionality with Try Supernet Array8. + /// + [TestMethod] + public void TestTrySupernetArray8() { IPNetwork2[] ipnetworks = { @@ -186,11 +186,11 @@ public void TestTrySupernetArray8() Assert.AreEqual(expected[1], result[1], "suppernet1"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array9. - /// - [TestMethod] - public void TestTrySupernetArray9() + /// + /// Tests Supernet Array functionality with Try Supernet Array9. + /// + [TestMethod] + public void TestTrySupernetArray9() { IPNetwork2[] ipnetworks = { @@ -220,11 +220,11 @@ public void TestTrySupernetArray9() Assert.AreEqual(expected[2], result[2], "suppernet2"); } - /// - /// Tests Supernet Array functionality with Try Supernet Array10. - /// - [TestMethod] - public void TestTrySupernetArray10() + /// + /// Tests Supernet Array functionality with Try Supernet Array10. + /// + [TestMethod] + public void TestTrySupernetArray10() { IPNetwork2[] ipnetworks = { @@ -242,5 +242,4 @@ public void TestTrySupernetArray10() Assert.AreEqual(expected.Length, result.Length, "supernetarray"); Assert.AreEqual(expected[0], result[0], "suppernet"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs index c4e74f7b..04cd46f3 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkSupernetTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkSupernetTests { - [TestClass] - public class IPNetworkSupernetTests - { - /// - /// Tests Supernet functionality with Supernet Internal1. - /// - [TestMethod] - public void TestSupernetInternal1() + /// + /// Tests Supernet functionality with Supernet Internal1. + /// + [TestMethod] + public void TestSupernetInternal1() { IPNetwork2 result; IPNetwork2.InternalSupernet(true, null, null, out result); @@ -19,17 +19,17 @@ public void TestSupernetInternal1() Assert.AreEqual(null, result, "supernet"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestSupernetInternal2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestSupernetInternal2() { IPNetwork2 result; IPNetwork2.InternalSupernet(false, null, null, out result); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void Issue33__TestSupernet__Bug_or_default_behavior() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void Issue33__TestSupernet__Bug_or_default_behavior() { var network1 = IPNetwork2.Parse("192.168.0.0/24"); var network2 = IPNetwork2.Parse("192.168.2.0/24"); @@ -39,11 +39,11 @@ public void Issue33__TestSupernet__Bug_or_default_behavior() Assert.AreEqual(expected, supernet, "supernet"); } - /// - /// Tests Supernet functionality. - /// - [TestMethod] - public void Issue33__TestWideSubnet__Bug_or_default_behavior() + /// + /// Tests Supernet functionality. + /// + [TestMethod] + public void Issue33__TestWideSubnet__Bug_or_default_behavior() { var network1 = IPNetwork2.Parse("192.168.0.0/24"); var network2 = IPNetwork2.Parse("192.168.2.0/24"); @@ -53,11 +53,11 @@ public void Issue33__TestWideSubnet__Bug_or_default_behavior() Assert.AreEqual(expected, widenetwork, "widesubnet"); } - /// - /// Tests Supernet functionality. - /// - [TestMethod] - public void Issue162__Test_IPrangeToCIDRnotation() + /// + /// Tests Supernet functionality. + /// + [TestMethod] + public void Issue162__Test_IPrangeToCIDRnotation() { string network1 = "172.64.0.0"; string network2 = "172.71.255.255"; @@ -69,11 +69,11 @@ public void Issue162__Test_IPrangeToCIDRnotation() Assert.AreEqual(expected, result, "Supernet"); } - /// - /// Tests Supernet functionality with Supernet1. - /// - [TestMethod] - public void TestSupernet1() + /// + /// Tests Supernet functionality with Supernet1. + /// + [TestMethod] + public void TestSupernet1() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -83,47 +83,47 @@ public void TestSupernet1() Assert.AreEqual(expected, supernet, "supernet"); } - [TestMethod] - [ExpectedException(typeof(NullReferenceException))] - public void TestSupernet2() + [TestMethod] + [ExpectedException(typeof(NullReferenceException))] + public void TestSupernet2() { IPNetwork2 network1 = null; var network2 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2 supernet = network1.Supernet(network2); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestSupernet3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestSupernet3() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2 network2 = null; IPNetwork2 supernet = network1.Supernet(network2); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestSupernet4() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + 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); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestSupernet5() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + 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); } - /// - /// Tests Supernet functionality with Supernet6. - /// - [TestMethod] - public void TestSupernet6() + /// + /// Tests Supernet functionality with Supernet6. + /// + [TestMethod] + public void TestSupernet6() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/25"); @@ -133,11 +133,11 @@ public void TestSupernet6() Assert.AreEqual(expected, supernet, "supernet"); } - /// - /// Tests Supernet functionality with Supernet7. - /// - [TestMethod] - public void TestSupernet7() + /// + /// Tests Supernet functionality with Supernet7. + /// + [TestMethod] + public void TestSupernet7() { var network1 = IPNetwork2.Parse("192.168.0.1/25"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); @@ -147,11 +147,11 @@ public void TestSupernet7() Assert.AreEqual(expected, supernet, "supernet"); } - /// - /// Tests Supernet functionality with Supernet Static1. - /// - [TestMethod] - public void TestSupernetStatic1() + /// + /// Tests Supernet functionality with Supernet Static1. + /// + [TestMethod] + public void TestSupernetStatic1() { var network1 = IPNetwork2.Parse("192.168.0.1/25"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); @@ -163,20 +163,20 @@ public void TestSupernetStatic1() Assert.AreEqual(expected, supernet, "supernet"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestSupernet8() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + 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); } - /// - /// Tests Supernet functionality with Supernet9. - /// - [TestMethod] - public void TestSupernet9() + /// + /// Tests Supernet functionality with Supernet9. + /// + [TestMethod] + public void TestSupernet9() { var ipnetwork1 = IPNetwork2.Parse("200.16.0.0/24"); var ipnetwork2 = IPNetwork2.Parse("200.16.1.0/24"); @@ -189,11 +189,11 @@ public void TestSupernet9() Assert.AreEqual(expected, result, "supernet"); } - /// - /// Tests Supernet functionality with Supernet10. - /// - [TestMethod] - public void TestSupernet10() + /// + /// Tests Supernet functionality with Supernet10. + /// + [TestMethod] + public void TestSupernet10() { var ipnetwork1 = IPNetwork2.Parse("1.1.0.0/24"); var ipnetwork2 = IPNetwork2.Parse("1.2.1.0/24"); @@ -203,5 +203,4 @@ public void TestSupernet10() Assert.AreEqual(expected, result, "supernet"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs index acb3bb88..838fcda1 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToBigIntegerTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkToBigIntegerTests { - [TestClass] - public class IPNetworkToBigIntegerTests - { - /// - /// Tests To Big Integer functionality with To Big Integer32. - /// - [TestMethod] - public void TestToBigInteger32() + /// + /// Tests To Big Integer functionality with To Big Integer32. + /// + [TestMethod] + public void TestToBigInteger32() { var mask = IPAddress.Parse("255.255.255.255"); uint uintMask = 0xffffffff; @@ -20,11 +20,11 @@ public void TestToBigInteger32() Assert.AreEqual(uintMask, result, "uint"); } - /// - /// Tests To Big Integer functionality with To Big Integer24. - /// - [TestMethod] - public void TestToBigInteger24() + /// + /// Tests To Big Integer functionality with To Big Integer24. + /// + [TestMethod] + public void TestToBigInteger24() { var mask = IPAddress.Parse("255.255.255.0"); uint uintMask = 0xffffff00; @@ -33,11 +33,11 @@ public void TestToBigInteger24() Assert.AreEqual(uintMask, result, "uint"); } - /// - /// Tests To Big Integer functionality with To Big Integer16. - /// - [TestMethod] - public void TestToBigInteger16() + /// + /// Tests To Big Integer functionality with To Big Integer16. + /// + [TestMethod] + public void TestToBigInteger16() { var mask = IPAddress.Parse("255.255.0.0"); uint uintMask = 0xffff0000; @@ -46,11 +46,11 @@ public void TestToBigInteger16() Assert.AreEqual(uintMask, result, "uint"); } - /// - /// Tests To Big Integer functionality with To Big Integer8. - /// - [TestMethod] - public void TestToBigInteger8() + /// + /// Tests To Big Integer functionality with To Big Integer8. + /// + [TestMethod] + public void TestToBigInteger8() { var mask = IPAddress.Parse("255.0.0.0"); uint uintMask = 0xff000000; @@ -59,11 +59,11 @@ public void TestToBigInteger8() Assert.AreEqual(uintMask, result, "uint"); } - /// - /// Tests To Big Integer functionality with To Big Integer0. - /// - [TestMethod] - public void TestToBigInteger0() + /// + /// Tests To Big Integer functionality with To Big Integer0. + /// + [TestMethod] + public void TestToBigInteger0() { var mask = IPAddress.Parse("0.0.0.0"); uint uintMask = 0x00000000; @@ -72,108 +72,107 @@ public void TestToBigInteger0() Assert.AreEqual(uintMask, result, "uint"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestToBigIntegerAne() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestToBigIntegerAne() { BigInteger? result = IPNetwork2.ToBigInteger(null); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestToBigIntegerAne3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestToBigIntegerAne3() { IPAddress ip = null; BigInteger? result = IPNetwork2.ToBigInteger(ip); } - /// - /// Tests To Big Integer functionality with To Big Integer ANE2. - /// - [TestMethod] - public void TestToBigIntegerAne2() + /// + /// Tests To Big Integer functionality with To Big Integer ANE2. + /// + [TestMethod] + public void TestToBigIntegerAne2() { BigInteger? result = IPNetwork2.ToBigInteger(IPAddress.IPv6Any); uint expected = 0; Assert.AreEqual(expected, result, "result"); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestToBigIntegerByte() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestToBigIntegerByte() { BigInteger result = IPNetwork2.ToUint(33, AddressFamily.InterNetwork); } - /// - /// Tests To Big Integer functionality with To Big Integer Byte2. - /// - [TestMethod] - public void TestToBigIntegerByte2() + /// + /// Tests To Big Integer functionality with To Big Integer Byte2. + /// + [TestMethod] + public void TestToBigIntegerByte2() { 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. - /// - [TestMethod] - public void TestToBigIntegerByte3() + /// + /// Tests To Big Integer functionality with To Big Integer Byte3. + /// + [TestMethod] + public void TestToBigIntegerByte3() { 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. - /// - [TestMethod] - public void TestToBigIntegerInternal1() + /// + /// Tests To Big Integer functionality with To Big Integer Internal1. + /// + [TestMethod] + public void TestToBigIntegerInternal1() { BigInteger? result = null; IPNetwork2.InternalToBigInteger(true, 33, AddressFamily.InterNetwork, out result); Assert.AreEqual(null, result, "result"); } - /// - /// Tests To Big Integer functionality with To Big Integer Internal2. - /// - [TestMethod] - public void TestToBigIntegerInternal2() + /// + /// Tests To Big Integer functionality with To Big Integer Internal2. + /// + [TestMethod] + public void TestToBigIntegerInternal2() { BigInteger? result = null; IPNetwork2.InternalToBigInteger(true, 129, AddressFamily.InterNetworkV6, out result); Assert.AreEqual(null, result, "result"); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestToBigIntegerInternal3() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestToBigIntegerInternal3() { BigInteger? result = null; IPNetwork2.InternalToBigInteger(false, 129, AddressFamily.InterNetworkV6, out result); } - [TestMethod] - [ExpectedException(typeof(NotSupportedException))] - public void TestToBigIntegerInternal4() + [TestMethod] + [ExpectedException(typeof(NotSupportedException))] + public void TestToBigIntegerInternal4() { BigInteger? result = null; IPNetwork2.InternalToBigInteger(false, 32, AddressFamily.AppleTalk, out result); } - /// - /// Tests To Big Integer functionality with To Big Integer Internal5. - /// - [TestMethod] - public void TestToBigIntegerInternal5() + /// + /// Tests To Big Integer functionality with To Big Integer Internal5. + /// + [TestMethod] + public void TestToBigIntegerInternal5() { BigInteger? result = null; IPNetwork2.InternalToBigInteger(true, 32, AddressFamily.AppleTalk, out result); Assert.AreEqual(null, result, "result"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToCidrTests.cs index 882cdb76..38ecd0c0 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToCidrTests.cs @@ -2,40 +2,40 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkToCidrTests { - [TestClass] - public class IPNetworkToCidrTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestToCidrAne() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestToCidrAne() { IPNetwork2.ToCidr(null); } - /// - /// Tests To Cidr functionality with To Cidr AE. - /// - [TestMethod] - public void TestToCidrAe() + /// + /// Tests To Cidr functionality with To Cidr AE. + /// + [TestMethod] + public void TestToCidrAe() { byte cidr = IPNetwork2.ToCidr(IPAddress.IPv6Any); Assert.AreEqual(0, cidr, "cidr"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestToCidrAe2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestToCidrAe2() { IPNetwork2.ToCidr(IPAddress.Parse("6.6.6.6")); } - /// - /// Tests To Cidr functionality with To Cidr32. - /// - [TestMethod] - public void TestToCidr32() + /// + /// Tests To Cidr functionality with To Cidr32. + /// + [TestMethod] + public void TestToCidr32() { var mask = IPAddress.Parse("255.255.255.255"); byte cidr = 32; @@ -44,11 +44,11 @@ public void TestToCidr32() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests To Cidr functionality with To Cidr24. - /// - [TestMethod] - public void TestToCidr24() + /// + /// Tests To Cidr functionality with To Cidr24. + /// + [TestMethod] + public void TestToCidr24() { var mask = IPAddress.Parse("255.255.255.0"); byte cidr = 24; @@ -57,11 +57,11 @@ public void TestToCidr24() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests To Cidr functionality with To Cidr16. - /// - [TestMethod] - public void TestToCidr16() + /// + /// Tests To Cidr functionality with To Cidr16. + /// + [TestMethod] + public void TestToCidr16() { var mask = IPAddress.Parse("255.255.0.0"); byte cidr = 16; @@ -70,11 +70,11 @@ public void TestToCidr16() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests To Cidr functionality with To Cidr8. - /// - [TestMethod] - public void TestToCidr8() + /// + /// Tests To Cidr functionality with To Cidr8. + /// + [TestMethod] + public void TestToCidr8() { var mask = IPAddress.Parse("255.0.0.0"); byte cidr = 8; @@ -83,11 +83,11 @@ public void TestToCidr8() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests To Cidr functionality with To Cidr0. - /// - [TestMethod] - public void TestToCidr0() + /// + /// Tests To Cidr functionality with To Cidr0. + /// + [TestMethod] + public void TestToCidr0() { var mask = IPAddress.Parse("0.0.0.0"); byte cidr = 0; @@ -95,5 +95,4 @@ public void TestToCidr0() Assert.AreEqual(cidr, result, "cidr"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs index 16b88a37..dab4d83a 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToIPAddressTests.cs @@ -2,33 +2,33 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkToIPAddressTests { - [TestClass] - public class IPNetworkToIPAddressTests - { - /// - /// Tests To IPAddress functionality with To IPAddress. - /// - [TestMethod] - public void TestToIPAddress() + /// + /// Tests To IPAddress functionality with To IPAddress. + /// + [TestMethod] + public void TestToIPAddress() { var ip = new BigInteger(0); var result = IPNetwork2.ToIPAddress(ip, AddressFamily.InterNetwork); Assert.AreEqual(IPAddress.Any, result, "ToIPAddress"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestToIPAddress2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestToIPAddress2() { var ip = new BigInteger(0); var result = IPNetwork2.ToIPAddress(ip, AddressFamily.AppleTalk); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestToIPAddress3() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestToIPAddress3() { var ip = new BigInteger(new byte[] { @@ -44,5 +44,4 @@ public void TestToIPAddress3() }); var result = 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 5ad7ebc8..26a797e6 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToNetmaskTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkToNetmaskTests { - [TestClass] - public class IPNetworkToNetmaskTests - { - /// - /// Tests To Netmask functionality with a /32 network. - /// - [TestMethod] - public void ToNetmask32() + /// + /// Tests To Netmask functionality with a /32 network. + /// + [TestMethod] + public void ToNetmask32() { byte cidr = 32; string netmask = "255.255.255.255"; @@ -20,39 +20,39 @@ public void ToNetmask32() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void ToNetmaskNonInet() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void ToNetmaskNonInet() { byte cidr = 0; string result = IPNetwork2.ToNetmask(cidr, AddressFamily.AppleTalk).ToString(); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void ToNetmaskNegative() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void ToNetmaskNegative() { byte cidr = 0; cidr--; string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork).ToString(); } - /// - /// Tests To Netmask functionality with a /1 network. - /// - [TestMethod] - public void ToNetmaskInternal1() + /// + /// Tests To Netmask functionality with a /1 network. + /// + [TestMethod] + public void ToNetmaskInternal1() { IPAddress result; IPNetwork2.InternalToNetmask(true, 0, AddressFamily.AppleTalk, out result); Assert.AreEqual(null, result); } - /// - /// Tests To Netmask functionality with a /31 network. - /// - [TestMethod] - public void ToNetmask31() + /// + /// Tests To Netmask functionality with a /31 network. + /// + [TestMethod] + public void ToNetmask31() { byte cidr = 31; string netmask = "255.255.255.254"; @@ -61,11 +61,11 @@ public void ToNetmask31() Assert.AreEqual(netmask, result, "netmask"); } - /// - /// Tests To Netmask functionality with a /30 network. - /// - [TestMethod] - public void ToNetmask30() + /// + /// Tests To Netmask functionality with a /30 network. + /// + [TestMethod] + public void ToNetmask30() { byte cidr = 30; string netmask = "255.255.255.252"; @@ -74,11 +74,11 @@ public void ToNetmask30() Assert.AreEqual(netmask, result, "netmask"); } - /// - /// Tests To Netmask functionality with a /29 network. - /// - [TestMethod] - public void ToNetmask29() + /// + /// Tests To Netmask functionality with a /29 network. + /// + [TestMethod] + public void ToNetmask29() { byte cidr = 29; string netmask = "255.255.255.248"; @@ -87,11 +87,11 @@ public void ToNetmask29() Assert.AreEqual(netmask, result, "netmask"); } - /// - /// Tests To Netmask functionality with a /1 network. - /// - [TestMethod] - public void ToNetmask1() + /// + /// Tests To Netmask functionality with a /1 network. + /// + [TestMethod] + public void ToNetmask1() { byte cidr = 1; string netmask = "128.0.0.0"; @@ -100,11 +100,11 @@ public void ToNetmask1() Assert.AreEqual(netmask, result, "netmask"); } - /// - /// Tests To Netmask functionality with a /0 network. - /// - [TestMethod] - public void ToNetmask0() + /// + /// Tests To Netmask functionality with a /0 network. + /// + [TestMethod] + public void ToNetmask0() { byte cidr = 0; string netmask = "0.0.0.0"; @@ -113,12 +113,11 @@ public void ToNetmask0() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void ToNetmaskOore1() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void ToNetmaskOore1() { byte cidr = 33; string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetwork).ToString(); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkToStringTests.cs b/src/TestProject/IPNetworkTest/IPNetworkToStringTests.cs index 21f29ab1..0298360d 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkToStringTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkToStringTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkToStringTests { - [TestClass] - public class IPNetworkToStringTests - { - /// - /// Tests To String functionality with To String. - /// - [TestMethod] - public void TestToString() + /// + /// Tests To String functionality with To String. + /// + [TestMethod] + public void TestToString() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/8"); string expected = "192.0.0.0/8"; @@ -20,11 +20,11 @@ public void TestToString() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String1. - /// - [TestMethod] - public void TestToString1() + /// + /// Tests To String functionality with To String1. + /// + [TestMethod] + public void TestToString1() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/9"); string expected = "192.128.0.0/9"; @@ -33,11 +33,11 @@ public void TestToString1() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String2. - /// - [TestMethod] - public void TestToString2() + /// + /// Tests To String functionality with To String2. + /// + [TestMethod] + public void TestToString2() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/10"); string expected = "192.128.0.0/10"; @@ -46,11 +46,11 @@ public void TestToString2() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String3. - /// - [TestMethod] - public void TestToString3() + /// + /// Tests To String functionality with To String3. + /// + [TestMethod] + public void TestToString3() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/11"); string expected = "192.160.0.0/11"; @@ -59,11 +59,11 @@ public void TestToString3() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String4. - /// - [TestMethod] - public void TestToString4() + /// + /// Tests To String functionality with To String4. + /// + [TestMethod] + public void TestToString4() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/12"); string expected = "192.160.0.0/12"; @@ -72,11 +72,11 @@ public void TestToString4() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String5. - /// - [TestMethod] - public void TestToString5() + /// + /// Tests To String functionality with To String5. + /// + [TestMethod] + public void TestToString5() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/13"); string expected = "192.168.0.0/13"; @@ -85,11 +85,11 @@ public void TestToString5() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String6. - /// - [TestMethod] - public void TestToString6() + /// + /// Tests To String functionality with To String6. + /// + [TestMethod] + public void TestToString6() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/14"); string expected = "192.168.0.0/14"; @@ -98,11 +98,11 @@ public void TestToString6() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String7. - /// - [TestMethod] - public void TestToString7() + /// + /// Tests To String functionality with To String7. + /// + [TestMethod] + public void TestToString7() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/15"); string expected = "192.168.0.0/15"; @@ -111,11 +111,11 @@ public void TestToString7() Assert.AreEqual(expected, result, "ToString"); } - /// - /// Tests To String functionality with To String8. - /// - [TestMethod] - public void TestToString8() + /// + /// Tests To String functionality with To String8. + /// + [TestMethod] + public void TestToString8() { var ipnetwork = IPNetwork2.Parse("192.168.15.1/16"); string expected = "192.168.0.0/16"; @@ -123,5 +123,4 @@ public void TestToString8() Assert.AreEqual(expected, result, "ToString"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs index 675ceb9d..92885841 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryGuessCidrTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryGuessCidrTests { - [TestClass] - public class IPNetworkTryGuessCidrTests - { - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr Null. - /// - [TestMethod] - public void TestTryGuessCidrNull() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr Null. + /// + [TestMethod] + public void TestTryGuessCidrNull() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr(null, out cidr); @@ -20,11 +20,11 @@ public void TestTryGuessCidrNull() Assert.AreEqual(0, cidr, "cidr"); } - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr A. - /// - [TestMethod] - public void TestTryGuessCidrA() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr A. + /// + [TestMethod] + public void TestTryGuessCidrA() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("10.0.0.0", out cidr); @@ -33,11 +33,11 @@ public void TestTryGuessCidrA() Assert.AreEqual(8, cidr, "cidr"); } - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr B. - /// - [TestMethod] - public void TestTryGuessCidrB() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr B. + /// + [TestMethod] + public void TestTryGuessCidrB() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("172.0.0.0", out cidr); @@ -46,11 +46,11 @@ public void TestTryGuessCidrB() Assert.AreEqual(16, cidr, "cidr"); } - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr C. - /// - [TestMethod] - public void TestTryGuessCidrC() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr C. + /// + [TestMethod] + public void TestTryGuessCidrC() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("192.0.0.0", out cidr); @@ -59,11 +59,11 @@ public void TestTryGuessCidrC() Assert.AreEqual(24, cidr, "cidr"); } - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr D. - /// - [TestMethod] - public void TestTryGuessCidrD() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr D. + /// + [TestMethod] + public void TestTryGuessCidrD() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("224.0.0.0", out cidr); @@ -72,11 +72,11 @@ public void TestTryGuessCidrD() Assert.AreEqual(24, cidr, "cidr"); } - /// - /// Tests Try Guess Cidr functionality with Try Guess Cidr E. - /// - [TestMethod] - public void TestTryGuessCidrE() + /// + /// Tests Try Guess Cidr functionality with Try Guess Cidr E. + /// + [TestMethod] + public void TestTryGuessCidrE() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("240.0.0.0", out cidr); @@ -84,5 +84,4 @@ public void TestTryGuessCidrE() Assert.AreEqual(true, 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 50052366..bbac6c70 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryParseCidrTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryParseCidrTests { - [TestClass] - public class IPNetworkTryParseCidrTests - { - /// - /// Tests Try Parse Cidr functionality with a /1 network. - /// - [TestMethod] - public void TryParseCidr1() + /// + /// Tests Try Parse Cidr functionality with a /1 network. + /// + [TestMethod] + public void TryParseCidr1() { string sidr = "0"; byte? cidr; @@ -22,11 +22,11 @@ public void TryParseCidr1() Assert.AreEqual(result, cidr, "cidr"); } - /// - /// Tests Try Parse Cidr functionality with a /2 network. - /// - [TestMethod] - public void TryParseCidr2() + /// + /// Tests Try Parse Cidr functionality with a /2 network. + /// + [TestMethod] + public void TryParseCidr2() { string sidr = "sadsd"; byte? cidr; @@ -38,11 +38,11 @@ public void TryParseCidr2() Assert.AreEqual(result, cidr, "cidr"); } - /// - /// Tests Try Parse Cidr functionality with a /3 network. - /// - [TestMethod] - public void TryParseCidr3() + /// + /// Tests Try Parse Cidr functionality with a /3 network. + /// + [TestMethod] + public void TryParseCidr3() { string sidr = "33"; byte? cidr; @@ -53,5 +53,4 @@ public void TryParseCidr3() Assert.AreEqual(false, 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 c20efd77..ef033d3b 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryParseTests.cs @@ -2,17 +2,17 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryParseTests { - [TestClass] - public class IPNetworkTryParseTests + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE2. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne2() { - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE2. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne2() - { IPNetwork2 ipnet = null; IPAddress ip = null; bool parsed = IPNetwork2.TryParse(ip, ip, out ipnet); @@ -21,12 +21,12 @@ public void TestTryParseIPAddressNetmaskAne2() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE3. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne3() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE3. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne3() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse(string.Empty, 0, out ipnet); @@ -34,12 +34,12 @@ public void TestTryParseIPAddressNetmaskAne3() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE4. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne4() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE4. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne4() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse(null, 0, out ipnet); @@ -47,12 +47,12 @@ public void TestTryParseIPAddressNetmaskAne4() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE5. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne5() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE5. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne5() + { string n = null; IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse(n, n, out ipnet); @@ -61,24 +61,24 @@ public void TestTryParseIPAddressNetmaskAne5() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE6. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne6() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE6. + /// + [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"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE7. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne7() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE7. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne7() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse("0.0.0.0", netmask:null, out ipnet); @@ -86,12 +86,12 @@ public void TestTryParseIPAddressNetmaskAne7() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE8. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne8() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE8. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne8() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse("x.x.x.x", "x.x.x.x", out ipnet); @@ -99,12 +99,12 @@ public void TestTryParseIPAddressNetmaskAne8() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE9. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne9() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE9. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne9() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse("0.0.0.0", "x.x.x.x", out ipnet); @@ -112,12 +112,12 @@ public void TestTryParseIPAddressNetmaskAne9() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE10. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne10() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE10. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne10() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse("x.x.x.x", 0, out ipnet); @@ -125,12 +125,12 @@ public void TestTryParseIPAddressNetmaskAne10() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE11. - /// - [TestMethod] - public void TestTryParseIPAddressNetmaskAne11() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask ANE11. + /// + [TestMethod] + public void TestTryParseIPAddressNetmaskAne11() + { IPNetwork2 ipnet = null; bool parsed = IPNetwork2.TryParse("0.0.0.0", 33, out ipnet); @@ -138,12 +138,12 @@ public void TestTryParseIPAddressNetmaskAne11() Assert.AreEqual(null, ipnet, "ipnet"); } - /// - /// Tests Try Parse functionality with Try Parse IPAddress Netmask. - /// - [TestMethod] - public void TestTryParseIPAddressNetmask() - { + /// + /// Tests Try Parse functionality with Try Parse IPAddress Netmask. + /// + [TestMethod] + public void TestTryParseIPAddressNetmask() + { IPNetwork2 ipnetwork = null; string ipaddress = "192.168.168.100"; string netmask = "255.255.255.0"; @@ -166,12 +166,12 @@ public void TestTryParseIPAddressNetmask() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String1. - /// - [TestMethod] - public void TestTryParseString1() - { + /// + /// Tests Try Parse functionality with Try Parse String1. + /// + [TestMethod] + public void TestTryParseString1() + { IPNetwork2 ipnetwork = null; string ipaddress = "192.168.168.100 255.255.255.0"; @@ -194,12 +194,12 @@ public void TestTryParseString1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String2. - /// - [TestMethod] - public void TestTryParseString2() - { + /// + /// Tests Try Parse functionality with Try Parse String2. + /// + [TestMethod] + public void TestTryParseString2() + { IPNetwork2 ipnetwork = null; string ipaddress = "192.168.168.100/24"; @@ -222,12 +222,12 @@ public void TestTryParseString2() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String3. - /// - [TestMethod] - public void TestTryParseString3() - { + /// + /// Tests Try Parse functionality with Try Parse String3. + /// + [TestMethod] + public void TestTryParseString3() + { IPNetwork2 ipnetwork = null; string ipaddress = "0.0.0.0/0"; @@ -250,12 +250,12 @@ public void TestTryParseString3() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String4. - /// - [TestMethod] - public void TestTryParseString4() - { + /// + /// Tests Try Parse functionality with Try Parse String4. + /// + [TestMethod] + public void TestTryParseString4() + { IPNetwork2 ipnetwork = null; string ipaddress = "0.0.0.0/32"; @@ -278,12 +278,12 @@ public void TestTryParseString4() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String5. - /// - [TestMethod] - public void TestTryParseString5() - { + /// + /// Tests Try Parse functionality with Try Parse String5. + /// + [TestMethod] + public void TestTryParseString5() + { IPNetwork2 ipnetwork = null; string ipaddress = "255.255.255.255/32"; @@ -306,40 +306,39 @@ public void TestTryParseString5() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - /// - /// Tests Try Parse functionality with Try Parse String AE1. - /// - [TestMethod] - public void TestTryParseStringAe1() - { + /// + /// Tests Try Parse functionality with Try Parse String AE1. + /// + [TestMethod] + public void TestTryParseStringAe1() + { string ipaddress = "garbage"; IPNetwork2 ipnetwork = null; bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); Assert.AreEqual(false, parsed, "parsed"); } - /// - /// Tests Try Parse functionality with Try Parse String AE2. - /// - [TestMethod] - public void TestTryParseStringAe2() - { + /// + /// Tests Try Parse functionality with Try Parse String AE2. + /// + [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"); } - /// - /// Tests Try Parse functionality with Try Parse String ANE1. - /// - [TestMethod] - public void TestTryParseStringAne1() - { + /// + /// Tests Try Parse functionality with Try Parse String ANE1. + /// + [TestMethod] + public void TestTryParseStringAne1() + { string ipaddress = null; IPNetwork2 ipnetwork = null; bool parsed = IPNetwork2.TryParse(ipaddress, out ipnetwork); Assert.AreEqual(false, parsed, "parsed"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs index 7773b4ed..54fb3414 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySubnetTests.cs @@ -2,33 +2,33 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTrySubnetTests { - [TestClass] - public class IPNetworkTrySubnetTests - { - /// - /// Tests Try Subnet functionality with Internal Subnet1. - /// - [TestMethod] - public void TestInternalSubnet1() + /// + /// Tests Try Subnet functionality with Internal Subnet1. + /// + [TestMethod] + public void TestInternalSubnet1() { IPNetworkCollection subnets = null; IPNetwork2.InternalSubnet(true, null, 0, out subnets); Assert.AreEqual(null, subnets, "subnets"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestInternalSubnet2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestInternalSubnet2() { IPNetworkCollection subnets = null; IPNetwork2.InternalSubnet(false, null, 0, out subnets); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestTrySubnet1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestTrySubnet1() { IPNetwork2 ipnetwork = null; byte cidr = 9; @@ -39,11 +39,11 @@ public void TestTrySubnet1() #pragma warning restore 0618 } - /// - /// Tests Try Subnet functionality with Try Subnet Static1. - /// - [TestMethod] - public void TestTrySubnetStatic1() + /// + /// Tests Try Subnet functionality with Try Subnet Static1. + /// + [TestMethod] + public void TestTrySubnetStatic1() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 9; @@ -54,11 +54,11 @@ public void TestTrySubnetStatic1() #pragma warning restore 0618 } - /// - /// Tests Try Subnet functionality with Try Subnet3. - /// - [TestMethod] - public void TestTrySubnet3() + /// + /// Tests Try Subnet functionality with Try Subnet3. + /// + [TestMethod] + public void TestTrySubnet3() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 55; @@ -69,11 +69,11 @@ public void TestTrySubnet3() Assert.AreEqual(false, subnetted, "subnetted"); } - /// - /// Tests Try Subnet functionality with Try Subnet4. - /// - [TestMethod] - public void TestTrySubnet4() + /// + /// Tests Try Subnet functionality with Try Subnet4. + /// + [TestMethod] + public void TestTrySubnet4() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 1; @@ -84,11 +84,11 @@ public void TestTrySubnet4() Assert.AreEqual(false, subnetted, "subnetted"); } - /// - /// Tests Try Subnet functionality with Try Subnet5. - /// - [TestMethod] - public void TestTrySubnet5() + /// + /// Tests Try Subnet functionality with Try Subnet5. + /// + [TestMethod] + public void TestTrySubnet5() { IPNetwork2 ipnetwork = IPNetwork2.IANA_ABLK_RESERVED1; byte cidr = 9; @@ -102,11 +102,11 @@ public void TestTrySubnet5() Assert.AreEqual("10.128.0.0/9", subnets[1].ToString(), "subnet2"); } - /// - /// Tests Try Subnet functionality with Try Subnet6. - /// - [TestMethod] - public void TestTrySubnet6() + /// + /// Tests Try Subnet functionality with Try Subnet6. + /// + [TestMethod] + public void TestTrySubnet6() { IPNetwork2 ipnetwork = IPNetwork2.IANA_CBLK_RESERVED1; byte cidr = 20; @@ -133,5 +133,4 @@ public void TestTrySubnet6() 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 4d025484..0ff0df83 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTrySupernetTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTrySupernetTests { - [TestClass] - public class IPNetworkTrySupernetTests - { - /// - /// Tests Try Supernet functionality with Try Supernet1. - /// - [TestMethod] - public void TestTrySupernet1() + /// + /// Tests Try Supernet functionality with Try Supernet1. + /// + [TestMethod] + public void TestTrySupernet1() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -24,9 +24,9 @@ public void TestTrySupernet1() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestTrySupernet2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestTrySupernet2() { IPNetwork2 network1 = null; var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -37,11 +37,11 @@ public void TestTrySupernet2() #pragma warning restore 0618 } - /// - /// Tests Try Supernet functionality with Try Supernet Static2. - /// - [TestMethod] - public void TestTrySupernetStatic2() + /// + /// Tests Try Supernet functionality with Try Supernet Static2. + /// + [TestMethod] + public void TestTrySupernetStatic2() { IPNetwork2 network1 = IPNetwork2.IANA_ABLK_RESERVED1; var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -52,11 +52,11 @@ public void TestTrySupernetStatic2() #pragma warning restore 0618 } - /// - /// Tests Try Supernet functionality with Try Supernet3. - /// - [TestMethod] - public void TestTrySupernet3() + /// + /// Tests Try Supernet functionality with Try Supernet3. + /// + [TestMethod] + public void TestTrySupernet3() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); IPNetwork2 network2 = null; @@ -69,11 +69,11 @@ public void TestTrySupernet3() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet4. - /// - [TestMethod] - public void TestTrySupernet4() + /// + /// Tests Try Supernet functionality with Try Supernet4. + /// + [TestMethod] + public void TestTrySupernet4() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/25"); @@ -86,11 +86,11 @@ public void TestTrySupernet4() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet5. - /// - [TestMethod] - public void TestTrySupernet5() + /// + /// Tests Try Supernet functionality with Try Supernet5. + /// + [TestMethod] + public void TestTrySupernet5() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.5.1/24"); @@ -103,11 +103,11 @@ public void TestTrySupernet5() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet6. - /// - [TestMethod] - public void TestTrySupernet6() + /// + /// Tests Try Supernet functionality with Try Supernet6. + /// + [TestMethod] + public void TestTrySupernet6() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.0.1/25"); @@ -120,11 +120,11 @@ public void TestTrySupernet6() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet7. - /// - [TestMethod] - public void TestTrySupernet7() + /// + /// Tests Try Supernet functionality with Try Supernet7. + /// + [TestMethod] + public void TestTrySupernet7() { var network1 = IPNetwork2.Parse("192.168.0.1/25"); var network2 = IPNetwork2.Parse("192.168.0.1/24"); @@ -137,11 +137,11 @@ public void TestTrySupernet7() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet8. - /// - [TestMethod] - public void TestTrySupernet8() + /// + /// Tests Try Supernet functionality with Try Supernet8. + /// + [TestMethod] + public void TestTrySupernet8() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); var network2 = IPNetwork2.Parse("192.168.2.1/24"); @@ -154,11 +154,11 @@ public void TestTrySupernet8() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet9. - /// - [TestMethod] - public void TestTrySupernet9() + /// + /// Tests Try Supernet functionality with Try Supernet9. + /// + [TestMethod] + public void TestTrySupernet9() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); var network2 = IPNetwork2.Parse("192.168.2.1/24"); @@ -173,11 +173,11 @@ public void TestTrySupernet9() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet10. - /// - [TestMethod] - public void TestTrySupernet10() + /// + /// Tests Try Supernet functionality with Try Supernet10. + /// + [TestMethod] + public void TestTrySupernet10() { var network1 = IPNetwork2.Parse("192.168.0.1/24"); var network2 = IPNetwork2.Parse("192.168.1.1/24"); @@ -191,11 +191,11 @@ public void TestTrySupernet10() Assert.AreEqual(parsed, result, "parsed"); } - /// - /// Tests Try Supernet functionality with Try Supernet11. - /// - [TestMethod] - public void TestTrySupernet11() + /// + /// Tests Try Supernet functionality with Try Supernet11. + /// + [TestMethod] + public void TestTrySupernet11() { IPNetwork2[] network3 = null; IPNetwork2[] supernetExpected = { IPNetwork2.Parse("192.168.0.0/23") }; @@ -206,5 +206,4 @@ public void TestTrySupernet11() Assert.AreEqual(null, supernet, "supernet"); Assert.AreEqual(parsed, result, "parsed"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs index 69c2cdef..30587339 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToBigIntegerTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryToBigIntegerTests { - [TestClass] - public class IPNetworkTryToBigIntegerTests - { - /// - /// Tests Try To Big Integer functionality with Try To Big Integer32. - /// - [TestMethod] - public void TestTryToBigInteger32() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer32. + /// + [TestMethod] + public void TestTryToBigInteger32() { var mask = IPAddress.Parse("255.255.255.255"); uint uintMask = 0xffffffff; @@ -22,11 +22,11 @@ public void TestTryToBigInteger32() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer24. - /// - [TestMethod] - public void TestTryToBigInteger24() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer24. + /// + [TestMethod] + public void TestTryToBigInteger24() { var mask = IPAddress.Parse("255.255.255.0"); uint uintMask = 0xffffff00; @@ -37,11 +37,11 @@ public void TestTryToBigInteger24() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer16. - /// - [TestMethod] - public void TestTryToBigInteger16() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer16. + /// + [TestMethod] + public void TestTryToBigInteger16() { var mask = IPAddress.Parse("255.255.0.0"); uint uintMask = 0xffff0000; @@ -52,11 +52,11 @@ public void TestTryToBigInteger16() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer8. - /// - [TestMethod] - public void TestTryToBigInteger8() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer8. + /// + [TestMethod] + public void TestTryToBigInteger8() { var mask = IPAddress.Parse("255.0.0.0"); uint uintMask = 0xff000000; @@ -68,11 +68,11 @@ public void TestTryToBigInteger8() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer0. - /// - [TestMethod] - public void TestTryToBigInteger0() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer0. + /// + [TestMethod] + public void TestTryToBigInteger0() { var mask = IPAddress.Parse("0.0.0.0"); uint uintMask = 0x00000000; @@ -83,11 +83,11 @@ public void TestTryToBigInteger0() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer ANE. - /// - [TestMethod] - public void TestTryToBigIntegerAne() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer ANE. + /// + [TestMethod] + public void TestTryToBigIntegerAne() { BigInteger? result = null; bool parsed = IPNetwork2.TryToBigInteger(null, out result); @@ -96,11 +96,11 @@ public void TestTryToBigIntegerAne() Assert.AreEqual(false, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer ANE3. - /// - [TestMethod] - public void TestTryToBigIntegerAne3() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer ANE3. + /// + [TestMethod] + public void TestTryToBigIntegerAne3() { IPAddress ip = null; BigInteger? result = null; @@ -110,11 +110,11 @@ public void TestTryToBigIntegerAne3() Assert.AreEqual(false, parsed, "parsed"); } - /// - /// Tests Try To Big Integer functionality with Try To Big Integer ANE2. - /// - [TestMethod] - public void TestTryToBigIntegerAne2() + /// + /// Tests Try To Big Integer functionality with Try To Big Integer ANE2. + /// + [TestMethod] + public void TestTryToBigIntegerAne2() { BigInteger? result = null; bool parsed = IPNetwork2.TryToBigInteger(IPAddress.IPv6Any, out result); @@ -122,5 +122,4 @@ public void TestTryToBigIntegerAne2() Assert.AreEqual(0, result, "result"); Assert.AreEqual(true, parsed, "parsed"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs index 2330a34f..2b51b02e 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToCidrTests.cs @@ -2,27 +2,27 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryToCidrTests { - [TestClass] - public class IPNetworkTryToCidrTests - { - /// - /// Tests Try To Cidr functionality with Try To Cidr ANE. - /// - [TestMethod] - public void TestTryToCidrAne() + /// + /// Tests Try To Cidr functionality with Try To Cidr ANE. + /// + [TestMethod] + public void TestTryToCidrAne() { byte? cidr = null; bool parsed = IPNetwork2.TryToCidr(null, out cidr); Assert.AreEqual(false, parsed, "parsed"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr AE. - /// - [TestMethod] - public void TestTryToCidrAe() + /// + /// Tests Try To Cidr functionality with Try To Cidr AE. + /// + [TestMethod] + public void TestTryToCidrAe() { byte? cidr = null; bool parsed = IPNetwork2.TryToCidr(IPAddress.IPv6Any, out cidr); @@ -30,22 +30,22 @@ public void TestTryToCidrAe() Assert.AreEqual((byte)0, cidr, "cidr"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr AE2. - /// - [TestMethod] - public void TestTryToCidrAe2() + /// + /// Tests Try To Cidr functionality with Try To Cidr AE2. + /// + [TestMethod] + public void TestTryToCidrAe2() { byte? cidr = null; bool parsed = IPNetwork2.TryToCidr(IPAddress.Parse("6.6.6.6"), out cidr); Assert.AreEqual(false, parsed, "parsed"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr32. - /// - [TestMethod] - public void TestTryToCidr32() + /// + /// Tests Try To Cidr functionality with Try To Cidr32. + /// + [TestMethod] + public void TestTryToCidr32() { byte? cidr = null; var mask = IPAddress.Parse("255.255.255.255"); @@ -56,11 +56,11 @@ public void TestTryToCidr32() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr24. - /// - [TestMethod] - public void TestTryToCidr24() + /// + /// Tests Try To Cidr functionality with Try To Cidr24. + /// + [TestMethod] + public void TestTryToCidr24() { byte? cidr = null; var mask = IPAddress.Parse("255.255.255.0"); @@ -71,11 +71,11 @@ public void TestTryToCidr24() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr16. - /// - [TestMethod] - public void TestTryToCidr16() + /// + /// Tests Try To Cidr functionality with Try To Cidr16. + /// + [TestMethod] + public void TestTryToCidr16() { byte? cidr = null; var mask = IPAddress.Parse("255.255.0.0"); @@ -86,11 +86,11 @@ public void TestTryToCidr16() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr8. - /// - [TestMethod] - public void TestTryToCidr8() + /// + /// Tests Try To Cidr functionality with Try To Cidr8. + /// + [TestMethod] + public void TestTryToCidr8() { byte? cidr = null; var mask = IPAddress.Parse("255.0.0.0"); @@ -101,11 +101,11 @@ public void TestTryToCidr8() Assert.AreEqual(cidr, result, "cidr"); } - /// - /// Tests Try To Cidr functionality with Try To Cidr0. - /// - [TestMethod] - public void TestTryToCidr0() + /// + /// Tests Try To Cidr functionality with Try To Cidr0. + /// + [TestMethod] + public void TestTryToCidr0() { byte? cidr = null; var mask = IPAddress.Parse("0.0.0.0"); @@ -115,5 +115,4 @@ public void TestTryToCidr0() Assert.AreEqual(true, 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 5b737aee..b5ef7ba8 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToNetmaskTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryToNetmaskTests { - [TestClass] - public class IPNetworkTryToNetmaskTests - { - /// - /// Tests Try To Netmask functionality with a /1 network. - /// - [TestMethod] - public void TryToNetmask1() + /// + /// Tests Try To Netmask functionality with a /1 network. + /// + [TestMethod] + public void TryToNetmask1() { IPAddress result = null; bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetwork, out result); @@ -21,11 +21,11 @@ public void TryToNetmask1() Assert.AreEqual(true, parsed, "parsed"); } - /// - /// Tests Try To Netmask functionality with a /2 network. - /// - [TestMethod] - public void TryToNetmask2() + /// + /// Tests Try To Netmask functionality with a /2 network. + /// + [TestMethod] + public void TryToNetmask2() { IPAddress result = null; bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetwork, out result); @@ -34,5 +34,4 @@ public void TryToNetmask2() Assert.AreEqual(expected, result, "Netmask"); Assert.AreEqual(false, parsed, "parsed"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs index 83e666e4..83503aba 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryToUintTests { - [TestClass] - public class IPNetworkTryToUintTests - { - /// - /// Tests Try To Uint functionality with Try To Uint1. - /// - [TestMethod] - public void TestTryToUint1() + /// + /// Tests Try To Uint functionality with Try To Uint1. + /// + [TestMethod] + public void TestTryToUint1() { BigInteger? result = null; bool parsed = IPNetwork2.TryToUint(32, AddressFamily.InterNetwork, out result); @@ -19,5 +19,4 @@ public void TestTryToUint1() Assert.IsNotNull(result, "uint"); Assert.AreEqual(true, parsed, "parsed"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs index 0958c2e1..27237fa7 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkTryWideSubnetTests.cs @@ -2,16 +2,16 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkTryWideSubnetTests { - [TestClass] - public class IPNetworkTryWideSubnetTests - { - /// - /// Tests Try Wide Subnet functionality with a /1 network. - /// - [TestMethod] - public void TryWideSubnet1() + /// + /// Tests Try Wide Subnet functionality with a /1 network. + /// + [TestMethod] + public void TryWideSubnet1() { string[] ips = { "1.1.1.1", "255.255.255.255", "2.2.2.2", "0.0.0.0" }; var ipns = new List(); @@ -30,11 +30,11 @@ public void TryWideSubnet1() Assert.AreEqual("0.0.0.0/0", ipnetwork.ToString(), "ipnetwork"); } - /// - /// Tests Try Wide Subnet functionality with a /2 network. - /// - [TestMethod] - public void TryWideSubnet2() + /// + /// Tests Try Wide Subnet functionality with a /2 network. + /// + [TestMethod] + public void TryWideSubnet2() { string[] ips = { "1.1.1.1", "10.0.0.0", "2.2.2.2", "0.0.0.0" }; var ipns = new List(); @@ -53,11 +53,11 @@ public void TryWideSubnet2() Assert.AreEqual("0.0.0.0/4", ipnetwork.ToString(), "ipnetwork"); } - /// - /// Tests Try Wide Subnet functionality with a /3 network. - /// - [TestMethod] - public void TryWideSubnet3() + /// + /// Tests Try Wide Subnet functionality with a /3 network. + /// + [TestMethod] + public void TryWideSubnet3() { string[] ips = { "a", "b", "c", "d" }; var ipns = new List(); @@ -75,11 +75,11 @@ public void TryWideSubnet3() Assert.AreEqual(false, wide, "wide"); } - /// - /// Tests Try Wide Subnet functionality with a /4 network. - /// - [TestMethod] - public void TryWideSubnet4() + /// + /// Tests Try Wide Subnet functionality with a /4 network. + /// + [TestMethod] + public void TryWideSubnet4() { string[] ips = { "a", "b", "1.1.1.1", "d" }; var ipns = new List(); @@ -98,15 +98,14 @@ public void TryWideSubnet4() Assert.AreEqual("1.1.1.1/32", ipnetwork.ToString(), "ipnetwork"); } - /// - /// Tests Try Wide Subnet with null input to ensure proper null handling. - /// - [TestMethod] - public void TryWideSubnetNull() + /// + /// Tests Try Wide Subnet with null input to ensure proper null handling. + /// + [TestMethod] + public void TryWideSubnetNull() { IPNetwork2 ipnetwork = null; bool wide = IPNetwork2.TryWideSubnet(null, out ipnetwork); Assert.AreEqual(false, wide, "wide"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkUsableTests.cs b/src/TestProject/IPNetworkTest/IPNetworkUsableTests.cs index 140fb6ac..73272cbf 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkUsableTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkUsableTests.cs @@ -2,86 +2,85 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkUsableTests { - [TestClass] - public class IPNetworkUsableTests - { - /// - /// Tests Usable functionality with a /32 network. - /// - [TestMethod] - public void Usable32() + /// + /// Tests Usable functionality with a /32 network. + /// + [TestMethod] + public void Usable32() { var network = IPNetwork2.Parse("0.0.0.0/32"); uint usable = 0; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /31 network. - /// - [TestMethod] - public void Usable31() + /// + /// Tests Usable functionality with a /31 network. + /// + [TestMethod] + public void Usable31() { var network = IPNetwork2.Parse("0.0.0.0/31"); uint usable = 0; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /30 network. - /// - [TestMethod] - public void Usable30() + /// + /// Tests Usable functionality with a /30 network. + /// + [TestMethod] + public void Usable30() { var network = IPNetwork2.Parse("0.0.0.0/30"); uint usable = 2; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /24 network. - /// - [TestMethod] - public void Usable24() + /// + /// Tests Usable functionality with a /24 network. + /// + [TestMethod] + public void Usable24() { var network = IPNetwork2.Parse("0.0.0.0/24"); uint usable = 254; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /16 network. - /// - [TestMethod] - public void Usable16() + /// + /// Tests Usable functionality with a /16 network. + /// + [TestMethod] + public void Usable16() { var network = IPNetwork2.Parse("0.0.0.0/16"); uint usable = 65534; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /8 network. - /// - [TestMethod] - public void Usable8() + /// + /// Tests Usable functionality with a /8 network. + /// + [TestMethod] + public void Usable8() { var network = IPNetwork2.Parse("0.0.0.0/8"); uint usable = 16777214; Assert.AreEqual(usable, network.Usable, "Usable"); } - /// - /// Tests Usable functionality with a /0 network. - /// - [TestMethod] - public void Usable0() + /// + /// Tests Usable functionality with a /0 network. + /// + [TestMethod] + public void Usable0() { var network = IPNetwork2.Parse("0.0.0.0/0"); uint usable = 4294967294; Assert.AreEqual(usable, network.Usable, "Usable"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs b/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs index 92475e9c..5f7e2acb 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkValidNetmaskTests.cs @@ -2,23 +2,23 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +[TestClass] +public class IPNetworkValidNetmaskTests { - [TestClass] - public class IPNetworkValidNetmaskTests - { - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestValidNetmaskInvalid1() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestValidNetmaskInvalid1() { bool resut = IPNetwork2.InternalValidNetmask(BigInteger.Zero, AddressFamily.AppleTalk); } - /// - /// Tests Valid Netmask functionality with Valid Netmask0. - /// - [TestMethod] - public void TestValidNetmask0() + /// + /// Tests Valid Netmask functionality with Valid Netmask0. + /// + [TestMethod] + public void TestValidNetmask0() { var mask = IPAddress.Parse("255.255.255.255"); bool expected = true; @@ -27,11 +27,11 @@ public void TestValidNetmask0() Assert.AreEqual(expected, result, "ValidNetmask"); } - /// - /// Tests Valid Netmask functionality with Valid Netmask1. - /// - [TestMethod] - public void TestValidNetmask1() + /// + /// Tests Valid Netmask functionality with Valid Netmask1. + /// + [TestMethod] + public void TestValidNetmask1() { var mask = IPAddress.Parse("255.255.255.0"); bool expected = true; @@ -40,11 +40,11 @@ public void TestValidNetmask1() Assert.AreEqual(expected, result, "ValidNetmask"); } - /// - /// Tests Valid Netmask functionality with Valid Netmask2. - /// - [TestMethod] - public void TestValidNetmask2() + /// + /// Tests Valid Netmask functionality with Valid Netmask2. + /// + [TestMethod] + public void TestValidNetmask2() { var mask = IPAddress.Parse("255.255.0.0"); bool expected = true; @@ -53,11 +53,11 @@ public void TestValidNetmask2() Assert.AreEqual(expected, result, "ValidNetmask"); } - /// - /// Tests Valid Netmask functionality with Valid Netmask EAE1. - /// - [TestMethod] - public void TestValidNetmaskEae1() + /// + /// Tests Valid Netmask functionality with Valid Netmask EAE1. + /// + [TestMethod] + public void TestValidNetmaskEae1() { var mask = IPAddress.Parse("0.255.0.0"); bool expected = false; @@ -66,9 +66,9 @@ public void TestValidNetmaskEae1() Assert.AreEqual(expected, result, "ValidNetmask"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestValidNetmaskEae2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestValidNetmaskEae2() { IPAddress mask = null; bool expected = true; @@ -77,11 +77,11 @@ public void TestValidNetmaskEae2() Assert.AreEqual(expected, result, "ValidNetmask"); } - /// - /// Tests Valid Netmask functionality with Valid Netmask EAE3. - /// - [TestMethod] - public void TestValidNetmaskEae3() + /// + /// Tests Valid Netmask functionality with Valid Netmask EAE3. + /// + [TestMethod] + public void TestValidNetmaskEae3() { var mask = IPAddress.Parse("255.255.0.1"); bool expected = false; @@ -89,5 +89,4 @@ public void TestValidNetmaskEae3() Assert.AreEqual(expected, result, "ValidNetmask"); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs b/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs index a68f28bd..1fc974a2 100644 --- a/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs +++ b/src/TestProject/IPNetworkTest/IPNetworkWideSubnetTests.cs @@ -2,19 +2,19 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject.IPNetworkTest +namespace TestProject.IPNetworkTest; + +/// +/// Tests for the WideSubnet method in IPNetwork2. +/// +[TestClass] +public class IPNetworkWideSubnetTests { /// - /// Tests for the WideSubnet method in IPNetwork2. + /// Tests WideSubnet with a diverse set of addresses, expecting a /0 network. /// - [TestClass] - public class IPNetworkWideSubnetTests - { - /// - /// Tests WideSubnet with a diverse set of addresses, expecting a /0 network. - /// - [TestMethod] - public void WideSubnet1() + [TestMethod] + public void WideSubnet1() { string[] ips = { "1.1.1.1", "255.255.255.255", "2.2.2.2", "0.0.0.0" }; var ipns = new List(); @@ -31,11 +31,11 @@ public void WideSubnet1() Assert.AreEqual("0.0.0.0/0", ipnetwork.ToString(), "ipnetwork"); } - /// - /// Tests WideSubnet with addresses in same range, expecting a /4 network. - /// - [TestMethod] - public void WideSubnet2() + /// + /// Tests WideSubnet with addresses in same range, expecting a /4 network. + /// + [TestMethod] + public void WideSubnet2() { string[] ips = { "1.1.1.1", "10.0.0.0", "2.2.2.2", "0.0.0.0" }; var ipns = new List(); @@ -52,22 +52,22 @@ public void WideSubnet2() Assert.AreEqual("0.0.0.0/4", ipnetwork.ToString(), "ipnetwork"); } - /// - /// Tests WideSubnet with null input to ensure it throws ArgumentNullException. - /// - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void WideSubnetNull() + /// + /// Tests WideSubnet with null input to ensure it throws ArgumentNullException. + /// + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void WideSubnetNull() { var ipnetwork = IPNetwork2.WideSubnet(null); } - /// - /// Tests WideSubnet with invalid IP addresses to ensure it throws ArgumentException. - /// - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void WideSubnetNull2() + /// + /// Tests WideSubnet with invalid IP addresses to ensure it throws ArgumentException. + /// + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void WideSubnetNull2() { string[] ips = { "a", "b", "e", "d" }; var ipns = new List(); @@ -83,12 +83,12 @@ public void WideSubnetNull2() var ipnetwork = IPNetwork2.WideSubnet(ipns.ToArray()); } - /// - /// Tests WideSubnet with mixed IPv4 and IPv6 addresses to ensure it throws ArgumentException. - /// - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void WideSubnetMixed() + /// + /// Tests WideSubnet with mixed IPv4 and IPv6 addresses to ensure it throws ArgumentException. + /// + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void WideSubnetMixed() { var ipns = new List { @@ -97,5 +97,4 @@ public void WideSubnetMixed() }; var ipnetwork = IPNetwork2.WideSubnet(ipns.ToArray()); } - } } \ No newline at end of file diff --git a/src/TestProject/IPNetworkV6UnitTest.cs b/src/TestProject/IPNetworkV6UnitTest.cs index 47cd5989..8663b532 100644 --- a/src/TestProject/IPNetworkV6UnitTest.cs +++ b/src/TestProject/IPNetworkV6UnitTest.cs @@ -2,43 +2,43 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class IPNetworkV6UnitTest { - [TestClass] - public class IPNetworkV6UnitTest - { - #region Parse + #region Parse - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne8() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne8() { var ipnet = IPNetwork2.Parse("xxxx::", "xxxx::"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne9() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne9() { var ipnet = IPNetwork2.Parse("::", "xxxx::"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne10() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne10() { var ipnet = IPNetwork2.Parse("xxxx::", 0); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseIPAddressNetmaskAne11() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseIPAddressNetmaskAne11() { var ipnet = IPNetwork2.Parse("::", 129); } - [TestMethod] - public void TestParsev6_128() + [TestMethod] + public void TestParsev6_128() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; @@ -64,8 +64,8 @@ public void TestParsev6_128() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_127() + [TestMethod] + public void TestParsev6_127() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; @@ -91,8 +91,8 @@ public void TestParsev6_127() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_126() + [TestMethod] + public void TestParsev6_126() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; @@ -118,8 +118,8 @@ public void TestParsev6_126() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_125() + [TestMethod] + public void TestParsev6_125() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; @@ -145,8 +145,8 @@ public void TestParsev6_125() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_124() + [TestMethod] + public void TestParsev6_124() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:db8::"; @@ -172,8 +172,8 @@ public void TestParsev6_124() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_123() + [TestMethod] + public void TestParsev6_123() { IPNetwork2 ipnetwork = null; string ipaddress = "2001:0db8::"; @@ -199,8 +199,8 @@ public void TestParsev6_123() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_112() + [TestMethod] + public void TestParsev6_112() { IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -226,8 +226,8 @@ public void TestParsev6_112() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_64() + [TestMethod] + public void TestParsev6_64() { IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:1234:1234:1234:1234"; @@ -253,8 +253,8 @@ public void TestParsev6_64() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_16() + [TestMethod] + public void TestParsev6_16() { IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -280,8 +280,8 @@ public void TestParsev6_16() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParsev6_EDGE() + [TestMethod] + public void TestParsev6_EDGE() { IPNetwork2 ipnetwork = null; string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -305,12 +305,12 @@ public void TestParsev6_EDGE() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - #endregion + #endregion - #region ParseString + #region ParseString - [TestMethod] - public void TestParseString1() + [TestMethod] + public void TestParseString1() { string ipaddress = "2001:0db8:: ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"; @@ -331,8 +331,8 @@ public void TestParseString1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString3() + [TestMethod] + public void TestParseString3() { string ipaddress = ":: ::"; @@ -353,8 +353,8 @@ public void TestParseString3() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString4() + [TestMethod] + public void TestParseString4() { string ipaddress = "::/0"; @@ -375,8 +375,8 @@ public void TestParseString4() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString5() + [TestMethod] + public void TestParseString5() { string ipaddress = "::/32"; @@ -397,8 +397,8 @@ public void TestParseString5() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString6() + [TestMethod] + public void TestParseString6() { string ipaddress = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128"; @@ -419,8 +419,8 @@ public void TestParseString6() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString7_Uppercase_ipv6_must_parse() + [TestMethod] + public void TestParseString7_Uppercase_ipv6_must_parse() { string ipaddress = "2FFF:FFFF:123::/60"; @@ -442,8 +442,8 @@ public void TestParseString7_Uppercase_ipv6_must_parse() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString8_Uppercase_ipv6_must_parse() + [TestMethod] + public void TestParseString8_Uppercase_ipv6_must_parse() { string ipaddress = "2FFF:FFFE:123::/60"; @@ -465,8 +465,8 @@ public void TestParseString8_Uppercase_ipv6_must_parse() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString9_Uppercase_ipv6_must_parse() + [TestMethod] + public void TestParseString9_Uppercase_ipv6_must_parse() { string ipaddress = "2FFF:FFFC:123::/60"; @@ -488,8 +488,8 @@ public void TestParseString9_Uppercase_ipv6_must_parse() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString10_Uppercase_ipv6_must_parse() + [TestMethod] + public void TestParseString10_Uppercase_ipv6_must_parse() { string ipaddress = "2FFF:FFFA:123::/60"; @@ -511,8 +511,8 @@ public void TestParseString10_Uppercase_ipv6_must_parse() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseString11_Uppercase_ipv6_must_parse() + [TestMethod] + public void TestParseString11_Uppercase_ipv6_must_parse() { string ipaddress = "FFFF:FFF1:123::/60"; @@ -534,8 +534,8 @@ public void TestParseString11_Uppercase_ipv6_must_parse() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask1() + [TestMethod] + public void TestParseIPAddressNoNetmask1() { string ipaddress = "2001:0db8::"; var ipnetwork = IPNetwork2.Parse(ipaddress); @@ -556,8 +556,8 @@ public void TestParseIPAddressNoNetmask1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask4() + [TestMethod] + public void TestParseIPAddressNoNetmask4() { string ipaddress = "::"; var ipnetwork = IPNetwork2.Parse(ipaddress); @@ -578,8 +578,8 @@ public void TestParseIPAddressNoNetmask4() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask5() + [TestMethod] + public void TestParseIPAddressNoNetmask5() { string ipaddress = "2001:0db8::1"; var ipnetwork = IPNetwork2.Parse(ipaddress); @@ -600,8 +600,8 @@ public void TestParseIPAddressNoNetmask5() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask1_ClassFull() + [TestMethod] + public void TestParseIPAddressNoNetmask1_ClassFull() { string ipaddress = "2001:0db8::"; ICidrGuess cidrGess = CidrGuess.ClassFull; @@ -624,8 +624,8 @@ public void TestParseIPAddressNoNetmask1_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask4_ClassFull() + [TestMethod] + public void TestParseIPAddressNoNetmask4_ClassFull() { string ipaddress = "::"; ICidrGuess cidrGess = CidrGuess.ClassFull; @@ -648,8 +648,8 @@ public void TestParseIPAddressNoNetmask4_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask5_ClassFull() + [TestMethod] + public void TestParseIPAddressNoNetmask5_ClassFull() { string ipaddress = "2001:0db8::1"; ICidrGuess cidrGess = CidrGuess.ClassFull; @@ -672,8 +672,8 @@ public void TestParseIPAddressNoNetmask5_ClassFull() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask1_ClassLess() + [TestMethod] + public void TestParseIPAddressNoNetmask1_ClassLess() { string ipaddress = "2001:0db8::"; ICidrGuess cidrGess = CidrGuess.ClassLess; @@ -696,8 +696,8 @@ public void TestParseIPAddressNoNetmask1_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask4_ClassLess() + [TestMethod] + public void TestParseIPAddressNoNetmask4_ClassLess() { string ipaddress = "::"; ICidrGuess cidrGess = CidrGuess.ClassLess; @@ -720,8 +720,8 @@ public void TestParseIPAddressNoNetmask4_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestParseIPAddressNoNetmask5_ClassLess() + [TestMethod] + public void TestParseIPAddressNoNetmask5_ClassLess() { string ipaddress = "2001:0db8::1"; ICidrGuess cidrGess = CidrGuess.ClassLess; @@ -744,36 +744,36 @@ public void TestParseIPAddressNoNetmask5_ClassLess() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseStringAe1() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestParseStringAe1() { string ipaddress = "garbage"; var ipnetwork = IPNetwork2.Parse(ipaddress); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestParseStringAe2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + 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); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringAne1() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringAne1() { string ipaddress = null; var ipnetwork = IPNetwork2.Parse(ipaddress); } - #endregion + #endregion - #region ParseStringString + #region ParseStringString - [TestMethod] - public void TestParseStringString1() + [TestMethod] + public void TestParseStringString1() { string ipaddress = "2001:0db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"; @@ -782,9 +782,9 @@ public void TestParseStringString1() Assert.AreEqual("2001:db8::/124", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString3() { string ipaddress = "2001:0db8::"; string netmask = null; @@ -792,9 +792,9 @@ public void TestParseStringString3() var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestParseStringString5() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestParseStringString5() { string ipaddress = "2001:0db8::"; string netmask = string.Empty; @@ -802,12 +802,12 @@ public void TestParseStringString5() var ipnetwork = IPNetwork2.Parse(ipaddress, netmask); } - #endregion + #endregion - #region ParseIpIp + #region ParseIpIp - [TestMethod] - public void ParseIpIp1() + [TestMethod] + public void ParseIpIp1() { string ipaddress = "2001:0db8::"; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"; @@ -817,9 +817,9 @@ public void ParseIpIp1() Assert.AreEqual("2001:db8::/124", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void ParseIpIp3() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void ParseIpIp3() { string ipaddress = "2001:0db8::"; var ip = IPAddress.Parse(ipaddress); @@ -827,12 +827,12 @@ public void ParseIpIp3() var ipnetwork = IPNetwork2.Parse(ip, netm); } - #endregion + #endregion - #region CtorWithIpAndCidr + #region CtorWithIpAndCidr - [TestMethod] - public void CtorWithIpAndCidr1() + [TestMethod] + public void CtorWithIpAndCidr1() { string ipaddress = "2001:0db8::"; var ip = IPAddress.Parse(ipaddress); @@ -840,35 +840,35 @@ public void CtorWithIpAndCidr1() Assert.AreEqual("2001:db8::/124", ipnetwork.ToString(), "network"); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void CtorWithIpAndCidr2() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void CtorWithIpAndCidr2() { string ipaddress = "2001:db8::"; var ip = IPAddress.Parse(ipaddress); var ipnetwork = new IPNetwork2(ip, 129); } - #endregion + #endregion - #region ToCidr + #region ToCidr - [TestMethod] - public void TestToCidrAe() + [TestMethod] + public void TestToCidrAe() { byte cidr = IPNetwork2.ToCidr(IPAddress.IPv6Any); Assert.AreEqual(0, cidr, "cidr"); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestToCidrAe2() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestToCidrAe2() { IPNetwork2.ToCidr(IPAddress.Parse("2001:db8:3:4:5:6:7:8")); } - [TestMethod] - public void TestToCidr128() + [TestMethod] + public void TestToCidr128() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); byte cidr = 128; @@ -877,8 +877,8 @@ public void TestToCidr128() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr127() + [TestMethod] + public void TestToCidr127() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"); byte cidr = 127; @@ -887,8 +887,8 @@ public void TestToCidr127() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr126() + [TestMethod] + public void TestToCidr126() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc"); byte cidr = 126; @@ -897,8 +897,8 @@ public void TestToCidr126() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr125() + [TestMethod] + public void TestToCidr125() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff8"); byte cidr = 125; @@ -907,8 +907,8 @@ public void TestToCidr125() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr124() + [TestMethod] + public void TestToCidr124() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); byte cidr = 124; @@ -917,8 +917,8 @@ public void TestToCidr124() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr123() + [TestMethod] + public void TestToCidr123() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffe0"); byte cidr = 123; @@ -927,8 +927,8 @@ public void TestToCidr123() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr122() + [TestMethod] + public void TestToCidr122() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffc0"); byte cidr = 122; @@ -937,8 +937,8 @@ public void TestToCidr122() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr121() + [TestMethod] + public void TestToCidr121() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff80"); byte cidr = 121; @@ -947,8 +947,8 @@ public void TestToCidr121() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr120() + [TestMethod] + public void TestToCidr120() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00"); byte cidr = 120; @@ -957,8 +957,8 @@ public void TestToCidr120() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr119() + [TestMethod] + public void TestToCidr119() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fe00"); byte cidr = 119; @@ -967,8 +967,8 @@ public void TestToCidr119() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr118() + [TestMethod] + public void TestToCidr118() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fc00"); byte cidr = 118; @@ -977,8 +977,8 @@ public void TestToCidr118() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr117() + [TestMethod] + public void TestToCidr117() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f800"); byte cidr = 117; @@ -987,8 +987,8 @@ public void TestToCidr117() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr116() + [TestMethod] + public void TestToCidr116() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f000"); byte cidr = 116; @@ -997,8 +997,8 @@ public void TestToCidr116() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr115() + [TestMethod] + public void TestToCidr115() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:e000"); byte cidr = 115; @@ -1007,8 +1007,8 @@ public void TestToCidr115() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr114() + [TestMethod] + public void TestToCidr114() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:c000"); byte cidr = 114; @@ -1017,8 +1017,8 @@ public void TestToCidr114() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr113() + [TestMethod] + public void TestToCidr113() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000"); byte cidr = 113; @@ -1027,8 +1027,8 @@ public void TestToCidr113() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr112() + [TestMethod] + public void TestToCidr112() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); byte cidr = 112; @@ -1037,8 +1037,8 @@ public void TestToCidr112() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr111() + [TestMethod] + public void TestToCidr111() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffe:0"); byte cidr = 111; @@ -1047,8 +1047,8 @@ public void TestToCidr111() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr110() + [TestMethod] + public void TestToCidr110() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffc:0"); byte cidr = 110; @@ -1057,8 +1057,8 @@ public void TestToCidr110() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr109() + [TestMethod] + public void TestToCidr109() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff8:0"); byte cidr = 109; @@ -1067,8 +1067,8 @@ public void TestToCidr109() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr108() + [TestMethod] + public void TestToCidr108() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff0:0"); byte cidr = 108; @@ -1077,8 +1077,8 @@ public void TestToCidr108() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr001() + [TestMethod] + public void TestToCidr001() { var mask = IPAddress.Parse("8000::"); byte cidr = 1; @@ -1087,8 +1087,8 @@ public void TestToCidr001() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestToCidr000() + [TestMethod] + public void TestToCidr000() { var mask = IPAddress.Parse("::"); byte cidr = 0; @@ -1097,12 +1097,12 @@ public void TestToCidr000() Assert.AreEqual(cidr, result, "cidr"); } - #endregion + #endregion - #region TryToCidr + #region TryToCidr - [TestMethod] - public void TestTryToCidr128() + [TestMethod] + public void TestTryToCidr128() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); byte cidr = 128; @@ -1113,8 +1113,8 @@ public void TestTryToCidr128() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr127() + [TestMethod] + public void TestTryToCidr127() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"); byte cidr = 127; @@ -1125,8 +1125,8 @@ public void TestTryToCidr127() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr126() + [TestMethod] + public void TestTryToCidr126() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc"); byte cidr = 126; @@ -1137,8 +1137,8 @@ public void TestTryToCidr126() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr125() + [TestMethod] + public void TestTryToCidr125() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff8"); byte cidr = 125; @@ -1149,8 +1149,8 @@ public void TestTryToCidr125() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr124() + [TestMethod] + public void TestTryToCidr124() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); byte cidr = 124; @@ -1161,8 +1161,8 @@ public void TestTryToCidr124() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr123() + [TestMethod] + public void TestTryToCidr123() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffe0"); byte cidr = 123; @@ -1173,8 +1173,8 @@ public void TestTryToCidr123() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr122() + [TestMethod] + public void TestTryToCidr122() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffc0"); byte cidr = 122; @@ -1185,8 +1185,8 @@ public void TestTryToCidr122() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr121() + [TestMethod] + public void TestTryToCidr121() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff80"); byte cidr = 121; @@ -1197,8 +1197,8 @@ public void TestTryToCidr121() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr120() + [TestMethod] + public void TestTryToCidr120() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00"); byte cidr = 120; @@ -1209,8 +1209,8 @@ public void TestTryToCidr120() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr119() + [TestMethod] + public void TestTryToCidr119() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fe00"); byte cidr = 119; @@ -1221,8 +1221,8 @@ public void TestTryToCidr119() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr118() + [TestMethod] + public void TestTryToCidr118() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fc00"); byte cidr = 118; @@ -1233,8 +1233,8 @@ public void TestTryToCidr118() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr117() + [TestMethod] + public void TestTryToCidr117() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f800"); byte cidr = 117; @@ -1245,8 +1245,8 @@ public void TestTryToCidr117() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr116() + [TestMethod] + public void TestTryToCidr116() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:f000"); byte cidr = 116; @@ -1257,8 +1257,8 @@ public void TestTryToCidr116() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr115() + [TestMethod] + public void TestTryToCidr115() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:e000"); byte cidr = 115; @@ -1269,8 +1269,8 @@ public void TestTryToCidr115() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr114() + [TestMethod] + public void TestTryToCidr114() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:c000"); byte cidr = 114; @@ -1281,8 +1281,8 @@ public void TestTryToCidr114() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr113() + [TestMethod] + public void TestTryToCidr113() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000"); byte cidr = 113; @@ -1293,8 +1293,8 @@ public void TestTryToCidr113() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr112() + [TestMethod] + public void TestTryToCidr112() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); byte cidr = 112; @@ -1305,8 +1305,8 @@ public void TestTryToCidr112() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr111() + [TestMethod] + public void TestTryToCidr111() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffe:0"); byte cidr = 111; @@ -1317,8 +1317,8 @@ public void TestTryToCidr111() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr110() + [TestMethod] + public void TestTryToCidr110() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fffc:0"); byte cidr = 110; @@ -1329,8 +1329,8 @@ public void TestTryToCidr110() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr109() + [TestMethod] + public void TestTryToCidr109() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff8:0"); byte cidr = 109; @@ -1341,8 +1341,8 @@ public void TestTryToCidr109() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr108() + [TestMethod] + public void TestTryToCidr108() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:fff0:0"); byte cidr = 108; @@ -1353,8 +1353,8 @@ public void TestTryToCidr108() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr001() + [TestMethod] + public void TestTryToCidr001() { var mask = IPAddress.Parse("8000::"); byte cidr = 1; @@ -1365,8 +1365,8 @@ public void TestTryToCidr001() Assert.AreEqual(cidr, result, "cidr"); } - [TestMethod] - public void TestTryToCidr000() + [TestMethod] + public void TestTryToCidr000() { var mask = IPAddress.Parse("::"); byte cidr = 0; @@ -1377,12 +1377,12 @@ public void TestTryToCidr000() Assert.AreEqual(cidr, result, "cidr"); } - #endregion + #endregion - #region ToBigInteger + #region ToBigInteger - [TestMethod] - public void TestToBigInteger32() + [TestMethod] + public void TestToBigInteger32() { var mask = IPAddress.Parse("::f"); uint uintMask = 0xf; @@ -1391,8 +1391,8 @@ public void TestToBigInteger32() Assert.AreEqual(uintMask, result, "uint"); } - [TestMethod] - public void TestToBigInteger24() + [TestMethod] + public void TestToBigInteger24() { var mask = IPAddress.Parse("::fff"); uint uintMask = 0xfff; @@ -1401,8 +1401,8 @@ public void TestToBigInteger24() Assert.AreEqual(uintMask, result, "uint"); } - [TestMethod] - public void TestToBigInteger16() + [TestMethod] + public void TestToBigInteger16() { var mask = IPAddress.Parse("::ff"); uint uintMask = 0xff; @@ -1411,8 +1411,8 @@ public void TestToBigInteger16() Assert.AreEqual(uintMask, result, "uint"); } - [TestMethod] - public void TestToBigInteger8() + [TestMethod] + public void TestToBigInteger8() { var mask = IPAddress.Parse("::ff00:0"); uint uintMask = 0xff000000; @@ -1421,8 +1421,8 @@ public void TestToBigInteger8() Assert.AreEqual(uintMask, result, "uint"); } - [TestMethod] - public void TestToBigInteger0() + [TestMethod] + public void TestToBigInteger0() { var mask = IPAddress.Parse("::"); uint uintMask = 0x00000000; @@ -1431,12 +1431,12 @@ public void TestToBigInteger0() Assert.AreEqual(uintMask, result, "uint"); } - #endregion + #endregion - #region TryToBigInteger + #region TryToBigInteger - [TestMethod] - public void TestTryToBigInteger32() + [TestMethod] + public void TestTryToBigInteger32() { var mask = IPAddress.Parse("::ffff:ffff"); uint uintMask = 0xffffffff; @@ -1447,8 +1447,8 @@ public void TestTryToBigInteger32() Assert.AreEqual(true, parsed, "parsed"); } - [TestMethod] - public void TestTryToBigInteger24() + [TestMethod] + public void TestTryToBigInteger24() { var mask = IPAddress.Parse("::ffff:ff00"); uint uintMask = 0xffffff00; @@ -1459,8 +1459,8 @@ public void TestTryToBigInteger24() Assert.AreEqual(true, parsed, "parsed"); } - [TestMethod] - public void TestTryToBigInteger16() + [TestMethod] + public void TestTryToBigInteger16() { var mask = IPAddress.Parse("::ffff:0"); uint uintMask = 0xffff0000; @@ -1471,8 +1471,8 @@ public void TestTryToBigInteger16() Assert.AreEqual(true, parsed, "parsed"); } - [TestMethod] - public void TestTryToBigInteger8() + [TestMethod] + public void TestTryToBigInteger8() { var mask = IPAddress.Parse("::ff00:0"); uint uintMask = 0xff000000; @@ -1484,8 +1484,8 @@ public void TestTryToBigInteger8() Assert.AreEqual(true, parsed, "parsed"); } - [TestMethod] - public void TestTryToBigInteger0() + [TestMethod] + public void TestTryToBigInteger0() { var mask = IPAddress.Parse("::"); uint uintMask = 0x00000000; @@ -1496,12 +1496,12 @@ public void TestTryToBigInteger0() Assert.AreEqual(true, parsed, "parsed"); } - #endregion + #endregion - #region TryToNetmask + #region TryToNetmask - [TestMethod] - public void TryToNetmask1() + [TestMethod] + public void TryToNetmask1() { IPAddress result = null; bool parsed = IPNetwork2.TryToNetmask(0, AddressFamily.InterNetworkV6, out result); @@ -1511,8 +1511,8 @@ public void TryToNetmask1() Assert.AreEqual(true, parsed, "parsed"); } - [TestMethod] - public void TryToNetmask2() + [TestMethod] + public void TryToNetmask2() { IPAddress result = null; bool parsed = IPNetwork2.TryToNetmask(33, AddressFamily.InterNetworkV6, out result); @@ -1522,12 +1522,12 @@ public void TryToNetmask2() Assert.AreEqual(true, parsed, "parsed"); } - #endregion + #endregion - #region ToNetmask + #region ToNetmask - [TestMethod] - public void ToNetmask128() + [TestMethod] + public void ToNetmask128() { byte cidr = 128; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"; @@ -1536,8 +1536,8 @@ public void ToNetmask128() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - public void ToNetmask31() + [TestMethod] + public void ToNetmask31() { byte cidr = 127; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe"; @@ -1546,8 +1546,8 @@ public void ToNetmask31() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - public void ToNetmask30() + [TestMethod] + public void ToNetmask30() { byte cidr = 126; string netmask = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffc"; @@ -1556,8 +1556,8 @@ public void ToNetmask30() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - public void ToNetmask1() + [TestMethod] + public void ToNetmask1() { byte cidr = 1; string netmask = "8000::"; @@ -1566,8 +1566,8 @@ public void ToNetmask1() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - public void ToNetmask0() + [TestMethod] + public void ToNetmask0() { byte cidr = 0; string netmask = "::"; @@ -1576,20 +1576,20 @@ public void ToNetmask0() Assert.AreEqual(netmask, result, "netmask"); } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void ToNetmaskOore1() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void ToNetmaskOore1() { byte cidr = 129; string result = IPNetwork2.ToNetmask(cidr, AddressFamily.InterNetworkV6).ToString(); } - #endregion + #endregion - #region ValidNetmask + #region ValidNetmask - [TestMethod] - public void TestValidNetmask0() + [TestMethod] + public void TestValidNetmask0() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); bool expected = true; @@ -1598,8 +1598,8 @@ public void TestValidNetmask0() Assert.AreEqual(expected, result, "ValidNetmask"); } - [TestMethod] - public void TestValidNetmask1() + [TestMethod] + public void TestValidNetmask1() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); bool expected = true; @@ -1608,8 +1608,8 @@ public void TestValidNetmask1() Assert.AreEqual(expected, result, "ValidNetmask"); } - [TestMethod] - public void TestValidNetmask2() + [TestMethod] + public void TestValidNetmask2() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); bool expected = true; @@ -1618,8 +1618,8 @@ public void TestValidNetmask2() Assert.AreEqual(expected, result, "ValidNetmask"); } - [TestMethod] - public void TestValidNetmaskEae1() + [TestMethod] + public void TestValidNetmaskEae1() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:0000:ffff"); bool expected = false; @@ -1628,8 +1628,8 @@ public void TestValidNetmaskEae1() Assert.AreEqual(expected, result, "ValidNetmask"); } - [TestMethod] - public void TestValidNetmaskEae3() + [TestMethod] + public void TestValidNetmaskEae3() { var mask = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:0000:0001"); bool expected = false; @@ -1638,12 +1638,12 @@ public void TestValidNetmaskEae3() Assert.AreEqual(expected, result, "ValidNetmask"); } - #endregion + #endregion - #region BitsSet + #region BitsSet - [TestMethod] - public void TestBitsSet128() + [TestMethod] + public void TestBitsSet128() { var ip = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); uint bits = 128; @@ -1652,8 +1652,8 @@ public void TestBitsSet128() Assert.AreEqual(bits, result, "BitsSet"); } - [TestMethod] - public void TestBitsSet120() + [TestMethod] + public void TestBitsSet120() { var ip = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:fff0"); uint bits = 124; @@ -1662,8 +1662,8 @@ public void TestBitsSet120() Assert.AreEqual(bits, result, "BitsSet"); } - [TestMethod] - public void TestBitsSet16() + [TestMethod] + public void TestBitsSet16() { var ip = IPAddress.Parse("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0000"); uint bits = 112; @@ -1672,8 +1672,8 @@ public void TestBitsSet16() Assert.AreEqual(bits, result, "BitsSet"); } - [TestMethod] - public void TestBitsSet4() + [TestMethod] + public void TestBitsSet4() { var ip = IPAddress.Parse("f0f0:f0f0:f0f0:f0f0:f0f0:f0f0:f0f0:f0f0"); uint bits = 64; @@ -1682,12 +1682,12 @@ public void TestBitsSet4() Assert.AreEqual(bits, result, "BitsSet"); } - #endregion + #endregion - #region Contains + #region Contains - [TestMethod] - public void TestContains1() + [TestMethod] + public void TestContains1() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipaddress = IPAddress.Parse("2001:0db8::1"); @@ -1698,8 +1698,8 @@ public void TestContains1() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - public void TestContains2() + [TestMethod] + public void TestContains2() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipaddress = IPAddress.Parse("2001:0db8:0:1::"); @@ -1710,8 +1710,8 @@ public void TestContains2() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - public void TestContains3() + [TestMethod] + public void TestContains3() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/64"); @@ -1722,8 +1722,8 @@ public void TestContains3() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - public void TestContains4() + [TestMethod] + public void TestContains4() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/65"); @@ -1734,8 +1734,8 @@ public void TestContains4() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - public void TestContains5() + [TestMethod] + public void TestContains5() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipnetwork2 = IPNetwork2.Parse("2001:0db8:1::/65"); @@ -1746,8 +1746,8 @@ public void TestContains5() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - public void TestContains6() + [TestMethod] + public void TestContains6() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); var ipnetwork2 = IPNetwork2.Parse("2001:0db8::/63"); @@ -1758,9 +1758,9 @@ public void TestContains6() Assert.AreEqual(expected, result, "contains"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestContains10() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestContains10() { var ipnetwork = IPNetwork2.Parse("::/0"); IPAddress ipaddress = null; @@ -1768,8 +1768,8 @@ public void TestContains10() bool result = ipnetwork.Contains(ipaddress); } - [TestMethod] - public void TestContains11_different_address_family_returns_false() + [TestMethod] + public void TestContains11_different_address_family_returns_false() { var ipnetwork = IPNetwork2.Parse("::1"); // IPv6 var ipaddress = IPAddress.Parse("127.0.0.1"); // IPv4 @@ -1778,21 +1778,21 @@ public void TestContains11_different_address_family_returns_false() Assert.AreEqual(false, result, "contains"); } - #endregion + #endregion - #region Overlap + #region Overlap - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestOverlap2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestOverlap2() { var network1 = IPNetwork2.Parse("2001:0db8::/0"); IPNetwork2 network2 = null; network1.Overlap(network2); } - [TestMethod] - public void TestOverlap3() + [TestMethod] + public void TestOverlap3() { var network1 = IPNetwork2.Parse("2001:0db8::/64"); var network2 = IPNetwork2.Parse("2001:0db8::/64"); @@ -1802,8 +1802,8 @@ public void TestOverlap3() Assert.AreEqual(expected, result, "overlap"); } - [TestMethod] - public void TestOverlap4() + [TestMethod] + public void TestOverlap4() { var network1 = IPNetwork2.Parse("2001:0db8::/64"); var network2 = IPNetwork2.Parse("2001:0db8:0:0:1::/65"); @@ -1813,8 +1813,8 @@ public void TestOverlap4() Assert.AreEqual(expected, result, "overlap"); } - [TestMethod] - public void TestOverlap5() + [TestMethod] + public void TestOverlap5() { var network1 = IPNetwork2.Parse("2001:0db8:0:1::/68"); var network2 = IPNetwork2.Parse("2001:0db8:0:2::/68"); @@ -1824,8 +1824,8 @@ public void TestOverlap5() Assert.AreEqual(expected, result, "overlap"); } - [TestMethod] - public void TestOverlap6() + [TestMethod] + public void TestOverlap6() { var network1 = IPNetwork2.Parse("2001:0db8:0:1::/68"); var network2 = IPNetwork2.Parse("2001:0db8:0:2::/62"); @@ -1835,12 +1835,12 @@ public void TestOverlap6() Assert.AreEqual(expected, result, "overlap"); } - #endregion + #endregion - #region Examples + #region Examples - [TestMethod] - public void Example1() + [TestMethod] + public void Example1() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); @@ -1853,8 +1853,8 @@ public void Example1() Console.WriteLine("Cidr : {0}", ipnetwork.Cidr); } - [TestMethod] - public void Example2() + [TestMethod] + public void Example2() { var ipnetwork = IPNetwork2.Parse("2001:0db8::/64"); @@ -1881,8 +1881,8 @@ public void Example2() Console.WriteLine("{0} overlap {1} : {2}", ipnetwork, ipnetwork3, overlap2); } - [TestMethod] - public void Example4() + [TestMethod] + public void Example4() { var wholeInternet = IPNetwork2.Parse("::/0"); byte newCidr = 2; @@ -1899,8 +1899,8 @@ public void Example4() } } - [TestMethod] - public void Example5() + [TestMethod] + public void Example5() { var ipnetwork1 = IPNetwork2.Parse("2001:0db8::/64"); var ipnetwork2 = IPNetwork2.Parse("2001:0db9::/64"); @@ -1909,8 +1909,8 @@ public void Example5() Console.WriteLine("{0} + {1} = {2}", ipnetwork1, ipnetwork2, ipnetwork3[0]); } - [TestMethod] - public void Example6() + [TestMethod] + public void Example6() { var ipnetwork = IPNetwork2.Parse("fe80::202:b3ff:fe1e:8329/24"); @@ -1924,8 +1924,8 @@ public void Example6() Console.WriteLine("{0} contains {1} : {2}", ipnetwork, ipaddress2, contains2); } - [TestMethod] - public void Example8() + [TestMethod] + public void Example8() { var network = IPNetwork2.Parse("::/124"); IPNetworkCollection ips = network.Subnet(128); @@ -1936,8 +1936,8 @@ public void Example8() } } - [TestMethod] - public void Example11() + [TestMethod] + public void Example11() { var defaultParse = IPNetwork2.Parse("::1"); var classFullParse = IPNetwork2.Parse("::1", CidrGuess.ClassFull); @@ -1948,12 +1948,12 @@ public void Example11() Console.WriteLine("IPV6 ClassLess Parse : {0}", classLessParse); } - #endregion + #endregion - #region ToString + #region ToString - [TestMethod] - public void TestToString() + [TestMethod] + public void TestToString() { var ipnetwork = IPNetwork2.Parse("2001:0db8:0000:0000:0000:0000:0000:0000/32"); string expected = "2001:db8::/32"; @@ -1962,8 +1962,8 @@ public void TestToString() Assert.AreEqual(expected, result, "ToString"); } - [TestMethod] - public void TestToString1() + [TestMethod] + public void TestToString1() { var ipnetwork = IPNetwork2.Parse("2001:0db8:1:2:3:4:5:6/32"); string expected = "2001:db8::/32"; @@ -1972,8 +1972,8 @@ public void TestToString1() Assert.AreEqual(expected, result, "ToString"); } - [TestMethod] - public void TestToString2() + [TestMethod] + public void TestToString2() { var ipnetwork = IPNetwork2.Parse("2001:0db8:1:2:3:4:5:6/64"); string expected = "2001:db8:1:2::/64"; @@ -1982,8 +1982,8 @@ public void TestToString2() Assert.AreEqual(expected, result, "ToString"); } - [TestMethod] - public void TestToString3() + [TestMethod] + public void TestToString3() { var ipnetwork = IPNetwork2.Parse("2001:0db8:1:2:3:4:5:6/100"); string expected = "2001:db8:1:2:3:4::/100"; @@ -1992,13 +1992,13 @@ public void TestToString3() Assert.AreEqual(expected, result, "ToString"); } - #endregion + #endregion - #region Subnet + #region Subnet - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestSubnet3() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestSubnet3() { var ipnetwork = IPNetwork2.Parse("::"); byte cidr = 129; @@ -2006,9 +2006,9 @@ public void TestSubnet3() IPNetworkCollection subnets = ipnetwork.Subnet(cidr); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] - public void TestSubnet4() + [TestMethod] + [ExpectedException(typeof(ArgumentException))] + public void TestSubnet4() { var ipnetwork = IPNetwork2.Parse("::"); byte cidr = 1; @@ -2016,8 +2016,8 @@ public void TestSubnet4() IPNetworkCollection subnets = ipnetwork.Subnet(cidr); } - [TestMethod] - public void TestSubnet5() + [TestMethod] + public void TestSubnet5() { var ipnetwork = IPNetwork2.Parse("1:1:1:1:1:1:1:1"); byte cidr = 65; @@ -2028,8 +2028,8 @@ public void TestSubnet5() Assert.AreEqual("1:1:1:1:8000::/65", subnets[1].ToString(), "subnet2"); } - [TestMethod] - public void TestSubnet6() + [TestMethod] + public void TestSubnet6() { var ipnetwork = IPNetwork2.Parse("1:1:1:1:1:1:1:1"); byte cidr = 68; @@ -2054,8 +2054,8 @@ public void TestSubnet6() Assert.AreEqual("1:1:1:1:f000::/68", subnets[15].ToString(), "subnet16"); } - [TestMethod] - public void TestSubnet7() + [TestMethod] + public void TestSubnet7() { var ipnetwork = IPNetwork2.Parse("1:1:1:1:1:1:1:1"); byte cidr = 72; @@ -2066,8 +2066,8 @@ public void TestSubnet7() Assert.AreEqual("1:1:1:1:ff00::/72", subnets[255].ToString(), "subnet256"); } - [TestMethod] - public void TestSubnet9() + [TestMethod] + public void TestSubnet9() { var ipnetwork = IPNetwork2.Parse("2001:db08:1:1:1:1:1:1"); byte cidr = 128; @@ -2079,8 +2079,8 @@ public void TestSubnet9() Assert.AreEqual("2001:db08:1:1:ffff:ffff:ffff:ffff/128", subnets[count - 1].ToString(), "last"); } - [TestMethod] - public void TestSubnet10() + [TestMethod] + public void TestSubnet10() { var ipnetwork = IPNetwork2.Parse("2001:db08::/0"); byte cidr = 128; @@ -2093,8 +2093,8 @@ public void TestSubnet10() Assert.AreEqual("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128", subnets[count - 1].ToString(), "last"); } - [TestMethod] - public void TestSubnet12() + [TestMethod] + public void TestSubnet12() { var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 70; @@ -2107,9 +2107,9 @@ public void TestSubnet12() } } - [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] - public void TestSubnet13() + [TestMethod] + [ExpectedException(typeof(ArgumentOutOfRangeException))] + public void TestSubnet13() { var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 70; @@ -2117,8 +2117,8 @@ public void TestSubnet13() IPNetwork2 error = subnets[1000]; } - [TestMethod] - public void TestSubnet14() + [TestMethod] + public void TestSubnet14() { var network = IPNetwork2.Parse("15.0.0.0/8"); IPNetworkCollection subnets = network.Subnet(12); @@ -2133,12 +2133,12 @@ public void TestSubnet14() } } - #endregion + #endregion - #region TrySubnet + #region TrySubnet - [TestMethod] - public void TestTrySubnet3() + [TestMethod] + public void TestTrySubnet3() { var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 255; @@ -2149,8 +2149,8 @@ public void TestTrySubnet3() Assert.AreEqual(false, subnetted, "subnetted"); } - [TestMethod] - public void TestTrySubnet4() + [TestMethod] + public void TestTrySubnet4() { var ipnetwork = IPNetwork2.Parse("2001:db08::/64"); byte cidr = 63; @@ -2161,8 +2161,8 @@ public void TestTrySubnet4() Assert.AreEqual(false, subnetted, "subnetted"); } - [TestMethod] - public void TestTrySubnet5() + [TestMethod] + public void TestTrySubnet5() { var ipnetwork = IPNetwork2.Parse("2001:db8::/64"); byte cidr = 65; @@ -2176,8 +2176,8 @@ public void TestTrySubnet5() Assert.AreEqual("2001:db8:0:0:8000::/65", subnets[1].ToString(), "subnet2"); } - [TestMethod] - public void TestTrySubnet6() + [TestMethod] + public void TestTrySubnet6() { var ipnetwork = IPNetwork2.Parse("2001:db8::/64"); byte cidr = 68; @@ -2205,12 +2205,12 @@ public void TestTrySubnet6() Assert.AreEqual("2001:db8:0:0:f000::/68", subnets[15].ToString(), "subnet16"); } - #endregion + #endregion - #region TrySupernet + #region TrySupernet - [TestMethod] - public void TestTrySupernet1() + [TestMethod] + public void TestTrySupernet1() { var network1 = IPNetwork2.Parse("2001:db8::/65"); var network2 = IPNetwork2.Parse("2001:db8:0:0:8000::/65"); @@ -2223,9 +2223,9 @@ public void TestTrySupernet1() Assert.AreEqual(supernetExpected, supernet, "supernet"); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void TestTrySupernet2() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void TestTrySupernet2() { IPNetwork2 network1 = null; var network2 = IPNetwork2.Parse("2001:db8::/64"); @@ -2235,8 +2235,8 @@ public void TestTrySupernet2() #pragma warning restore 0618 } - [TestMethod] - public void TestTrySupernet3() + [TestMethod] + public void TestTrySupernet3() { var network1 = IPNetwork2.Parse("2001:db8::/64"); IPNetwork2 network2 = null; @@ -2249,8 +2249,8 @@ public void TestTrySupernet3() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet4() + [TestMethod] + public void TestTrySupernet4() { var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:db9::/65"); @@ -2263,8 +2263,8 @@ public void TestTrySupernet4() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet5() + [TestMethod] + public void TestTrySupernet5() { var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:dba::/64"); @@ -2277,8 +2277,8 @@ public void TestTrySupernet5() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet6() + [TestMethod] + public void TestTrySupernet6() { var network1 = IPNetwork2.Parse("2001:db8::/64"); var network2 = IPNetwork2.Parse("2001:db8::1/65"); @@ -2291,8 +2291,8 @@ public void TestTrySupernet6() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet8() + [TestMethod] + public void TestTrySupernet8() { var network1 = IPNetwork2.Parse("2001:db0::/64"); var network2 = IPNetwork2.Parse("2001:dbf::/64"); @@ -2305,8 +2305,8 @@ public void TestTrySupernet8() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet9() + [TestMethod] + public void TestTrySupernet9() { var network1 = IPNetwork2.Parse("192.168.1.1/24"); var network2 = IPNetwork2.Parse("192.168.2.1/24"); @@ -2321,8 +2321,8 @@ public void TestTrySupernet9() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet10() + [TestMethod] + public void TestTrySupernet10() { var network1 = IPNetwork2.Parse("2001:db8:0000::/65"); var network2 = IPNetwork2.Parse("2001:db8:0:0:8000::/65"); @@ -2336,8 +2336,8 @@ public void TestTrySupernet10() Assert.AreEqual(parsed, result, "parsed"); } - [TestMethod] - public void TestTrySupernet11() + [TestMethod] + public void TestTrySupernet11() { IPNetwork2[] network3 = null; IPNetwork2[] supernetExpected = { IPNetwork2.Parse("2001:db8::/64") }; @@ -2349,12 +2349,12 @@ public void TestTrySupernet11() Assert.AreEqual(parsed, result, "parsed"); } - #endregion + #endregion - #region TryGuessCidr + #region TryGuessCidr - [TestMethod] - public void TestTryGuessCidrNull() + [TestMethod] + public void TestTryGuessCidrNull() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr(null, out cidr); @@ -2363,8 +2363,8 @@ public void TestTryGuessCidrNull() Assert.AreEqual(0, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidr1() + [TestMethod] + public void TestTryGuessCidr1() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("::", out cidr); @@ -2373,8 +2373,8 @@ public void TestTryGuessCidr1() Assert.AreEqual(64, cidr, "cidr"); } - [TestMethod] - public void TestTryGuessCidr2() + [TestMethod] + public void TestTryGuessCidr2() { byte cidr; bool parsed = IPNetwork2.TryGuessCidr("2001:0db8::", out cidr); @@ -2383,132 +2383,132 @@ public void TestTryGuessCidr2() Assert.AreEqual(64, cidr, "cidr"); } - #endregion + #endregion - #region Count + #region Count - [TestMethod] - public void Total32() + [TestMethod] + public void Total32() { var network = IPNetwork2.Parse("::/128"); int total = 1; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total31() + [TestMethod] + public void Total31() { var network = IPNetwork2.Parse("::/127"); int total = 2; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total30() + [TestMethod] + public void Total30() { var network = IPNetwork2.Parse("::/126"); int total = 4; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total24() + [TestMethod] + public void Total24() { var network = IPNetwork2.Parse("::/120"); int total = 256; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total16() + [TestMethod] + public void Total16() { var network = IPNetwork2.Parse("::/112"); int total = 65536; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total8() + [TestMethod] + public void Total8() { var network = IPNetwork2.Parse("::/104"); int total = 16777216; Assert.AreEqual(total, network.Total, "Total"); } - [TestMethod] - public void Total0() + [TestMethod] + public void Total0() { var network = IPNetwork2.Parse("::/0"); var total = BigInteger.Pow(2, 128); Assert.AreEqual(total, network.Total, "Total"); } - #endregion + #endregion - #region Usable + #region Usable - [TestMethod] - public void Usable32() + [TestMethod] + public void Usable32() { var network = IPNetwork2.Parse("::/128"); uint usable = 1; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable31() + [TestMethod] + public void Usable31() { var network = IPNetwork2.Parse("::/127"); uint usable = 2; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable30() + [TestMethod] + public void Usable30() { var network = IPNetwork2.Parse("::/126"); uint usable = 4; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable24() + [TestMethod] + public void Usable24() { var network = IPNetwork2.Parse("::/120"); uint usable = 256; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable16() + [TestMethod] + public void Usable16() { var network = IPNetwork2.Parse("::/112"); uint usable = 65536; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable8() + [TestMethod] + public void Usable8() { var network = IPNetwork2.Parse("::/104"); uint usable = 16777216; Assert.AreEqual(usable, network.Usable, "Usable"); } - [TestMethod] - public void Usable0() + [TestMethod] + public void Usable0() { var network = IPNetwork2.Parse("::/0"); var usable = BigInteger.Pow(2, 128); Assert.AreEqual(usable, network.Usable, "Usable"); } - #endregion + #endregion - #region TryParseCidr + #region TryParseCidr - [TestMethod] - public void TryParseCidr1() + [TestMethod] + public void TryParseCidr1() { string sidr = "0"; byte? cidr; @@ -2519,8 +2519,8 @@ public void TryParseCidr1() Assert.AreEqual(result, cidr, "cidr"); } - [TestMethod] - public void TryParseCidr2() + [TestMethod] + public void TryParseCidr2() { string sidr = "sadsd"; byte? cidr; @@ -2532,8 +2532,8 @@ public void TryParseCidr2() Assert.AreEqual(result, cidr, "cidr"); } - [TestMethod] - public void TryParseCidr33() + [TestMethod] + public void TryParseCidr33() { string sidr = "33"; byte? cidr; @@ -2545,8 +2545,8 @@ public void TryParseCidr33() Assert.AreEqual(result, cidr, "cidr"); } - [TestMethod] - public void TryParseCidr128() + [TestMethod] + public void TryParseCidr128() { string sidr = "128"; byte? cidr; @@ -2558,8 +2558,8 @@ public void TryParseCidr128() Assert.AreEqual(result, cidr, "cidr"); } - [TestMethod] - public void TryParseCidr129() + [TestMethod] + public void TryParseCidr129() { string sidr = "129"; byte? cidr; @@ -2571,6 +2571,5 @@ public void TryParseCidr129() Assert.AreEqual(result, cidr, "cidr"); } - #endregion - } + #endregion } \ No newline at end of file diff --git a/src/TestProject/SerializeBinaryFormatterTest.cs b/src/TestProject/SerializeBinaryFormatterTest.cs deleted file mode 100644 index c0e50e13..00000000 --- a/src/TestProject/SerializeBinaryFormatterTest.cs +++ /dev/null @@ -1,125 +0,0 @@ -// -// Copyright (c) IPNetwork. All rights reserved. -// - - -#pragma warning disable SYSLIB0011 // Type or member is obsolete - -namespace TestProject -{ - using System.Runtime.Serialization.Formatters.Binary; - - [TestClass] - public class SerializeBinaryFormatterTest - { - [TestMethod] - [Ignore] // ("Assembly version is writen in binary serilaization.") - public void Test_Serialize_BinaryFormatter() - { - var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); - - var serializer = new BinaryFormatter(); - var mem = new MemoryStream(); - - serializer.Serialize(mem, ipnetwork); - string result = Convert.ToBase64String(mem.ToArray()); - - string expected = - "AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uTmV0LklQTmV0d29yaywgVmVyc2lvbj0yLjUuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPTcxNzM0M2NjMmMyNWVkY2YFAQAAABVTeXN0ZW0uTmV0LklQTmV0d29yazIBAAAACUlQTmV0d29yawECAAAABgMAAAAKMTAuMC4wLjAvOAs="; - - Assert.AreEqual(expected, result); - } - - [TestMethod] - public void Test_Deserialize_BinaryFormatter() - { - string base64 = - "AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uTmV0LklQTmV0d29yaywgVmVyc2lvbj0yLjUuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPTcxNzM0M2NjMmMyNWVkY2YFAQAAABVTeXN0ZW0uTmV0LklQTmV0d29yazIBAAAACUlQTmV0d29yawECAAAABgMAAAAKMTAuMC4wLjAvOAs="; - byte[] bytes = Convert.FromBase64String(base64); - var mem = new MemoryStream(bytes); - - var serializer = new BinaryFormatter(); - object result = serializer.Deserialize(mem); - - var expected = IPNetwork2.Parse("10.0.0.1/8"); - Assert.AreEqual(expected, result); - } - - [TestMethod] - public void Test_Serialize_Deserialize_BinaryFormatter() - { - var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); - - var serializer = new BinaryFormatter(); - var mem = new MemoryStream(); - - serializer.Serialize(mem, ipnetwork); - - mem.Position = 0; - object ipnetwork2 = serializer.Deserialize(mem); - - Assert.AreEqual(ipnetwork, ipnetwork2); - } - - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_BinaryFormatter() - { - var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); - - var serializer = new BinaryFormatter(); - var mem = new MemoryStream(); - - for (int i = 0; i < 1000000; i++) - { - serializer.Serialize(mem, ipnetwork); - mem.SetLength(0); - } - - // 5.13 seconds(Ad hoc). - } - - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Deserialize_BinaryFormatter() - { - string base64 = - "AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uTmV0LklQTmV0d29yaywgVmVyc2lvbj0yLjUuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPTcxNzM0M2NjMmMyNWVkY2YFAQAAABVTeXN0ZW0uTmV0LklQTmV0d29yazIBAAAACUlQTmV0d29yawECAAAABgMAAAAKMTAuMC4wLjAvOAs="; - byte[] bytes = Convert.FromBase64String(base64); - var mem = new MemoryStream(bytes); - - var serializer = new BinaryFormatter(); - - for (int i = 0; i < 1000000; i++) - { - object result = serializer.Deserialize(mem); - mem.Position = 0; - } - - // 11.949 seconds(Ad hoc). - } - - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_Deserialize_BinaryFormatter() - { - var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); - - var serializer = new BinaryFormatter(); - var mem = new MemoryStream(); - - for (int i = 0; i < 1000000; i++) - { - serializer.Serialize(mem, ipnetwork); - - mem.Position = 0; - object ipnetwork2 = serializer.Deserialize(mem); - - mem.SetLength(0); - } - - // 17.48 seconds(Ad hoc). - } - } -#pragma warning restore SYSLIB0011 // Type or member is obsolete -} \ No newline at end of file diff --git a/src/TestProject/SerializeDataContractTest.cs b/src/TestProject/SerializeDataContractTest.cs index bbf94cbb..c68ec720 100644 --- a/src/TestProject/SerializeDataContractTest.cs +++ b/src/TestProject/SerializeDataContractTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class SerializeDataContractTest { - [TestClass] - public class SerializeDataContractTest - { - [TestMethod] - public void Test_Serialize_DataContract() + [TestMethod] + public void Test_Serialize_DataContract() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -18,8 +18,8 @@ public void Test_Serialize_DataContract() Assert.AreEqual(expected, result); } - [TestMethod] - public void Test_Deserialize_DataContract() + [TestMethod] + public void Test_Deserialize_DataContract() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); string serialized = DataContractSerializeHelper.Serialize(ipnetwork); @@ -29,11 +29,10 @@ public void Test_Deserialize_DataContract() Assert.AreEqual(ipnetwork, result); } - [TestMethod] - public void Test_Empty_Constructor() + [TestMethod] + public void Test_Empty_Constructor() { var ipnetwork = new IPNetwork2(); Assert.AreEqual("0.0.0.0/0", ipnetwork.ToString()); } - } } \ No newline at end of file diff --git a/src/TestProject/SerializeJsonTest.cs b/src/TestProject/SerializeJsonTest.cs index c00197fa..613d5272 100644 --- a/src/TestProject/SerializeJsonTest.cs +++ b/src/TestProject/SerializeJsonTest.cs @@ -3,13 +3,13 @@ // -namespace TestProject +namespace TestProject; + +[TestClass] +public class SerializeJsonTest { - [TestClass] - public class SerializeJsonTest - { - [TestMethod] - public void Test_Serialize_Json() + [TestMethod] + public void Test_Serialize_Json() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -19,8 +19,8 @@ public void Test_Serialize_Json() Assert.AreEqual(expected, result); } - [TestMethod] - public void Test_Deserialize_Json() + [TestMethod] + public void Test_Deserialize_Json() { string json = "{\"IPNetwork\":\"10.0.0.0/8\"}"; @@ -30,8 +30,8 @@ public void Test_Deserialize_Json() Assert.AreEqual(expected, result); } - [TestMethod] - public void Test_Serialize_Deserialize_Json() + [TestMethod] + public void Test_Serialize_Deserialize_Json() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -41,9 +41,9 @@ public void Test_Serialize_Deserialize_Json() Assert.AreEqual(ipnetwork, result); } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_Json() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Serialize_Json() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -55,9 +55,9 @@ public void Test_1_000_000_Serialize_Json() // 3.06 seconds(Ad hoc). } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Deserialize_Json() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Deserialize_Json() { string json = "{\"IPNetwork\":\"10.0.0.0/8\"}"; @@ -69,9 +69,9 @@ public void Test_1_000_000_Deserialize_Json() // 10.20 seconds(Ad hoc). } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_Deserialize_Json() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Serialize_Deserialize_Json() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -83,5 +83,4 @@ public void Test_1_000_000_Serialize_Deserialize_Json() // 13.49 seconds(Ad hoc). } - } } \ No newline at end of file diff --git a/src/TestProject/SerializeXmlTest.cs b/src/TestProject/SerializeXmlTest.cs index 64b20b90..5a3725f3 100644 --- a/src/TestProject/SerializeXmlTest.cs +++ b/src/TestProject/SerializeXmlTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class SerializeXmlTest { - [TestClass] - public class SerializeXmlTest - { - [TestMethod] - public void Test_Serialize_Xml() + [TestMethod] + public void Test_Serialize_Xml() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -25,8 +25,8 @@ public void Test_Serialize_Xml() Assert.IsTrue(ok, result); } - [TestMethod] - public void Test_Deserialize_Xml() + [TestMethod] + public void Test_Deserialize_Xml() { string xml = @" @@ -42,8 +42,8 @@ public void Test_Deserialize_Xml() Assert.AreEqual(expected, result); } - [TestMethod] - public void Test_Serialize_Deserialize_Xml() + [TestMethod] + public void Test_Serialize_Deserialize_Xml() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -61,9 +61,9 @@ public void Test_Serialize_Deserialize_Xml() Assert.AreEqual(ipnetwork, ipnetwork2); } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_Xml() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Serialize_Xml() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -79,9 +79,9 @@ public void Test_1_000_000_Serialize_Xml() // 5.13 seconds(Ad hoc). } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Deserialize_Xml() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Deserialize_Xml() { string xml = @" @@ -101,9 +101,9 @@ public void Test_1_000_000_Deserialize_Xml() // 17.98 seconds(Ad hoc). } - [TestMethod] - [TestCategory("LongRunning")] - public void Test_1_000_000_Serialize_Deserialize_Xml() + [TestMethod] + [TestCategory("LongRunning")] + public void Test_1_000_000_Serialize_Deserialize_Xml() { var ipnetwork = IPNetwork2.Parse("10.0.0.1/8"); @@ -122,5 +122,4 @@ public void Test_1_000_000_Serialize_Deserialize_Xml() // 17.48 seconds(Ad hoc). } - } } \ No newline at end of file diff --git a/src/TestProject/TestProject.csproj b/src/TestProject/TestProject.csproj index 9b1c719e..4810e76e 100644 --- a/src/TestProject/TestProject.csproj +++ b/src/TestProject/TestProject.csproj @@ -1,17 +1,14 @@ - net462;net47;net48;net6.0;net8.0 - net8.0 - + net9.0 false - True false - ..\System.Net.IPNetwork.snk - true + 3.1.0 + latestmajor diff --git a/src/TestProject/TryParseUnitTest.cs b/src/TestProject/TryParseUnitTest.cs index eae86cba..2ac1fde0 100644 --- a/src/TestProject/TryParseUnitTest.cs +++ b/src/TestProject/TryParseUnitTest.cs @@ -2,30 +2,30 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +/// +/// IPNetworkUnitTest test every single method. +/// +[TestClass] +public class TryParseUnitTest { - /// - /// IPNetworkUnitTest test every single method. - /// - [TestClass] - public class TryParseUnitTest - { - #region Issue294 + #region Issue294 - [TestMethod] - public void Test_IPNetwork_TryParse_Issue294() - { + [TestMethod] + public void Test_IPNetwork_TryParse_Issue294() + { bool result = IPNetwork2.TryParse("*", out IPNetwork2 ipaddress1); Assert.AreEqual(false, result, "parsed1"); } - #endregion + #endregion - #region TryParse IPV4 + #region TryParse IPV4 - [TestMethod] - public void TestTryParseIPAddressNetmaskAne2() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne2() + { IPAddress ip = null; bool parsed = IPNetwork2.TryParse(ip, ip, out IPNetwork2 ipnet); @@ -33,27 +33,27 @@ public void TestTryParseIPAddressNetmaskAne2() Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne3() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne3() + { bool parsed = IPNetwork2.TryParse(string.Empty, 0, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne4() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne4() + { bool parsed = IPNetwork2.TryParse(null, 0, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne5() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne5() + { string n = null; bool parsed = IPNetwork2.TryParse(n, n, out IPNetwork2 ipnet); @@ -62,63 +62,63 @@ public void TestTryParseIPAddressNetmaskAne5() Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne6() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne6() + { bool parsed = IPNetwork2.TryParse(IPAddress.Parse("10.10.10.10"), null, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne7() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne7() + { bool parsed = IPNetwork2.TryParse("0.0.0.0", netmask:null, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne8() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne8() + { 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"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne9() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne9() + { 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"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne10() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne10() + { bool parsed = IPNetwork2.TryParse("x.x.x.x", 0, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmaskAne11() - { + [TestMethod] + public void TestTryParseIPAddressNetmaskAne11() + { bool parsed = IPNetwork2.TryParse("0.0.0.0", 33, out IPNetwork2 ipnet); Assert.AreEqual(false, parsed, "parsed"); Assert.AreEqual(null, ipnet, "ipnet"); } - [TestMethod] - public void TestTryParseIPAddressNetmask() - { + [TestMethod] + public void TestTryParseIPAddressNetmask() + { string ipaddress = "192.168.168.100"; string netmask = "255.255.255.0"; @@ -141,9 +141,9 @@ public void TestTryParseIPAddressNetmask() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseString1() - { + [TestMethod] + public void TestTryParseString1() + { string ipaddress = "192.168.168.100 255.255.255.0"; string network = "192.168.168.0"; @@ -166,9 +166,9 @@ public void TestTryParseString1() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseString2() - { + [TestMethod] + public void TestTryParseString2() + { string ipaddress = "192.168.168.100/24"; string network = "192.168.168.0"; @@ -191,9 +191,9 @@ public void TestTryParseString2() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseString3() - { + [TestMethod] + public void TestTryParseString3() + { string ipaddress = "0.0.0.0/0"; string network = "0.0.0.0"; @@ -216,9 +216,9 @@ public void TestTryParseString3() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseString4() - { + [TestMethod] + public void TestTryParseString4() + { string ipaddress = "0.0.0.0/32"; string network = "0.0.0.0"; @@ -241,9 +241,9 @@ public void TestTryParseString4() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseString5() - { + [TestMethod] + public void TestTryParseString5() + { string ipaddress = "255.255.255.255/32"; string network = "255.255.255.255"; @@ -266,40 +266,40 @@ public void TestTryParseString5() Assert.AreEqual(lastUsable, ipnetwork.LastUsable.ToString(), "LastUsable"); } - [TestMethod] - public void TestTryParseStringAe1() - { + [TestMethod] + public void TestTryParseStringAe1() + { string ipaddress = "garbage"; bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); Assert.AreEqual(false, parsed, "parsed"); } - [TestMethod] - public void TestTryParseStringAe2() - { + [TestMethod] + public void TestTryParseStringAe2() + { string ipaddress = "0.0.0.0 0.0.1.0"; bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); Assert.AreEqual(false, parsed, "parsed"); } - [TestMethod] - public void TestTryParseStringAne1() - { + [TestMethod] + public void TestTryParseStringAne1() + { string ipaddress = null; bool parsed = IPNetwork2.TryParse(ipaddress, out IPNetwork2 ipnetwork); Assert.AreEqual(false, parsed, "parsed"); } - #endregion + #endregion - #region TryParse + #region TryParse - [TestMethod] - public void Test_TryParse_InvalidIpv6_return_valid_ipv6network() - { + [TestMethod] + 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); @@ -308,41 +308,40 @@ public void Test_TryParse_InvalidIpv6_return_valid_ipv6network() Assert.AreEqual(ipnetwork1, ipnetwork2, "ipnetwork1 == ipnetwork2"); } - [DataTestMethod] - [DataRow("1.1.1.1/1", true, true)] - [DataRow("1.1.1.1/1", false, true)] - [DataRow("::/0", true, true)] - [DataRow("::/0", false, true)] - [DataRow("g001:02b8::/64", true, true)] - [DataRow("g001:02b8::/64", false, false)] - [DataRow(" 001:02b8::/64", false, false)] - [DataRow(" 001:02b8::/64", true, true)] - [DataRow("001:02b8:: / 64", true, true)] - [DataRow("001:02b8:: / 64", false, false)] - [DataRow("001:02b8::/64", true, true)] - [DataRow("001:02b8::/64", false, true)] - public void Test_TryParse(string ipnetwork, bool sanitanize, bool parsed) - { + [DataTestMethod] + [DataRow("1.1.1.1/1", true, true)] + [DataRow("1.1.1.1/1", false, true)] + [DataRow("::/0", true, true)] + [DataRow("::/0", false, true)] + [DataRow("g001:02b8::/64", true, true)] + [DataRow("g001:02b8::/64", false, false)] + [DataRow(" 001:02b8::/64", false, false)] + [DataRow(" 001:02b8::/64", true, true)] + [DataRow("001:02b8:: / 64", true, true)] + [DataRow("001:02b8:: / 64", false, false)] + [DataRow("001:02b8::/64", true, true)] + [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); Assert.AreEqual(parsed, result, "parsed1"); } - [DataTestMethod] - [DataRow("1.1.1.1", true)] - [DataRow("::", true)] - [DataRow("001:02b8::", true)] - [DataRow("g001:02b8::", false)] - [DataRow(" 001:02b8::", false)] - [DataRow(" 001:02b8:: ", false)] - [DataRow("001:02b8:: ", false)] - public void Test_IPAddress_TryParse(string ipaddress, bool parsed) - { + [DataTestMethod] + [DataRow("1.1.1.1", true)] + [DataRow("::", true)] + [DataRow("001:02b8::", true)] + [DataRow("g001:02b8::", false)] + [DataRow(" 001:02b8::", false)] + [DataRow(" 001:02b8:: ", false)] + [DataRow("001:02b8:: ", false)] + public void Test_IPAddress_TryParse(string ipaddress, bool parsed) + { bool result = IPAddress.TryParse(ipaddress, out IPAddress ipaddress1); Assert.AreEqual(parsed, result, "parsed1"); } - #endregion - } + #endregion } \ No newline at end of file diff --git a/src/TestProject/WildcardMaskIPv4UnitTest.cs b/src/TestProject/WildcardMaskIPv4UnitTest.cs index 93893d44..54cf852a 100644 --- a/src/TestProject/WildcardMaskIPv4UnitTest.cs +++ b/src/TestProject/WildcardMaskIPv4UnitTest.cs @@ -2,15 +2,15 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class WildcardMaskIPv4UnitTest { - [TestClass] - public class WildcardMaskIPv4UnitTest - { - [DataTestMethod] - [DataRow(0, "0.0.0.0", "255.255.255.255")] - [DataRow(32, "255.255.255.255", "0.0.0.0")] - public void Test_WildcardMask_ipv4_mask(int cidr, string thenNetmask, string andWildcardmask) + [DataTestMethod] + [DataRow(0, "0.0.0.0", "255.255.255.255")] + [DataRow(32, "255.255.255.255", "0.0.0.0")] + public void Test_WildcardMask_ipv4_mask(int cidr, string thenNetmask, string andWildcardmask) { var ipnetwork = IPNetwork2.Parse($"1.1.1.1/{cidr}"); @@ -21,41 +21,41 @@ public void Test_WildcardMask_ipv4_mask(int cidr, string thenNetmask, string and Assert.AreEqual(andWildcardmask, wildcardmask, "wildcardmask"); } - [DataTestMethod] - [DataRow("255.255.255.255", "0.0.0.0")] - [DataRow("255.255.255.254", "0.0.0.1")] - [DataRow("255.255.255.252", "0.0.0.3")] - [DataRow("255.255.255.248", "0.0.0.7")] - [DataRow("255.255.255.240", "0.0.0.15")] - [DataRow("255.255.255.224", "0.0.0.31")] - [DataRow("255.255.255.192", "0.0.0.63")] - [DataRow("255.255.255.128", "0.0.0.127")] - [DataRow("255.255.255.0", "0.0.0.255")] - [DataRow("255.255.254.0", "0.0.1.255")] - [DataRow("255.255.252.0", "0.0.3.255")] - [DataRow("255.255.248.0", "0.0.7.255")] - [DataRow("255.255.240.0", "0.0.15.255")] - [DataRow("255.255.224.0", "0.0.31.255")] - [DataRow("255.255.192.0", "0.0.63.255")] - [DataRow("255.255.128.0", "0.0.127.255")] - [DataRow("255.255.0.0", "0.0.255.255")] - [DataRow("255.254.0.0", "0.1.255.255")] - [DataRow("255.252.0.0", "0.3.255.255")] - [DataRow("255.248.0.0", "0.7.255.255")] - [DataRow("255.240.0.0", "0.15.255.255")] - [DataRow("255.224.0.0", "0.31.255.255")] - [DataRow("255.192.0.0", "0.63.255.255")] - [DataRow("255.128.0.0", "0.127.255.255")] - [DataRow("255.0.0.0", "0.255.255.255")] - [DataRow("254.0.0.0", "1.255.255.255")] - [DataRow("252.0.0.0", "3.255.255.255")] - [DataRow("248.0.0.0", "7.255.255.255")] - [DataRow("240.0.0.0", "15.255.255.255")] - [DataRow("224.0.0.0", "31.255.255.255")] - [DataRow("192.0.0.0", "63.255.255.255")] - [DataRow("128.0.0.0", "127.255.255.255")] - [DataRow("0.0.0.0", "255.255.255.255")] - public void Test_WildcardMask_ipv4(string netmask, string expected) + [DataTestMethod] + [DataRow("255.255.255.255", "0.0.0.0")] + [DataRow("255.255.255.254", "0.0.0.1")] + [DataRow("255.255.255.252", "0.0.0.3")] + [DataRow("255.255.255.248", "0.0.0.7")] + [DataRow("255.255.255.240", "0.0.0.15")] + [DataRow("255.255.255.224", "0.0.0.31")] + [DataRow("255.255.255.192", "0.0.0.63")] + [DataRow("255.255.255.128", "0.0.0.127")] + [DataRow("255.255.255.0", "0.0.0.255")] + [DataRow("255.255.254.0", "0.0.1.255")] + [DataRow("255.255.252.0", "0.0.3.255")] + [DataRow("255.255.248.0", "0.0.7.255")] + [DataRow("255.255.240.0", "0.0.15.255")] + [DataRow("255.255.224.0", "0.0.31.255")] + [DataRow("255.255.192.0", "0.0.63.255")] + [DataRow("255.255.128.0", "0.0.127.255")] + [DataRow("255.255.0.0", "0.0.255.255")] + [DataRow("255.254.0.0", "0.1.255.255")] + [DataRow("255.252.0.0", "0.3.255.255")] + [DataRow("255.248.0.0", "0.7.255.255")] + [DataRow("255.240.0.0", "0.15.255.255")] + [DataRow("255.224.0.0", "0.31.255.255")] + [DataRow("255.192.0.0", "0.63.255.255")] + [DataRow("255.128.0.0", "0.127.255.255")] + [DataRow("255.0.0.0", "0.255.255.255")] + [DataRow("254.0.0.0", "1.255.255.255")] + [DataRow("252.0.0.0", "3.255.255.255")] + [DataRow("248.0.0.0", "7.255.255.255")] + [DataRow("240.0.0.0", "15.255.255.255")] + [DataRow("224.0.0.0", "31.255.255.255")] + [DataRow("192.0.0.0", "63.255.255.255")] + [DataRow("128.0.0.0", "127.255.255.255")] + [DataRow("0.0.0.0", "255.255.255.255")] + public void Test_WildcardMask_ipv4(string netmask, string expected) { var ipnetwork = IPNetwork2.Parse($"1.1.1.1/{netmask}"); @@ -66,41 +66,41 @@ public void Test_WildcardMask_ipv4(string netmask, string expected) Assert.AreEqual(expected, wildcardmask, "wildcardmask"); } - [DataTestMethod] - [DataRow(32, "0.0.0.0")] - [DataRow(31, "0.0.0.1")] - [DataRow(30, "0.0.0.3")] - [DataRow(29, "0.0.0.7")] - [DataRow(28, "0.0.0.15")] - [DataRow(27, "0.0.0.31")] - [DataRow(26, "0.0.0.63")] - [DataRow(25, "0.0.0.127")] - [DataRow(24, "0.0.0.255")] - [DataRow(23, "0.0.1.255")] - [DataRow(22, "0.0.3.255")] - [DataRow(21, "0.0.7.255")] - [DataRow(20, "0.0.15.255")] - [DataRow(19, "0.0.31.255")] - [DataRow(18, "0.0.63.255")] - [DataRow(17, "0.0.127.255")] - [DataRow(16, "0.0.255.255")] - [DataRow(15, "0.1.255.255")] - [DataRow(14, "0.3.255.255")] - [DataRow(13, "0.7.255.255")] - [DataRow(12, "0.15.255.255")] - [DataRow(11, "0.31.255.255")] - [DataRow(10, "0.63.255.255")] - [DataRow(9, "0.127.255.255")] - [DataRow(8, "0.255.255.255")] - [DataRow(7, "1.255.255.255")] - [DataRow(6, "3.255.255.255")] - [DataRow(5, "7.255.255.255")] - [DataRow(4, "15.255.255.255")] - [DataRow(3, "31.255.255.255")] - [DataRow(2, "63.255.255.255")] - [DataRow(1, "127.255.255.255")] - [DataRow(0, "255.255.255.255")] - public void Test_WildcardMask_ipv4_cidr(int cidr, string expected) + [DataTestMethod] + [DataRow(32, "0.0.0.0")] + [DataRow(31, "0.0.0.1")] + [DataRow(30, "0.0.0.3")] + [DataRow(29, "0.0.0.7")] + [DataRow(28, "0.0.0.15")] + [DataRow(27, "0.0.0.31")] + [DataRow(26, "0.0.0.63")] + [DataRow(25, "0.0.0.127")] + [DataRow(24, "0.0.0.255")] + [DataRow(23, "0.0.1.255")] + [DataRow(22, "0.0.3.255")] + [DataRow(21, "0.0.7.255")] + [DataRow(20, "0.0.15.255")] + [DataRow(19, "0.0.31.255")] + [DataRow(18, "0.0.63.255")] + [DataRow(17, "0.0.127.255")] + [DataRow(16, "0.0.255.255")] + [DataRow(15, "0.1.255.255")] + [DataRow(14, "0.3.255.255")] + [DataRow(13, "0.7.255.255")] + [DataRow(12, "0.15.255.255")] + [DataRow(11, "0.31.255.255")] + [DataRow(10, "0.63.255.255")] + [DataRow(9, "0.127.255.255")] + [DataRow(8, "0.255.255.255")] + [DataRow(7, "1.255.255.255")] + [DataRow(6, "3.255.255.255")] + [DataRow(5, "7.255.255.255")] + [DataRow(4, "15.255.255.255")] + [DataRow(3, "31.255.255.255")] + [DataRow(2, "63.255.255.255")] + [DataRow(1, "127.255.255.255")] + [DataRow(0, "255.255.255.255")] + public void Test_WildcardMask_ipv4_cidr(int cidr, string expected) { var ipnetwork = IPNetwork2.Parse($"1.1.1.1/{cidr}"); @@ -110,5 +110,4 @@ public void Test_WildcardMask_ipv4_cidr(int cidr, string expected) Assert.AreEqual(cidr, cidr2, "netmask"); Assert.AreEqual(expected, wildcardmask, "wildcardmask"); } - } } \ No newline at end of file diff --git a/src/TestProject/WildcardMaskIPv6UnitTest.cs b/src/TestProject/WildcardMaskIPv6UnitTest.cs index 383019c6..add194b6 100644 --- a/src/TestProject/WildcardMaskIPv6UnitTest.cs +++ b/src/TestProject/WildcardMaskIPv6UnitTest.cs @@ -2,13 +2,13 @@ // Copyright (c) IPNetwork. All rights reserved. // -namespace TestProject +namespace TestProject; + +[TestClass] +public class WildcardMaskIPv6UnitTest { - [TestClass] - public class WildcardMaskIPv6UnitTest - { - [TestMethod] - public void Test_WildcardMask_ipv6_mask_0() + [TestMethod] + public void Test_WildcardMask_ipv6_mask_0() { var ipnetwork = IPNetwork2.Parse("::/0"); @@ -19,8 +19,8 @@ public void Test_WildcardMask_ipv6_mask_0() Assert.AreEqual("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", wildcardmask, "wildcardmask"); } - [TestMethod] - public void Test_WildcardMask_ipv6_mask_128() + [TestMethod] + public void Test_WildcardMask_ipv6_mask_128() { var ipnetwork = IPNetwork2.Parse("::/128"); @@ -31,11 +31,11 @@ public void Test_WildcardMask_ipv6_mask_128() Assert.AreEqual("::", wildcardmask, "wildcardmask"); } - [DataTestMethod] - [DataRow("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::")] - [DataRow("ffff:ffff:ffff:ffff::", "::ffff:ffff:ffff:ffff")] - [DataRow("::", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - public void Test_WildcardMask_ipv6(string netmask, string expected) + [DataTestMethod] + [DataRow("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::")] + [DataRow("ffff:ffff:ffff:ffff::", "::ffff:ffff:ffff:ffff")] + [DataRow("::", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + public void Test_WildcardMask_ipv6(string netmask, string expected) { var ipnetwork = IPNetwork2.Parse($"::/{netmask}"); @@ -46,137 +46,137 @@ public void Test_WildcardMask_ipv6(string netmask, string expected) Assert.AreEqual(expected, wildcardmask, "wildcardmask"); } - [DataTestMethod] - [DataRow(128, "::")] - [DataRow(127, "::1")] - [DataRow(126, "::3")] - [DataRow(125, "::7")] - [DataRow(124, "::f")] - [DataRow(123, "::1f")] - [DataRow(122, "::3f")] - [DataRow(121, "::7f")] - [DataRow(120, "::ff")] - [DataRow(119, "::1ff")] - [DataRow(118, "::3ff")] - [DataRow(117, "::7ff")] - [DataRow(116, "::fff")] - [DataRow(115, "::1fff")] - [DataRow(114, "::3fff")] - [DataRow(113, "::7fff")] - [DataRow(112, "::ffff")] - [DataRow(111, "::1:ffff")] - [DataRow(110, "::3:ffff")] - [DataRow(109, "::7:ffff")] - [DataRow(108, "::f:ffff")] - [DataRow(107, "::1f:ffff")] - [DataRow(106, "::3f:ffff")] - [DataRow(105, "::7f:ffff")] - [DataRow(104, "::ff:ffff")] - [DataRow(103, "::1ff:ffff")] - [DataRow(102, "::3ff:ffff")] - [DataRow(101, "::7ff:ffff")] - [DataRow(100, "::fff:ffff")] - [DataRow(99, "::1fff:ffff")] - [DataRow(98, "::3fff:ffff")] - [DataRow(97, "::7fff:ffff")] - [DataRow(96, "::ffff:ffff")] - [DataRow(95, "::1:ffff:ffff")] - [DataRow(94, "::3:ffff:ffff")] - [DataRow(93, "::7:ffff:ffff")] - [DataRow(92, "::f:ffff:ffff")] - [DataRow(91, "::1f:ffff:ffff")] - [DataRow(90, "::3f:ffff:ffff")] - [DataRow(89, "::7f:ffff:ffff")] - [DataRow(88, "::ff:ffff:ffff")] - [DataRow(87, "::1ff:ffff:ffff")] - [DataRow(86, "::3ff:ffff:ffff")] - [DataRow(85, "::7ff:ffff:ffff")] - [DataRow(84, "::fff:ffff:ffff")] - [DataRow(83, "::1fff:ffff:ffff")] - [DataRow(82, "::3fff:ffff:ffff")] - [DataRow(81, "::7fff:ffff:ffff")] - [DataRow(80, "::ffff:ffff:ffff")] - [DataRow(79, "::1:ffff:ffff:ffff")] - [DataRow(78, "::3:ffff:ffff:ffff")] - [DataRow(77, "::7:ffff:ffff:ffff")] - [DataRow(76, "::f:ffff:ffff:ffff")] - [DataRow(75, "::1f:ffff:ffff:ffff")] - [DataRow(74, "::3f:ffff:ffff:ffff")] - [DataRow(73, "::7f:ffff:ffff:ffff")] - [DataRow(72, "::ff:ffff:ffff:ffff")] - [DataRow(71, "::1ff:ffff:ffff:ffff")] - [DataRow(70, "::3ff:ffff:ffff:ffff")] - [DataRow(69, "::7ff:ffff:ffff:ffff")] - [DataRow(68, "::fff:ffff:ffff:ffff")] - [DataRow(67, "::1fff:ffff:ffff:ffff")] - [DataRow(66, "::3fff:ffff:ffff:ffff")] - [DataRow(65, "::7fff:ffff:ffff:ffff")] - [DataRow(64, "::ffff:ffff:ffff:ffff")] - [DataRow(63, "::1:ffff:ffff:ffff:ffff")] - [DataRow(62, "::3:ffff:ffff:ffff:ffff")] - [DataRow(61, "::7:ffff:ffff:ffff:ffff")] - [DataRow(60, "::f:ffff:ffff:ffff:ffff")] - [DataRow(59, "::1f:ffff:ffff:ffff:ffff")] - [DataRow(58, "::3f:ffff:ffff:ffff:ffff")] - [DataRow(57, "::7f:ffff:ffff:ffff:ffff")] - [DataRow(56, "::ff:ffff:ffff:ffff:ffff")] - [DataRow(55, "::1ff:ffff:ffff:ffff:ffff")] - [DataRow(54, "::3ff:ffff:ffff:ffff:ffff")] - [DataRow(53, "::7ff:ffff:ffff:ffff:ffff")] - [DataRow(52, "::fff:ffff:ffff:ffff:ffff")] - [DataRow(51, "::1fff:ffff:ffff:ffff:ffff")] - [DataRow(50, "::3fff:ffff:ffff:ffff:ffff")] - [DataRow(49, "::7fff:ffff:ffff:ffff:ffff")] - [DataRow(48, "::ffff:ffff:ffff:ffff:ffff")] - [DataRow(47, "::1:ffff:ffff:ffff:ffff:ffff")] - [DataRow(46, "::3:ffff:ffff:ffff:ffff:ffff")] - [DataRow(45, "::7:ffff:ffff:ffff:ffff:ffff")] - [DataRow(44, "::f:ffff:ffff:ffff:ffff:ffff")] - [DataRow(43, "::1f:ffff:ffff:ffff:ffff:ffff")] - [DataRow(42, "::3f:ffff:ffff:ffff:ffff:ffff")] - [DataRow(41, "::7f:ffff:ffff:ffff:ffff:ffff")] - [DataRow(40, "::ff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(39, "::1ff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(38, "::3ff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(37, "::7ff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(36, "::fff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(35, "::1fff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(34, "::3fff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(33, "::7fff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(32, "::ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(31, "0:1:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(30, "0:3:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(29, "0:7:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(28, "0:f:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(27, "0:1f:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(26, "0:3f:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(25, "0:7f:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(24, "0:ff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(23, "0:1ff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(22, "0:3ff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(21, "0:7ff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(20, "0:fff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(19, "0:1fff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(18, "0:3fff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(17, "0:7fff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(16, "0:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(15, "1:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(14, "3:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(13, "7:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(12, "f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(11, "1f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(10, "3f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(9, "7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(8, "ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(7, "1ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(6, "3ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(5, "7ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(4, "fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(3, "1fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(2, "3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(1, "7fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - [DataRow(0, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] - public void Test_WildcardMask_ipv6_cidr(int cidr, string expected) + [DataTestMethod] + [DataRow(128, "::")] + [DataRow(127, "::1")] + [DataRow(126, "::3")] + [DataRow(125, "::7")] + [DataRow(124, "::f")] + [DataRow(123, "::1f")] + [DataRow(122, "::3f")] + [DataRow(121, "::7f")] + [DataRow(120, "::ff")] + [DataRow(119, "::1ff")] + [DataRow(118, "::3ff")] + [DataRow(117, "::7ff")] + [DataRow(116, "::fff")] + [DataRow(115, "::1fff")] + [DataRow(114, "::3fff")] + [DataRow(113, "::7fff")] + [DataRow(112, "::ffff")] + [DataRow(111, "::1:ffff")] + [DataRow(110, "::3:ffff")] + [DataRow(109, "::7:ffff")] + [DataRow(108, "::f:ffff")] + [DataRow(107, "::1f:ffff")] + [DataRow(106, "::3f:ffff")] + [DataRow(105, "::7f:ffff")] + [DataRow(104, "::ff:ffff")] + [DataRow(103, "::1ff:ffff")] + [DataRow(102, "::3ff:ffff")] + [DataRow(101, "::7ff:ffff")] + [DataRow(100, "::fff:ffff")] + [DataRow(99, "::1fff:ffff")] + [DataRow(98, "::3fff:ffff")] + [DataRow(97, "::7fff:ffff")] + [DataRow(96, "::ffff:ffff")] + [DataRow(95, "::1:ffff:ffff")] + [DataRow(94, "::3:ffff:ffff")] + [DataRow(93, "::7:ffff:ffff")] + [DataRow(92, "::f:ffff:ffff")] + [DataRow(91, "::1f:ffff:ffff")] + [DataRow(90, "::3f:ffff:ffff")] + [DataRow(89, "::7f:ffff:ffff")] + [DataRow(88, "::ff:ffff:ffff")] + [DataRow(87, "::1ff:ffff:ffff")] + [DataRow(86, "::3ff:ffff:ffff")] + [DataRow(85, "::7ff:ffff:ffff")] + [DataRow(84, "::fff:ffff:ffff")] + [DataRow(83, "::1fff:ffff:ffff")] + [DataRow(82, "::3fff:ffff:ffff")] + [DataRow(81, "::7fff:ffff:ffff")] + [DataRow(80, "::ffff:ffff:ffff")] + [DataRow(79, "::1:ffff:ffff:ffff")] + [DataRow(78, "::3:ffff:ffff:ffff")] + [DataRow(77, "::7:ffff:ffff:ffff")] + [DataRow(76, "::f:ffff:ffff:ffff")] + [DataRow(75, "::1f:ffff:ffff:ffff")] + [DataRow(74, "::3f:ffff:ffff:ffff")] + [DataRow(73, "::7f:ffff:ffff:ffff")] + [DataRow(72, "::ff:ffff:ffff:ffff")] + [DataRow(71, "::1ff:ffff:ffff:ffff")] + [DataRow(70, "::3ff:ffff:ffff:ffff")] + [DataRow(69, "::7ff:ffff:ffff:ffff")] + [DataRow(68, "::fff:ffff:ffff:ffff")] + [DataRow(67, "::1fff:ffff:ffff:ffff")] + [DataRow(66, "::3fff:ffff:ffff:ffff")] + [DataRow(65, "::7fff:ffff:ffff:ffff")] + [DataRow(64, "::ffff:ffff:ffff:ffff")] + [DataRow(63, "::1:ffff:ffff:ffff:ffff")] + [DataRow(62, "::3:ffff:ffff:ffff:ffff")] + [DataRow(61, "::7:ffff:ffff:ffff:ffff")] + [DataRow(60, "::f:ffff:ffff:ffff:ffff")] + [DataRow(59, "::1f:ffff:ffff:ffff:ffff")] + [DataRow(58, "::3f:ffff:ffff:ffff:ffff")] + [DataRow(57, "::7f:ffff:ffff:ffff:ffff")] + [DataRow(56, "::ff:ffff:ffff:ffff:ffff")] + [DataRow(55, "::1ff:ffff:ffff:ffff:ffff")] + [DataRow(54, "::3ff:ffff:ffff:ffff:ffff")] + [DataRow(53, "::7ff:ffff:ffff:ffff:ffff")] + [DataRow(52, "::fff:ffff:ffff:ffff:ffff")] + [DataRow(51, "::1fff:ffff:ffff:ffff:ffff")] + [DataRow(50, "::3fff:ffff:ffff:ffff:ffff")] + [DataRow(49, "::7fff:ffff:ffff:ffff:ffff")] + [DataRow(48, "::ffff:ffff:ffff:ffff:ffff")] + [DataRow(47, "::1:ffff:ffff:ffff:ffff:ffff")] + [DataRow(46, "::3:ffff:ffff:ffff:ffff:ffff")] + [DataRow(45, "::7:ffff:ffff:ffff:ffff:ffff")] + [DataRow(44, "::f:ffff:ffff:ffff:ffff:ffff")] + [DataRow(43, "::1f:ffff:ffff:ffff:ffff:ffff")] + [DataRow(42, "::3f:ffff:ffff:ffff:ffff:ffff")] + [DataRow(41, "::7f:ffff:ffff:ffff:ffff:ffff")] + [DataRow(40, "::ff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(39, "::1ff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(38, "::3ff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(37, "::7ff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(36, "::fff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(35, "::1fff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(34, "::3fff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(33, "::7fff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(32, "::ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(31, "0:1:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(30, "0:3:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(29, "0:7:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(28, "0:f:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(27, "0:1f:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(26, "0:3f:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(25, "0:7f:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(24, "0:ff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(23, "0:1ff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(22, "0:3ff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(21, "0:7ff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(20, "0:fff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(19, "0:1fff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(18, "0:3fff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(17, "0:7fff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(16, "0:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(15, "1:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(14, "3:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(13, "7:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(12, "f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(11, "1f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(10, "3f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(9, "7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(8, "ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(7, "1ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(6, "3ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(5, "7ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(4, "fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(3, "1fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(2, "3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(1, "7fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + [DataRow(0, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")] + public void Test_WildcardMask_ipv6_cidr(int cidr, string expected) { var ipnetwork = IPNetwork2.Parse($"::/{cidr}"); @@ -189,5 +189,4 @@ public void Test_WildcardMask_ipv6_cidr(int cidr, string expected) Assert.AreEqual(cidr, cidr2, "netmask"); Assert.AreEqual(expectedcidr, wildcardcidr, "wildcardcidr"); } - } } \ No newline at end of file