Implemented address selection and added tests #13

Author: FlorianRappl

src/AngleSharp.Io.Tests/AngleSharp.Io.Tests.csproj

@@ -73,6 +73,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Helper.cs" />
+    <Compile Include="Network\AboutTests.cs" />
     <Compile Include="Network\FileRequesterTests.cs" />
     <Compile Include="Network\FtpRequesterTests.cs" />
     <Compile Include="Network\HttpClientRequesterTests.cs" />

src/AngleSharp.Io.Tests/Network/AboutTests.cs

@@ -0,0 +1,80 @@
+namespace AngleSharp.Io.Tests.Network
+{
+    using AngleSharp.Network;
+    using AngleSharp.Network.Default;
+    using Io.Network;
+    using NUnit.Framework;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    [TestFixture]
+    public class AboutTests
+    {
+        [Test]
+        public async Task InvokeAboutSettingsLowercaseShouldWorkFine()
+        {
+            var about = new AboutRequester();
+            var requests = new List<IRequest>();
+            var req = new Request
+            {
+                Address = Url.Create("about://settings"),
+                Method = HttpMethod.Get
+            };
+
+            about.SetRoute("settings", (request, cancel) =>
+            {
+                requests.Add(request);
+                return Task.FromResult(default(IResponse));
+            });
+
+            var response = await about.RequestAsync(req, CancellationToken.None);
+            Assert.IsNull(response);
+            Assert.AreEqual(1, requests.Count);
+        }
+
+        [Test]
+        public async Task InvokeAboutSettingsUppercaseShouldWorkFine()
+        {
+            var about = new AboutRequester();
+            var requests = new List<IRequest>();
+            var req = new Request
+            {
+                Address = Url.Create("about://Settings"),
+                Method = HttpMethod.Get
+            };
+
+            about.SetRoute("settings", (request, cancel) =>
+            {
+                requests.Add(request);
+                return Task.FromResult(default(IResponse));
+            });
+
+            var response = await about.RequestAsync(req, CancellationToken.None);
+            Assert.IsNull(response);
+            Assert.AreEqual(1, requests.Count);
+        }
+
+        [Test]
+        public async Task InvokeAboutUnsetUrlShouldNotFire()
+        {
+            var about = new AboutRequester();
+            var requests = new List<IRequest>();
+            var req = new Request
+            {
+                Address = Url.Create("about://bookmarks"),
+                Method = HttpMethod.Get
+            };
+
+            about.SetRoute("settings", (request, cancel) =>
+            {
+                requests.Add(request);
+                return Task.FromResult(default(IResponse));
+            });
+
+            var response = await about.RequestAsync(req, CancellationToken.None);
+            Assert.IsNull(response);
+            Assert.AreEqual(0, requests.Count);
+        }
+    }
+}

src/AngleSharp.Io/Network/AboutRequester.cs

@@ -18,7 +18,7 @@ public class AboutRequester : IRequester
         /// </summary>
         public AboutRequester()
         {
-            _routes = new Dictionary<String, Func<IRequest, CancellationToken, Task<IResponse>>>();
+            _routes = new Dictionary<String, Func<IRequest, CancellationToken, Task<IResponse>>>(StringComparer.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
@@ -51,7 +51,8 @@ public Func<IRequest, CancellationToken, Task<IResponse>> GetRoute(String addres
         /// <returns>The task that will eventually give the response data.</returns>
         public Task<IResponse> RequestAsync(IRequest request, CancellationToken cancel)
         {
-            var route = GetRoute(request.Address.Data);
+            var address = GetAddress(request.Address.Data);
+            var route = GetRoute(address);
 
             if (route != null)
             {
@@ -70,5 +71,14 @@ public Boolean SupportsProtocol(String protocol)
         {
             return !String.IsNullOrEmpty(protocol) && protocol.Equals("about");
         }
+
+        private static String GetAddress(String data)
+        {
+            var skip = 0;
+
+            while (data.Length > skip && data[skip] == '/' && skip++ < 2) ;
+
+            return data.Remove(0, skip);
+        }
     }
 }