Merge pull request #158 from ivaylokenov/development

Version 0.9

Author: ivaylokenov

documentation/README.md

@@ -63,7 +63,7 @@ MyWebApi
 	.Routes();
 
 // configures the HTTP configuration 
-// for a specific test case by passing it to the metho
+// for a specific test case by passing it to the method
 MyWebApi
 	.Routes(httpConfiguration);
 
@@ -130,20 +130,23 @@ MyWebApi
 
 // sets the URI location to test as string
 // and adds custom HTTP content header to the request
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Routes()
 	.ShouldMap("api/Route/To/Test")
 	.WithContentHeader("SomeContentHeader", "SomeContentHeaderValue");
 
 // sets the URI location to test as string
 // and adds custom HTTP content header with multiple values to the request
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Routes()
 	.ShouldMap("api/Route/To/Test")
 	.WithContentHeader("SomeContentHeader", new[] { "SomeContentHeaderValue", "AnotherContentHeaderValue" });
 
 // sets the URI location to test as string
 // and adds custom HTTP content headers as dictionary to the request
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Routes()
 	.ShouldMap("api/Route/To/Test")
@@ -463,18 +466,21 @@ MyWebApi
 		.WithHeaders(someDictionaryWithHeaders));
 
 // adding custom content header to the request message
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Controller<WebApiController>()
 	.WithHttpRequestMessage(request => request
 		.WithContentHeader("SomeContentHeader", "SomeContentHeaderValue"));
 
 // adding custom content header with multiple values to the request message
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Controller<WebApiController>()
 	.WithHttpRequestMessage(request => request
 		.WithContentHeader("SomeContentHeader", new[] { "SomeContentHeaderValue", "AnotherContentHeaderValue" }));
 
 // adding custom content headers provided as dictionary to the request message
+// * adding content headers requires content to be initialized and set
 MyWebApi
 	.Controller<WebApiController>()
 	.WithHttpRequestMessage(request => request
@@ -1261,13 +1267,40 @@ MyWebApi
 	.ContainingHeaders(someDictionaryWithHeaders);
 
 // tests whether the action returns HttpResponseMessage
-// containing headers provided as HttpResponseHeaders
+// containing content header with specific name
 MyWebApi
 	.Controller<WebApiController>()
 	.Calling(c => c.SomeAction())
 	.ShouldReturn()
 	.HttpResponseMessage()
-	.ContainingHeaders(someHttpReponseHeaders);
+	.ContainingContentHeader("SomeContentHeader");
+	
+// tests whether the action returns HttpResponseMessage
+// containing content header with specific name and value
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction())
+	.ShouldReturn()
+	.HttpResponseMessage()
+	.ContainingContentHeader("SomeContentHeader", "SomeContentValue");
+	
+// tests whether the action returns HttpResponseMessage
+// containing content header with specific name and values
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction())
+	.ShouldReturn()
+	.HttpResponseMessage()
+	.ContainingContentHeader("SomeContentHeader", new[] { "SomeContentHeaderValue", "AnotherContentHeaderValue" });
+	
+// tests whether the action returns HttpResponseMessage
+// containing content headers provided as dictionary
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction())
+	.ShouldReturn()
+	.HttpResponseMessage()
+	.ContainingContentHeaders(someDictionaryWithContentHeaders);
 
 // tests whether the action returns HttpResponseMessage
 // with specific status code
@@ -1783,8 +1816,18 @@ MyWebApi
 	.Calling(c => c.SomeAction())
 	.ShouldReturn()
 	.Redirect();
+	
+// tests whether the action returns
+// RedirectToRouteResult to specific route values
+// provided by lambda expression
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction())
+	.ShouldReturn()
+	.Redirect()
+	.To<AnotherController>(c => c.AnotherAction("ParameterRouteValue"));
 
-// tests whether the action returns redirect result
+// tests whether the action returns RedirectResult
 // with location provided as string
 MyWebApi
 	.Controller<WebApiController>()
@@ -1793,7 +1836,7 @@ MyWebApi
 	.Redirect()
 	.AtLocation("http://somehost.com/someuri/1?query=someQuery");
 
-// tests whether the action returns redirect result
+// tests whether the action returns RedirectResult
 // with location provided as URI
 MyWebApi
 	.Controller<WebApiController>()
@@ -1802,7 +1845,7 @@ MyWebApi
 	.Redirect()
 	.AtLocation(someUri);
 
-// tests whether the action returns redirect result
+// tests whether the action returns RedirectResult
 // with location provided as URI builder
 MyWebApi
 	.Controller<WebApiController>()
@@ -2006,6 +2049,16 @@ MyWebApi
 	.Created()
 	.WithResponseModelOfType<ResponseModel>();
 
+// tests whether the action returns
+// CreatedAtRouteNegotiatedContentResult<T> to specific route values
+// provided by lambda expression
+MyWebApi
+	.Controller<WebApiController>()
+	.Calling(c => c.SomeAction())
+	.ShouldReturn()
+	.Created()
+	.At<AnotherController>(c => c.AnotherAction("ParameterRouteValue"));
+	
 // tests whether the action returns created result
 // with DefaultContentNegotiator
 MyWebApi

