Removes Unused Code (#217)

* Fixes #201, removes unused using statements

* Fixed unit tests

* Removed obsolete items

* Reduced assemblies scanned for routes

* Removes unused using statements in test project

.gitignore

@@ -26,6 +26,7 @@ TestResult.xml
 
 # Visual Studio 2015 cache/options directory
 .vs/
+.vscode/
 
 #SonarQube
 .sonarqube/

src/Grapevine.Local/Program.cs

@@ -34,7 +34,8 @@ public class TestResource
         [RestRoute(HttpMethod = HttpMethod.ALL, PathInfo = "^.*$")]
         public IHttpContext LevelOne(IHttpContext context)
         {
-            throw new Exception("Killing It!");
+            // throw new Exception("Killing It!");
+            return context;
         }
 
         [RestRoute]

src/Grapevine.Tests.Assembly/ToDoListRoutes.cs

@@ -1,5 +1,4 @@
 using Grapevine.Interfaces.Server;
-using Grapevine.Server;
 using Grapevine.Server.Attributes;
 using Grapevine.Shared;
 

src/Grapevine.Tests.Assembly/UserRoutes.cs

@@ -1,5 +1,4 @@
 using Grapevine.Interfaces.Server;
-using Grapevine.Server;
 using Grapevine.Server.Attributes;
 using Grapevine.Shared;
 

src/Grapevine.Tests/Client/RestClientFacts.cs

@@ -1,56 +1,39 @@
-using System;
-using System.Net;
-using Grapevine.Client;
-using Grapevine.Shared;
-using Shouldly;
-using Xunit;
-
-namespace Grapevine.Tests.Client
-{
-    public class RestClientFacts
-    {
-        public class Constructors
-        {
-            [Fact]
-            public void BaseInitialization()
-            {
-                const string baseurl = "http://localhost:1234/";
-
-                var client = new RestClient { Host = "localhost", Port = 1234, Scheme = UriScheme.Http };
-
-                client.BaseUrl.AbsoluteUri.ShouldBe(baseurl);
-                client.Cookies.ShouldNotBeNull();
-                client.Credentials.ShouldBeNull();
-            }
-        }
-
-        public class Execute
+using System;
+using Grapevine.Client;
+using Grapevine.Shared;
+using Shouldly;
+using Xunit;
+
+namespace Grapevine.Tests.Client
+{
+    public class RestClientFacts
+    {
+        public class Constructors
         {
             [Fact]
-            public void ClientRunsTimeoutDelegateOnRequestTimeoutIfSet()
+            public void BaseInitialization()
             {
-                var actionCalled = false;
-                Action updateActionCalled = () => actionCalled = true;
-
-                var client = new RestClient { RequestTimeoutAction = updateActionCalled,
-                    Host = "localhost", Port = 1234, Scheme = UriScheme.Http };
-
-                var req = new RestRequest { Timeout = 1, ContentType = ContentType.MIME };
+                const string baseurl = "http://localhost:1234/";
 
-                client.Execute(req);
+                var client = new RestClient { Host = "localhost", Port = 1234, Scheme = UriScheme.Http };
 
-                actionCalled.ShouldBeTrue();
+                client.BaseUrl.AbsoluteUri.ShouldBe(baseurl);
+                client.Cookies.ShouldNotBeNull();
+                client.Credentials.ShouldBeNull();
             }
+        }
 
+        public class Execute
+        {
             [Fact]
             public void ClientRethrowsExceptionIfNoTimeoutDelegateSetAndRequestTimesOut()
             {
                 var client = new RestClient { Host = "localhost", Port = 1234, Scheme = UriScheme.Http };
 
                 var req = new RestRequest { Timeout = 1, ContentType = ContentType.MIME };
 
-                Should.Throw<WebException>(() => client.Execute(req));
+                Should.Throw<Exception>(() => client.Execute(req));
             }
-        }
-    }
-}
+        }
+    }
+}

src/Grapevine.Tests/Mocks.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Net;
 using System.Text;
 using Grapevine.Interfaces.Server;

src/Grapevine.Tests/Server/AdvancedRestServerFacts.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using Grapevine.Interfaces.Server;
+using Grapevine.Interfaces.Server;
 using Grapevine.Server;
 using NSubstitute;
 using Shouldly;
