flipbit · flipbit · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,41 @@
+name: CI Build
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup .NET SDK
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 6.0.x
+
+    - name: Restore
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+
+    - name: Test
+      uses: zyborg/dotnet-tests-report@v1
+      with:
+        project_path: Whois.Tests
+        report_name: whois_tests
+        report_title: Whois Tests
+        github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Whois.Console/Whois.Console.csproj b/Whois.Console/Whois.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Whois.Console</AssemblyName>
     <RootNamespace>Whois</RootNamespace>
     <PackAsTool>true</PackAsTool>

diff --git a/Whois.Tests.Integration/Whois.Tests.Integration.csproj b/Whois.Tests.Integration/Whois.Tests.Integration.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Whois</RootNamespace>
     <ApplicationIcon />
     <OutputType>Library</OutputType>

diff --git a/Whois.Tests/Parsing/capetown-whois.registry.net.za/capetown/CapetownParsingTests.cs b/Whois.Tests/Parsing/capetown-whois.registry.net.za/capetown/CapetownParsingTests.cs
@@ -26,8 +26,6 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
             Assert.AreEqual("nosuchdomain.capetown", response.DomainName.ToString());
-
-            AssertWriter.Write(response);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.afilias-grs.info/bz/BzParsingTests.cs b/Whois.Tests/Parsing/whois.afilias-grs.info/bz/BzParsingTests.cs
@@ -35,8 +35,6 @@ public void Test_found()
 
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
-
-            AssertWriter.Write(response);
         }
     }
 }
diff --git a/Whois.Tests/Parsing/whois.cctld.uz/uz/UzParsingTests.cs b/Whois.Tests/Parsing/whois.cctld.uz/uz/UzParsingTests.cs
@@ -106,7 +106,6 @@ public void Test_reserved()
             Assert.AreEqual("RESERVED", response.DomainStatus[0]);
 
             Assert.AreEqual(42, response.FieldsParsed);
-            AssertWriter.Write(response);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.cira.ca/ca/CaParsingTests.cs b/Whois.Tests/Parsing/whois.cira.ca/ca/CaParsingTests.cs
@@ -142,8 +142,6 @@ public void Test_not_assigned()
             Assert.AreEqual("auto-renew grace", response.DomainStatus[0]);
 
             Assert.AreEqual(27, response.FieldsParsed);
-
-            AssertWriter.Write(response);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.co.ug/ug/UgParsingTests.cs b/Whois.Tests/Parsing/whois.co.ug/ug/UgParsingTests.cs
@@ -70,7 +70,6 @@ public void Test_found()
             Assert.AreEqual("ACTIVE", response.DomainStatus[0]);
 
             Assert.AreEqual(23, response.FieldsParsed);
-            AssertWriter.Write(response);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.dot.cf/cf/CfParsingTests.cs b/Whois.Tests/Parsing/whois.dot.cf/cf/CfParsingTests.cs
@@ -132,7 +132,6 @@ public void Test_found_status_registered()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.dot.cf/cf/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.dotname.co.kr/com/ComParsingTests.cs b/Whois.Tests/Parsing/whois.dotname.co.kr/com/ComParsingTests.cs
@@ -27,7 +27,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("generic/tld/Found02", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.educause.edu/edu/EduParsingTests.cs b/Whois.Tests/Parsing/whois.educause.edu/edu/EduParsingTests.cs
@@ -343,7 +343,6 @@ public void Test_found_fixture6()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.educause.edu/edu/Found03", response.TemplateName);
 
@@ -972,7 +971,6 @@ public void Test_found_updated_on_unknown()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.educause.edu/edu/Found01", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.eenet.ee/ee/EeParsingTests.cs b/Whois.Tests/Parsing/whois.eenet.ee/ee/EeParsingTests.cs
@@ -43,7 +43,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.eenet.ee/ee/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.eu/eu/EuParsingTests.cs b/Whois.Tests/Parsing/whois.eu/eu/EuParsingTests.cs
@@ -25,7 +25,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.eu/eu/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.iana.org/tld/TldParsingTests.cs b/Whois.Tests/Parsing/whois.iana.org/tld/TldParsingTests.cs
@@ -177,7 +177,12 @@ public void Test_not_assigned()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotAssigned, response.Status);
 
