Merge pull request #240 from ivaylokenov/mocking-controller-properties

ivaylokenov · ivaylokenov · commit 69821c9a1551 · 2016-01-06T01:37:38.000+02:00
Base address for all requests
diff --git a/documentation/MyTested.WebApi.1.1.8.nupkg b/documentation/MyTested.WebApi.1.1.8.nupkg
diff --git a/documentation/MyTested.WebApi.1.1.9.nupkg b/documentation/MyTested.WebApi.1.1.9.nupkg
diff --git a/documentation/README.md b/documentation/README.md
@@ -7,6 +7,7 @@
 
  - Global configuration
   - [Using custom HttpConfiguration](#using-custom-httpconfiguration)
+  - [Base address](#base-address)
  - Route validations
   - [Building route request](#building-route-request)
   - [Testing routes](#testing-routes)
@@ -78,6 +79,29 @@ MyWebApi
 
 [To top](#table-of-contents)
   
+### Base address
+
+By default all unit tests are run with request host **"http://localhost"** and **Url.Link** will use it as base address. Another host can be configured easily after setting the HTTP configuration:
+
+```c#
+// sets all test requests to come from custom base address
+// ** this will also set the global remote server
+MyWebApi
+	.IsRegisteredWith(WebApiConfig.Register)
+	.WithBaseAddress("http://mytestedasp.net");
+
+// these are also available
+MyWebApi
+	.IsUsingDefaultHttpConfiguration()
+	.WithBaseAddress("http://mytestedasp.net");
+	
+MyWebApi
+	.IsUsing(httpConfiguration)
+	.WithBaseAddress("http://mytestedasp.net");
+```
+
+[To top](#table-of-contents)
+  
 ### Building route request
 
 You can test routes using the internal ASP.NET Web API
@@ -2630,6 +2654,8 @@ MyWebApi
 	.ContainingContentHeader(HttpContentHeader.ContentType);
 
 // configure global base address
+// ** this step is not necessary, if you already provided 
+// ** a base address through the configuration
 MyWebApi.Server().IsLocatedAt("http://mytestedasp.net");
 
 MyWebApi
diff --git a/src/MyTested.WebApi.Tests/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs b/src/MyTested.WebApi.Tests/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs
@@ -123,7 +123,7 @@ public void ChangingRoutePrefixToShouldNotThrowExceptionWithCorrectTheAttribute(
             MyWebApi
                 .Controller<WebApiController>()
                 .ShouldHave()
-                .Attributes(attributes => attributes.ChangingRoutePrefixTo("/api/test"));
+                .Attributes(attributes => attributes.ChangingRoutePrefixTo("api/test"));
         }
 
         [Test]
@@ -132,19 +132,19 @@ public void ChangingRoutePrefixToShouldNotThrowExceptionWithCorrectTheAttributeA
             MyWebApi
                 .Controller<WebApiController>()
                 .ShouldHave()
-                .Attributes(attributes => attributes.ChangingRoutePrefixTo("/api/Test"));
+                .Attributes(attributes => attributes.ChangingRoutePrefixTo("api/Test"));
         }
 
         [Test]
         [ExpectedException(
             typeof(AttributeAssertionException),
-            ExpectedMessage = "When testing WebApiController was expected to have RoutePrefixAttribute with '/api/another' prefix, but in fact found '/api/test'.")]
+            ExpectedMessage = "When testing WebApiController was expected to have RoutePrefixAttribute with 'api/another' prefix, but in fact found 'api/test'.")]
         public void ChangingRoutePrefixToShouldThrowExceptionWithControllerWithTheAttributeAndWrongPrefix()
         {
             MyWebApi
                 .Controller<WebApiController>()
                 .ShouldHave()
-                .Attributes(attributes => attributes.ChangingRoutePrefixTo("/api/another"));
+                .Attributes(attributes => attributes.ChangingRoutePrefixTo("api/another"));
         }
 
         [Test]
@@ -156,7 +156,7 @@ public void ChangingActionNameToShouldThrowExceptionWithActionWithoutTheAttribut
             MyWebApi
                 .Controller<AttributesController>()
                 .ShouldHave()
-                .Attributes(attributes => attributes.ChangingRoutePrefixTo("/api/test"));
+                .Attributes(attributes => attributes.ChangingRoutePrefixTo("api/test"));
         }
 
         [Test]
diff --git a/src/MyTested.WebApi.Tests/BuildersTests/ControllersTests/ControllerBuilderTests.cs b/src/MyTested.WebApi.Tests/BuildersTests/ControllersTests/ControllerBuilderTests.cs
@@ -12,6 +12,7 @@ namespace MyTested.WebApi.Tests.BuildersTests.ControllersTests
     using System.Web.Http.Results;
     using Builders.Contracts.Actions;
     using Builders.Contracts.Base;
+    using Common.Servers;
     using Exceptions;
     using NUnit.Framework;
     using Setups;
@@ -420,6 +421,39 @@ public void WithHttpConfigurationShouldOverrideTheDefaultOne()
             Assert.AreSame(config, controllerConfigFromApi);
         }
 
+        [Test]
+        public void LinkGenerationShouldWorkCorrectlyWithDefaultConfiguration()
+        {
+            MyWebApi.IsUsingDefaultHttpConfiguration();
+
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.WithGeneratedLink(1))
+                .ShouldReturn()
+                .Created()
+                .AtLocation("http://localhost/api/test?id=1");
+
+            MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());
+        }
+
+        [Test]
+        public void LinkGenerationShouldWorkCorrectlyWithCustomBaseAddress()
+        {
+            MyWebApi
+                .IsUsingDefaultHttpConfiguration()
+                .WithBaseAddress("http://mytestedasp.net");
+
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.WithGeneratedLink(1))
+                .ShouldReturn()
+                .Created()
+                .AtLocation("http://mytestedasp.net/api/test?id=1");
+
+            RemoteServer.DisposeGlobal();
+            MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());
+        }
+
         private void CheckActionResultTestBuilder<TActionResult>(
             IActionResultTestBuilder<TActionResult> actionResultTestBuilder,
             string expectedActionName)