src/MyWebApi.Tests/BuildersTests/HttpActionResultsTests/CreatedTests/CreatedTestBuilderTests.cs

@@ -411,5 +411,69 @@ public void WithResponseModelOfTypeShouldWorkCorrectly()
                 .Created()
                 .WithResponseModelOfType<ICollection<ResponseModel>>();
         }
+
+        [Test]
+        public void AtShouldWorkCorrectlyWithCorrectActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.CreatedAtRouteAction())
+                .ShouldReturn()
+                .Created()
+                .At<NoAttributesController>(c => c.WithParameter(1));
+        }
+
+        [Test]
+        public void AtShouldWorkCorrectlyWithCorrectVoidActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.CreatedAtRouteVoidAction())
+                .ShouldReturn()
+                .Created()
+                .At<NoAttributesController>(c => c.VoidAction());
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(CreatedResultAssertionException),
+            ExpectedMessage = "When calling CreatedAtRouteAction action in WebApiController expected created result to redirect to '/api/Redirect/WithParameter?id=2', but in fact redirected to '/api/Redirect/WithParameter?id=1'.")]
+        public void AtShouldThrowExceptionWithIncorrectActionParameter()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.CreatedAtRouteAction())
+                .ShouldReturn()
+                .Created()
+                .At<NoAttributesController>(c => c.WithParameter(2));
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(CreatedResultAssertionException),
+            ExpectedMessage = "When calling CreatedAtRouteAction action in WebApiController expected created result to redirect to a specific URI, but such URI could not be resolved from the 'Redirect' route template.")]
+        public void AtShouldThrowExceptionWithIncorrectActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.CreatedAtRouteAction())
+                .ShouldReturn()
+                .Created()
+                .At<RouteController>(c => c.VoidAction());
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(ActionCallAssertionException),
+            ExpectedMessage = "Expected action result to contain a 'RouteName' property to test, but in fact such property was not found.")]
+        public void AtShouldThrowExceptionWithIncorrectActionResult()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.CreatedAction())
+                .ShouldReturn()
+                .Created()
+                .At<RouteController>(c => c.VoidAction());
+        }
     }
 }

src/MyWebApi.Tests/BuildersTests/HttpActionResultsTests/RedirectTests/RedirectTestBuilderTests.cs

@@ -136,5 +136,69 @@ public void AtLocationWithBuilderShouldThrowExceptionIfTheLocationIsIncorrect()
                         .AndAlso()
                         .WithQuery("?query=Test"));
         }
+
+        [Test]
+        public void ToShouldWorkCorrectlyWithCorrectActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.RedirectToRouteAction())
+                .ShouldReturn()
+                .Redirect()
+                .To<NoAttributesController>(c => c.WithParameter(1));
+        }
+
+        [Test]
+        public void ToShouldWorkCorrectlyWithCorrectVoidActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.RedirectToRouteVoidAction())
+                .ShouldReturn()
+                .Redirect()
+                .To<NoAttributesController>(c => c.VoidAction());
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(RedirectResultAssertionException),
+            ExpectedMessage = "When calling RedirectToRouteAction action in WebApiController expected redirect result to redirect to '/api/Redirect/WithParameter?id=2', but in fact redirected to '/api/Redirect/WithParameter?id=1'.")]
+        public void ToShouldThrowExceptionWithIncorrectActionParameter()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.RedirectToRouteAction())
+                .ShouldReturn()
+                .Redirect()
+                .To<NoAttributesController>(c => c.WithParameter(2));
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(RedirectResultAssertionException),
+            ExpectedMessage = "When calling RedirectToRouteAction action in WebApiController expected redirect result to redirect to a specific URI, but such URI could not be resolved from the 'Redirect' route template.")]
+        public void ToShouldThrowExceptionWithIncorrectActionCall()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.RedirectToRouteAction())
+                .ShouldReturn()
+                .Redirect()
+                .To<RouteController>(c => c.VoidAction());
+        }
+
+        [Test]
+        [ExpectedException(
+            typeof(RedirectResultAssertionException),
+            ExpectedMessage = "When calling RedirectAction action in WebApiController expected redirect result to contain route name, but it could not be found.")]
+        public void ToShouldThrowExceptionWithIncorrectActionResult()
+        {
+            MyWebApi
+                .Controller<WebApiController>()
+                .Calling(c => c.RedirectAction())
+                .ShouldReturn()
+                .Redirect()
+                .To<RouteController>(c => c.VoidAction());
+        }
     }
 }

src/MyWebApi.Tests/BuildersTests/HttpRequestMessageBuilderTests.cs

@@ -284,7 +284,7 @@ public void WithContentHeadersDictionaryShouldPopulateCorrectHeaders()
         [Test]
         [ExpectedException(
             typeof(InvalidHttpRequestMessageException),
-            ExpectedMessage = "When building HttpRequestMessage expected content to be initialized and set in order to add content headers, but instead received null.")]
+            ExpectedMessage = "When building HttpRequestMessage expected content to be initialized and set in order to add content headers.")]
         public void WithContentHeadersShouldThrowExpcetionIfNoContentIsPresent()
         {
             MyWebApi