@@ -14,7 +13,7 @@ public void AuthenticationSchemeSelectorDelegateProperty()
         {
             var listener = Substitute.For<IHttpListener>();
             var advanced = new AdvancedRestServer(listener);
-            
+
             var val = advanced.AuthenticationSchemeSelectorDelegate;
             advanced.AuthenticationSchemeSelectorDelegate = val;
 
@@ -35,32 +34,6 @@ public void AuthenticationSchemesProperty()
             listener.Received().AuthenticationSchemes = val;
         }
 
-        //[Fact]
-        //public void ExtendedProtectionPolicyProperty()
-        //{
-        //    var listener = Substitute.For<IHttpListener>();
-        //    var advanced = new AdvancedRestServer(listener);
-
-        //    var val = advanced.ExtendedProtectionPolicy;
-        //    advanced.ExtendedProtectionPolicy = val;
-
-        //    var temp = listener.Received().ExtendedProtectionPolicy;
-        //    listener.Received().ExtendedProtectionPolicy = val;
-        //}
-
-        //[Fact]
-        //public void ExtendedProtectionSelectorDelegateProperty()
-        //{
-        //    var listener = Substitute.For<IHttpListener>();
-        //    var advanced = new AdvancedRestServer(listener);
-
-        //    var val = advanced.ExtendedProtectionSelectorDelegate;
-        //    advanced.ExtendedProtectionSelectorDelegate = val;
-
-        //    var temp = listener.Received().ExtendedProtectionSelectorDelegate;
-        //    listener.Received().ExtendedProtectionSelectorDelegate = val;
-        //}
-
         [Fact]
         public void IgnoreWriteExceptionsProperty()
         {

src/Grapevine.Tests/Server/HttpResponseExtensionsFacts.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Runtime.InteropServices;
 using System.Text;
 using Grapevine.Interfaces.Server;
 using Grapevine.Server;
@@ -120,7 +119,7 @@ public void SendsStatusCodeAndException()
             {
                 const HttpStatusCode status = HttpStatusCode.EnhanceYourCalm;
                 var exception = new Exception("This is the exception message");
-                
+
                 var bytes = GetBytes($"{exception.Message}{Environment.NewLine}<br>{Environment.NewLine}{exception.StackTrace}");
 
                 _response.ContentEncoding = Encoding.ASCII;

src/Grapevine.Tests/Server/PublicFolderFacts.cs

@@ -37,7 +37,7 @@ public void NoParameters()
             [Fact]
             public void AbsolutePathShouldNotChange()
             {
-                const string path = @"C:\temp\kjhgf";
+                string path = Path.Combine(Path.GetTempPath(), "kjhgf");
 
                 var folder = new PublicFolder(path);
 

src/Grapevine.Tests/Server/RestServerExtensionsFacts.cs

@@ -14,7 +14,7 @@ public void StopsServer()
             var stopped = new ManualResetEvent(false);
             var port = PortFinder.FindNextLocalOpenPort(1234);
 
-            using (var server = new RestServer { Connections = 1, Port = port })
+            using (var server = new RestServer { Port = port })
             {
                 server.OnAfterStop += () => { stopped.Set(); };
 

src/Grapevine.Tests/Server/RestServerFacts.cs

@@ -2,12 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using Grapevine.Exceptions.Server;
 using Grapevine.Interfaces.Server;
-using Grapevine.Interfaces.Shared;
 using Grapevine.Server;
-using Grapevine.Shared;
 using Grapevine.Shared.Loggers;
 using NSubstitute;
 using Shouldly;
@@ -24,7 +21,6 @@ public void DefaultConfiguration()
             {
                 using (var server = new RestServer())
                 {
-                    server.Connections.ShouldBe(50);
                     server.EnableThrowingExceptions.ShouldBeFalse();
                     server.Host.ShouldBe("localhost");
                     server.IsListening.ShouldBeFalse();
@@ -773,9 +769,9 @@ public class CustomSettings : ServerSettings
         public CustomSettings()
         {
             Port = "5555";
-            OnBeforeStart = () =>
+            BeforeStarting += (s) =>
             {
-                UseHttps = true;
+                s.UseHttps = true;
             };
         }
     }

src/Grapevine.Tests/Server/RouterFacts.cs

@@ -100,7 +100,10 @@ public void ExecutesAfterRouting()
                     context.WasRespondedTo.Returns(true); return ctx; });
                 routing.Add(route);
 
-                var router = new Router { After = ctx => { executionOrder.Add("after"); return ctx; } };
+                var router = new Router();
+                router.AfterRouting += ctx => {
+                    executionOrder.Add("after");
+                };
 
                 router.Route(context, routing);
 
@@ -146,7 +149,8 @@ public void ExecutesBeforeRouting()
                     context.WasRespondedTo.Returns(true); return ctx; });
                 routing.Add(route);
 
-                var router = new Router { Before = ctx => { executionOrder.Add("before"); return ctx; } };
+                var router = new Router();
+                router.BeforeRouting += ctx => { executionOrder.Add("before"); };
 
                 router.Route(context, routing);
 

src/Grapevine.Tests/Server/ServerSettingsFacts.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Grapevine.Server;
@@ -31,65 +30,7 @@ public void DefaultConfiguration()
                 options.UseHttps.ShouldBeFalse();
                 options.Host.ShouldBe("localhost");
                 options.Port.ShouldBe("1234");
-                options.Connections.ShouldBe(50);
                 options.EnableThrowingExceptions.ShouldBeFalse();
-
-                options.OnAfterStart.ShouldBeNull();
-                options.OnBeforeStart.ShouldBeNull();
-
-                options.OnAfterStop.ShouldBeNull();
-                options.OnBeforeStop.ShouldBeNull();
-
-                options.OnStart.ShouldBeNull();
-                options.OnStop.ShouldBeNull();
-            }
-        }
-
-        public class OnStartProperty
-        {
-            [Fact]
-            public void IsSynonymForOnAfterStart()
-            {
-                var options = new ServerSettings();
-
-                Action action1 = () => { };
-                Action action2 = () => { };
-
-                options.OnStart = action1;
-
-                options.OnBeforeStart.ShouldBeNull();
-                options.OnAfterStart.ShouldBe(action1);
-                options.OnStart.ShouldBe(action1);
-
-                options.OnAfterStart = action2;
-
-                options.OnBeforeStart.ShouldBeNull();
-                options.OnAfterStart.ShouldBe(action2);
-                options.OnStart.ShouldBe(action2);
-            }
-        }
-
-        public class OnStopProperty
-        {
-            [Fact]
-            public void IsSynonymForOnAfterStop()
-            {
-                var options = new ServerSettings();
-
-                Action action1 = () => { };
-                Action action2 = () => { };
-
-                options.OnStop = action1;
-
-                options.OnBeforeStop.ShouldBeNull();
-                options.OnAfterStop.ShouldBe(action1);
-                options.OnStop.ShouldBe(action1);
-
-                options.OnAfterStop = action2;
-
-                options.OnBeforeStop.ShouldBeNull();
-                options.OnAfterStop.ShouldBe(action2);
-                options.OnStop.ShouldBe(action2);
             }
         }
 

src/Grapevine.Tests/Shared/ContentTypeFacts.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Grapevine.Shared;
 using Shouldly;
 using Xunit;

src/Grapevine/Client/RestClient.cs

@@ -69,8 +69,6 @@ public class RestClient : IRestClient
         public CookieContainer Cookies { get; }
         public ICredentials Credentials { get; set; }
 
-        private Action _requestTimeoutAction;
-
         public Dictionary<WebExceptionStatus, WebExceptionHandler> WebExceptionHandlers;
 
         public RestClient()
@@ -81,17 +79,6 @@ public RestClient()
             WebExceptionHandlers = new Dictionary<WebExceptionStatus, WebExceptionHandler>();
         }
 
-        [Obsolete("RequestTimeoutAction is deprecated, add an entry to WebExceptionHandlers instead.")]
-        public Action RequestTimeoutAction
-        {
-            get { return _requestTimeoutAction; }
-            set
-            {
-                _requestTimeoutAction = value;
-                WebExceptionHandlers[WebExceptionStatus.Timeout] = (client, request, exception) => _requestTimeoutAction();
-            }
-        }
-
         public string Host
         {
             get { return Builder.Host;  }