Misc refactoring & tweaks

Author: darrylwhitmore

NScrape.Test/HtmlFormDefinitionTests.cs renamed to NScrape.Test/Forms/HtmlFormDefinitionTests.cs

@@ -1,8 +1,8 @@
 using System.Linq;
-using Xunit;
 using NScrape.Forms;
+using Xunit;
 
-namespace NScrape.Test {
+namespace NScrape.Test.Forms {
 	public class HtmlFormDefinitionTests {
 		[Fact]
 		public void TestSingleFormTextsAndDropdown() {

NScrape.Test/HtmlFormTests.cs renamed to NScrape.Test/Forms/HtmlFormTests.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Xunit;
 using NScrape.Forms;
+using Xunit;
 
-namespace NScrape.Test {
+namespace NScrape.Test.Forms {
 	public class HtmlFormTests {
 		private class TestScraper : Scraper {
 			public TestScraper( string html ) : base( html ) {

NScrape.Test/NScrape.Test.csproj

@@ -65,8 +65,8 @@
     <Compile Include="NScrapeExtensionTests.cs" />
     <Compile Include="WebResponseTests.cs" />
     <Compile Include="NScrapeUtilityTryParseHttpDateTests.cs" />
-    <Compile Include="HtmlFormTests.cs" />
-    <Compile Include="HtmlFormDefinitionTests.cs" />
+    <Compile Include="Forms\HtmlFormTests.cs" />
+    <Compile Include="Forms\HtmlFormDefinitionTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>

NScrape.Test/WebResponseTests.cs

@@ -219,7 +219,7 @@ public void ImageWebResponseTest() {
 		public void BinaryWebResponseTest() {
 			var webClient = new WebClient();
 
-			var uri = new Uri( "https://download-cdn.getsync.com/stable/windows64/BitTorrent-Sync_x64.exe" );
+			var uri = new Uri( "https://download-cdn.getsync.com/stable/windows64/Resilio-Sync_x64.exe" );
 
 			using ( var response = webClient.SendRequest( uri ) ) {
 				Assert.NotNull( response );
@@ -249,7 +249,7 @@ public void BinaryWebResponseTest() {
 		public void BinaryWebResponseDataPropertyBackwardsCompatibilityTest() {
 			var webClient = new WebClient();
 
-			var uri = new Uri( "https://download-cdn.getsync.com/stable/windows64/BitTorrent-Sync_x64.exe" );
+			var uri = new Uri( "https://download-cdn.getsync.com/stable/windows64/Resilio-Sync_x64.exe" );
 
 			using ( var response = webClient.SendRequest( uri ) ) {
 				Assert.NotNull( response );

NScrape/Cookies/SetCookieHeaderGrammar.cs

@@ -4,7 +4,7 @@ namespace NScrape.Cookies {
 	// Building an External DSL in C#
 	// http://nblumhardt.com/2010/01/building-an-external-dsl-in-c/
 	//
-	// sprache/Sprache
+	// Sprache
 	// https://github.com/sprache/Sprache
 	internal static class SetCookieHeaderGrammar {
 		public static readonly Parser<char> EqualsSeparator = Parse.Char( '=' );

NScrape/NScrapeUtility.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using NScrape.Cookies;
 using Sprache;

NScrape/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyFileVersion( "0.2.0.0" )]
-[assembly: AssemblyInformationalVersion( "0.2.0.0" )]
-[assembly: AssemblyVersion( "0.2.0.0" )]
+[assembly: AssemblyFileVersion( "0.3.0.0" )]
+[assembly: AssemblyInformationalVersion( "0.3.0.0" )]
+[assembly: AssemblyVersion( "0.3.0.0" )]

NScrape/WebClient.cs

@@ -327,9 +327,7 @@ public WebResponse SendRequest( WebRequest webRequest ) {
             catch ( WebException ex ) {
                 response = new ExceptionWebResponse( webRequest.Destination, ex );
 
-				if ( webResponse != null ) {
-					webResponse.Dispose();
-				}
+	            webResponse?.Dispose();
             }
 
             return response;