diff --git a/src/MyTested.WebApi.Tests/BuildersTests/HttpConfigurationBuilderTests.cs b/src/MyTested.WebApi.Tests/BuildersTests/HttpConfigurationBuilderTests.cs
@@ -38,6 +38,28 @@ public void DefaultErrorDetailPolicyShouldBeAlways()
             MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());
         }
 
+        [Test]
+        public void WithBaseAddressShouldChangedDefaultAddress()
+        {
+            Assert.IsFalse(RemoteServer.GlobalIsConfigured);
+            Assert.AreEqual(MyWebApi.DefaultHost, MyWebApi.BaseAddress.OriginalString);
+
+            string address = "http://mytestedasp.net";
+
+            MyWebApi
+                .IsUsingDefaultHttpConfiguration()
+                .WithBaseAddress(address);
+
+            Assert.AreEqual(address, MyWebApi.BaseAddress.OriginalString);
+            Assert.IsTrue(RemoteServer.GlobalIsConfigured);
+
+            MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());
+
+            Assert.AreEqual(MyWebApi.DefaultHost, MyWebApi.BaseAddress.OriginalString);
+
+            RemoteServer.DisposeGlobal();
+        }
+
         [Test]
         public void WithErrorDetailPolicyShouldSetCorrectErrorDetailPolicy()
         {
diff --git a/src/MyTested.WebApi.Tests/MyWebApiTests.cs b/src/MyTested.WebApi.Tests/MyWebApiTests.cs
@@ -124,7 +124,7 @@ public void IsUsingDefaultConfigurationShouldWorkCorrectly()
             MyWebApi.IsUsingDefaultHttpConfiguration();
 
             Assert.IsNotNull(MyWebApi.Configuration);
-            Assert.AreEqual(0, MyWebApi.Configuration.Routes.Count);
+            Assert.IsTrue(MyWebApi.Configuration.Routes.ContainsKey("API Default"));
 
             MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());
         }