-            AssertWriter.Write(response);
+            Assert.AreEqual(0, response.ParsingErrors);
+            Assert.AreEqual("whois.iana.org/tld/NotAssigned", response.TemplateName);
+
+            Assert.AreEqual("eh", response.DomainName.ToString());
+
+            Assert.AreEqual(2, response.FieldsParsed);
         }
     }
 }
diff --git a/Whois.Tests/Parsing/whois.iis.nu/nu/NuParsingTests.cs b/Whois.Tests/Parsing/whois.iis.nu/nu/NuParsingTests.cs
@@ -43,7 +43,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.iis.nu/nu/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.ja.net/ac.uk/AcUkParsingTests.cs b/Whois.Tests/Parsing/whois.ja.net/ac.uk/AcUkParsingTests.cs
@@ -26,7 +26,6 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.ja.net/NotFound", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.co/co/CoParsingTests.cs b/Whois.Tests/Parsing/whois.nic.co/co/CoParsingTests.cs
@@ -43,7 +43,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.co/co/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.coop/coop/CoopParsingTests.cs b/Whois.Tests/Parsing/whois.nic.coop/coop/CoopParsingTests.cs
@@ -248,7 +248,6 @@ public void Test_found_status_registered()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.coop/coop/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.ec/ex/ExParsingTests.cs b/Whois.Tests/Parsing/whois.nic.ec/ex/ExParsingTests.cs
@@ -43,7 +43,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.ec/ex/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.gs/gs/GsParsingTests.cs b/Whois.Tests/Parsing/whois.nic.gs/gs/GsParsingTests.cs
@@ -26,7 +26,6 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.gs/gs/NotFound", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.it/it/ItParsingTests.cs b/Whois.Tests/Parsing/whois.nic.it/it/ItParsingTests.cs
@@ -1433,7 +1433,6 @@ public void Test_found_technical_contact()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.it/it/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.mx/mx/MxParsingTests.cs b/Whois.Tests/Parsing/whois.nic.mx/mx/MxParsingTests.cs
@@ -162,7 +162,6 @@ public void Test_found_status_registered()
             Assert.AreEqual("California", response.TechnicalContact.Address[1]);
             Assert.AreEqual("United States", response.TechnicalContact.Address[2]);
 
-
             Assert.AreEqual(23, response.FieldsParsed);
         }
     }

diff --git a/Whois.Tests/Parsing/whois.nic.priv.at/at/AtParsingTests.cs b/Whois.Tests/Parsing/whois.nic.priv.at/at/AtParsingTests.cs
@@ -41,7 +41,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.priv.at/at/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.sh/sh/ShParsingTests.cs b/Whois.Tests/Parsing/whois.nic.sh/sh/ShParsingTests.cs
@@ -26,7 +26,12 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
 
-            AssertWriter.Write(response);
+            Assert.AreEqual(0, response.ParsingErrors);
+            Assert.AreEqual("whois.nic.sh/sh/NotFound", response.TemplateName);
+
+            Assert.AreEqual("u34jedzcq.sh", response.DomainName.ToString());
+
+            Assert.AreEqual(2, response.FieldsParsed);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.nic.sl/sl/SlParsingTests.cs b/Whois.Tests/Parsing/whois.nic.sl/sl/SlParsingTests.cs
@@ -42,7 +42,6 @@ public void Test_found()
 
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.sl/sl/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.nic.sn/sn/SnParsingTests.cs b/Whois.Tests/Parsing/whois.nic.sn/sn/SnParsingTests.cs
@@ -26,7 +26,12 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
 
-            AssertWriter.Write(response);
+            Assert.AreEqual(0, response.ParsingErrors);
+            Assert.AreEqual("whois.nic.sn/sn/NotFound", response.TemplateName);
+
+            Assert.AreEqual("u34jedzcq.sn", response.DomainName.ToString());
+
+            Assert.AreEqual(2, response.FieldsParsed);
         }
 
         [Test]