diff --git a/src/MyTested.WebApi.Tests/Properties/AssemblyInfo.cs b/src/MyTested.WebApi.Tests/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("29f6a15e-c6d1-4c93-83c8-18ff839950e8")]
 
-[assembly: AssemblyVersion("1.1.5.0")]
-[assembly: AssemblyFileVersion("1.1.5.0")]
+[assembly: AssemblyVersion("1.1.9.0")]
+[assembly: AssemblyFileVersion("1.1.9.0")]
diff --git a/src/MyTested.WebApi.Tests/Setups/Controllers/WebApiController.cs b/src/MyTested.WebApi.Tests/Setups/Controllers/WebApiController.cs
@@ -20,7 +20,7 @@ namespace MyTested.WebApi.Tests.Setups.Controllers
     using Services;
 
     [Authorize(Roles = "Admin,Moderator", Users = "John,George")]
-    [RoutePrefix("/api/test")]
+    [RoutePrefix("api/test")]
     internal class WebApiController : ApiController
     {
         private readonly ICollection<ResponseModel> responseModel;
@@ -70,6 +70,12 @@ public ICollection<ResponseModel> ResponseModel
 
         public RequestModel InjectedRequestModel { get; private set; }
 
+        public IHttpActionResult WithGeneratedLink(int id)
+        {
+            var link = this.Url.Link("TestRouteAttributes", new { id = 1 });
+            return this.Created(link, "content");
+        }
+
         public IHttpActionResult CustomRequestAction()
         {
             if (this.Request.Method == HttpMethod.Post && this.Request.Headers.Contains("TestHeader"))
diff --git a/src/MyTested.WebApi/Builders/Contracts/IHttpConfigurationBuilder.cs b/src/MyTested.WebApi/Builders/Contracts/IHttpConfigurationBuilder.cs
@@ -23,5 +23,12 @@ public interface IHttpConfigurationBuilder
         /// <param name="errorDetailPolicy">Error details policy to use.</param>
         /// <returns>The same HTTP configuration builder.</returns>
         IHttpConfigurationBuilder WithErrorDetailPolicy(IncludeErrorDetailPolicy errorDetailPolicy);
+
+        /// <summary>
+        /// Sets the global base address to be used across the test cases. Default is local host.
+        /// </summary>
+        /// <param name="baseAddress">Base address to use.</param>
+        /// <returns>The same HTTP configuration builder.</returns>
+        IHttpConfigurationBuilder WithBaseAddress(string baseAddress);
     }
 }
diff --git a/src/MyTested.WebApi/Builders/Contracts/Servers/IServer.cs b/src/MyTested.WebApi/Builders/Contracts/Servers/IServer.cs
@@ -26,7 +26,7 @@ public interface IServer
         /// <param name="port">Network port on which the server will listen for requests.</param>
         /// <param name="host">Network host on which the server will listen for requests.</param>
         /// <returns>Server builder.</returns>
-        IServerBuilder Starts<TStartup>(int port = OwinTestServer.DefaultPort, string host = OwinTestServer.DefaultHost);
+        IServerBuilder Starts<TStartup>(int port = MyWebApi.DefaultPort, string host = MyWebApi.DefaultHost);
 
         /// <summary>
         /// Configures global remote server.
@@ -60,7 +60,7 @@ public interface IServer
         /// <param name="port">Network port on which the server will listen for requests.</param>
         /// <param name="host">Network host on which the server will listen for requests.</param>
         /// <returns>Server builder to set specific HTTP requests.</returns>
-        IServerBuilder Working<TStartup>(int port = OwinTestServer.DefaultPort, string host = OwinTestServer.DefaultHost);
+        IServerBuilder Working<TStartup>(int port = MyWebApi.DefaultPort, string host = MyWebApi.DefaultHost);
 
         /// <summary>
         /// Processes HTTP request on globally configured remote HTTP server.
diff --git a/src/MyTested.WebApi/Builders/Controllers/ControllerBuilder.cs b/src/MyTested.WebApi/Builders/Controllers/ControllerBuilder.cs
@@ -44,7 +44,7 @@ public ControllerBuilder(TController controllerInstance)
         {
             this.Controller = controllerInstance;
             this.aggregatedDependencies = new Dictionary<Type, object>();
-            this.HttpRequestMessage = new HttpRequestMessage();
+            this.HttpRequestMessage = new HttpRequestMessage(HttpMethod.Get, MyWebApi.BaseAddress);
             this.isPreparedForTesting = false;
             this.enabledValidation = true;
         }
@@ -384,6 +384,7 @@ private string GetAndValidateAction(LambdaExpression actionCall)
         private void PrepareController()
         {
             this.controller.Request = this.HttpRequestMessage;
+            this.controller.Request.TransformToAbsoluteRequestUri();
             this.controller.RequestContext = this.HttpRequestMessage.GetRequestContext();
             this.controller.Configuration = this.HttpConfiguration ?? MyWebApi.Configuration ?? new HttpConfiguration();
             this.controller.User = MockedIPrinciple.CreateUnauthenticated();
diff --git a/src/MyTested.WebApi/Builders/HttpConfigurationBuilder.cs b/src/MyTested.WebApi/Builders/HttpConfigurationBuilder.cs
@@ -4,7 +4,9 @@
 // Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
 namespace MyTested.WebApi.Builders
 {
+    using System;
     using System.Web.Http;
+    using Common.Servers;
     using Contracts;
     using Servers;
 
@@ -22,7 +24,7 @@ public class HttpConfigurationBuilder : IHttpConfigurationBuilder
         public HttpConfigurationBuilder(HttpConfiguration httpConfiguration)
         {
             this.httpConfiguration = httpConfiguration;
-            this.SetErrorDetailPolicy(IncludeErrorDetailPolicy.Always);
+            this.SetErrorDetailPolicyAndInitialize(IncludeErrorDetailPolicy.Always);
         }
 
         /// <summary>
@@ -41,15 +43,33 @@ public IServerBuilder AndStartsServer()
         /// <returns>The same HTTP configuration builder.</returns>
         public IHttpConfigurationBuilder WithErrorDetailPolicy(IncludeErrorDetailPolicy errorDetailPolicy)
         {
-            this.SetErrorDetailPolicy(errorDetailPolicy);
+            this.SetErrorDetailPolicyAndInitialize(errorDetailPolicy);
             return this;
         }
 
-        private void SetErrorDetailPolicy(IncludeErrorDetailPolicy errorDetailPolicy)
+        /// <summary>
+        /// Sets the global base address to be used across the test cases. Default is local host.
+        /// </summary>
+        /// <param name="baseAddress">Base address to use.</param>
+        /// <returns>The same HTTP configuration builder.</returns>
+        public IHttpConfigurationBuilder WithBaseAddress(string baseAddress)
+        {
+            MyWebApi.BaseAddress = new Uri(baseAddress, UriKind.Absolute);
+
+            if (!RemoteServer.GlobalIsConfigured)
+            {
+                RemoteServer.ConfigureGlobal(baseAddress);
+            }
+
+            return this;
+        }
+
+        private void SetErrorDetailPolicyAndInitialize(IncludeErrorDetailPolicy errorDetailPolicy)
         {
             if (this.httpConfiguration != null)
             {
                 this.httpConfiguration.IncludeErrorDetailPolicy = errorDetailPolicy;
+                this.httpConfiguration.EnsureInitialized();
             }
         }
     }
diff --git a/src/MyTested.WebApi/Builders/Servers/Server.cs b/src/MyTested.WebApi/Builders/Servers/Server.cs
@@ -39,7 +39,7 @@ public IServerBuilder Starts(HttpConfiguration httpConfiguration = null)
         /// <param name="port">Network port on which the server will listen for requests.</param>
         /// <param name="host">Network host on which the server will listen for requests.</param>
         /// <returns>Server builder.</returns>
-        public IServerBuilder Starts<TStartup>(int port = OwinTestServer.DefaultPort, string host = OwinTestServer.DefaultHost)
+        public IServerBuilder Starts<TStartup>(int port = MyWebApi.DefaultPort, string host = MyWebApi.DefaultHost)
         {
             OwinTestServer.StartGlobal<TStartup>(this.GetStartOptions(port, host));
             return this.Working();
@@ -111,7 +111,7 @@ public IServerBuilder Working(HttpConfiguration httpConfiguration)
         /// <param name="port">Network port on which the server will listen for requests.</param>
         /// <param name="host">Network host on which the server will listen for requests.</param>
         /// <returns>Server builder to set specific HTTP requests.</returns>
-        public IServerBuilder Working<TStartup>(int port = OwinTestServer.DefaultPort, string host = OwinTestServer.DefaultHost)
+        public IServerBuilder Working<TStartup>(int port = MyWebApi.DefaultPort, string host = MyWebApi.DefaultHost)
         {
             var options = this.GetStartOptions(port, host);
             var server = OwinTestServer.CreateNewServer<TStartup>(options);
diff --git a/src/MyTested.WebApi/Common/Extensions/HttpRequestMessageExtensions.cs b/src/MyTested.WebApi/Common/Extensions/HttpRequestMessageExtensions.cs
@@ -18,7 +18,10 @@ public static class HttpRequestMessageExtensions
         /// <param name="request">HTTP request message to transform.</param>
         public static void TransformToAbsoluteRequestUri(this HttpRequestMessage request)
         {
-            request.RequestUri = new Uri(new Uri("http://absoluteuri.com"), request.RequestUri);
+            if (request.RequestUri != null && !request.RequestUri.IsAbsoluteUri)
+            {
+                request.RequestUri = new Uri(MyWebApi.BaseAddress, request.RequestUri);
+            }
         }
     }
 }
diff --git a/src/MyTested.WebApi/Common/Servers/OwinTestServer.cs b/src/MyTested.WebApi/Common/Servers/OwinTestServer.cs
@@ -13,16 +13,6 @@ namespace MyTested.WebApi.Common.Servers
     /// </summary>
     public static class OwinTestServer
     {
-        /// <summary>
-        /// Default host on which the OWIN server will listen - local host.
-        /// </summary>
-        public const string DefaultHost = "http://localhost";
-
-        /// <summary>
-        /// Default port on which the OWIN server will listen - 80.
-        /// </summary>
-        public const int DefaultPort = 80;
-
         /// <summary>
         /// Gets the global OWIN server used in the testing.
         /// </summary>
diff --git a/src/MyTested.WebApi/MyWebApi.cs b/src/MyTested.WebApi/MyWebApi.cs
diff --git a/src/MyTested.WebApi/Properties/AssemblyInfo.cs b/src/MyTested.WebApi/Properties/AssemblyInfo.cs

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public void IsUsingDefaultConfigurationShouldWorkCorrectly()`
`124`	`124`	`MyWebApi.IsUsingDefaultHttpConfiguration();`
`125`	`125`
`126`	`126`	`Assert.IsNotNull(MyWebApi.Configuration);`
`127`		`- Assert.AreEqual(0, MyWebApi.Configuration.Routes.Count);`
	`127`	`+ Assert.IsTrue(MyWebApi.Configuration.Routes.ContainsKey("API Default"));`
`128`	`128`
`129`	`129`	`MyWebApi.IsUsing(TestObjectFactory.GetHttpConfigurationWithRoutes());`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,12 @@ public interface IHttpConfigurationBuilder`
`23`	`23`	`/// <param name="errorDetailPolicy">Error details policy to use.</param>`
`24`	`24`	`/// <returns>The same HTTP configuration builder.</returns>`
`25`	`25`	`IHttpConfigurationBuilder WithErrorDetailPolicy(IncludeErrorDetailPolicy errorDetailPolicy);`
	`26`	`+`
	`27`	`+ /// <summary>`
	`28`	`+ /// Sets the global base address to be used across the test cases. Default is local host.`
	`29`	`+ /// </summary>`
	`30`	`+ /// <param name="baseAddress">Base address to use.</param>`
	`31`	`+ /// <returns>The same HTTP configuration builder.</returns>`
	`32`	`+ IHttpConfigurationBuilder WithBaseAddress(string baseAddress);`
`26`	`33`	`}`
`27`	`34`	`}`