diff --git a/Whois.Tests/Parsing/whois.nic.uk/uk/UkParsingTests.cs b/Whois.Tests/Parsing/whois.nic.uk/uk/UkParsingTests.cs
@@ -682,7 +682,6 @@ public void Test_suspended_status_suspended()
 
             Assert.AreEqual(WhoisStatus.Suspended, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.nic.uk/uk/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.register.si/si/SiParsingTests.cs b/Whois.Tests/Parsing/whois.register.si/si/SiParsingTests.cs
@@ -41,7 +41,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.register.si/si/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.registro.br/br/BrParsingTests.cs b/Whois.Tests/Parsing/whois.registro.br/br/BrParsingTests.cs
@@ -193,7 +193,6 @@ public void Test_found_001hosting()
 
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.registro.br/br/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.registry.hm/hm/HmParsingTests.cs b/Whois.Tests/Parsing/whois.registry.hm/hm/HmParsingTests.cs
@@ -41,7 +41,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.registry.hm/hm/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.sgnic.sg/sg/SgParsingTests.cs b/Whois.Tests/Parsing/whois.sgnic.sg/sg/SgParsingTests.cs
@@ -70,7 +70,6 @@ public void Test_found_nameservers_schema_1_with_ip()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.sgnic.sg/sg/Found01", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.thnic.co.th/th/ThParsingTests.cs b/Whois.Tests/Parsing/whois.thnic.co.th/th/ThParsingTests.cs
@@ -43,7 +43,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.thnic.co.th/th/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois.tld.ee/ee/EeParsingTests.cs b/Whois.Tests/Parsing/whois.tld.ee/ee/EeParsingTests.cs
@@ -139,7 +139,6 @@ public void Test_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.Found, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("whois.tld.ee/ee/Found", response.TemplateName);
 

diff --git a/Whois.Tests/Parsing/whois1.nic.bi/bi/BiParsingTests.cs b/Whois.Tests/Parsing/whois1.nic.bi/bi/BiParsingTests.cs
@@ -26,7 +26,6 @@ public void Test_not_found()
             Assert.Greater(sample.Length, 0);
             Assert.AreEqual(WhoisStatus.NotFound, response.Status);
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
             Assert.AreEqual("generic/tld/NotFound004", response.TemplateName);
 

diff --git a/Whois.Tests/SampleReader.cs b/Whois.Tests/SampleReader.cs
@@ -6,7 +6,8 @@ public class SampleReader
     {
         public string Read(string whoisServer, string tld, string sampleFileName)
         {
-            var directory = Path.Join("..\\..\\..\\Samples", whoisServer, tld);
+            var sampleDirectory = Path.GetFullPath(Path.Join("..", "..", "..", "Samples"));
+            var directory = Path.Join(sampleDirectory, whoisServer, tld);
             var fileName = Path.Join(directory, sampleFileName);
 
             return File.ReadAllText(fileName);

diff --git a/Whois.Tests/Servers/IanaServerLookupTest.cs b/Whois.Tests/Servers/IanaServerLookupTest.cs
@@ -104,7 +104,6 @@ public void TestLookupBe()
 
             var response = lookup.Lookup(new WhoisRequest("test.be"));
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
 
             Assert.AreEqual("be", response.DomainName.ToString());
@@ -176,12 +175,10 @@ public void TestLookupNotFound()
 
             var response = lookup.Lookup(new WhoisRequest("test.be"));
 
-            AssertWriter.Write(response);
             Assert.AreEqual(0, response.ParsingErrors);
 
             Assert.AreEqual("eh", response.DomainName.ToString());
 
-
             Assert.AreEqual(0, response.FieldsParsed);
         }
     }

diff --git a/Whois.Tests/Whois.Tests.csproj b/Whois.Tests/Whois.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Whois</RootNamespace>
     <ApplicationIcon />
     <OutputType>Library</OutputType>

diff --git a/Whois.sln b/Whois.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Whois.Console", "Whois.Console\Whois.Console.csproj", "{611C1679-3605-49A6-902F-DEBFBBC9E0A4}"
 EndProject
@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2C0D742E-EB77-4FFB-85C5-EFEE3A50DDEE}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
+		.github\workflows\ci.yml = .github\workflows\ci.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,6 @@ public void Test_reserved() @@
                 Assert.AreEqual("RESERVED", response.DomainStatus[0]);
                 Assert.AreEqual(42, response.FieldsParsed);
-                AssertWriter.Write(response);
             }
             [Test]
@@ Expand Down @@