Created some sample code. Added fail message checking to some tests

CaseyBurns · CaseyBurns · commit 475c3aacb78d · 2012-04-16T23:55:23.000+12:00
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,7 @@ test-results
 cmd.exe
 [Pp]ackage
 [Gg]it [Bb]ash.lnk
-[Ii]nore
+[Ii]nore
+FluentAssertionsMvc.VisualState.xml
+[Rr]elease
+TestResult.xml
diff --git a/FluentAssertionsMvc.VisualState.xml b/FluentAssertionsMvc.VisualState.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VisualState xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ShowCheckBoxes="false">
   <TopNode>[0-1000]G:\Dev\FluentAssertions.MVC\FluentAssertionsMvc.nunit</TopNode>
-  <SelectedNode>[0-1062]G:\Dev\FluentAssertions.MVC\tests\FluentAssertions.Mvc3.Tests\bin\Debug\FluentAssertions.Mvc3.Tests.dll</SelectedNode>
+  <SelectedNode>[0-1074]FluentAssertions.Mvc3.Tests.RedirectToRoute_Tests.WithArea_GivenUnexpected_ShouldFail</SelectedNode>
   <ExcludeCategories>false</ExcludeCategories>
   <Nodes>
     <Node UniqueName="[0-1000]G:\Dev\FluentAssertions.MVC\FluentAssertionsMvc.nunit" Expanded="true" />
-    <Node UniqueName="[0-1062]G:\Dev\FluentAssertions.MVC\tests\FluentAssertions.Mvc3.Tests\bin\Debug\FluentAssertions.Mvc3.Tests.dll" Expanded="true" />
-    <Node UniqueName="[0-1063]FluentAssertions" Expanded="true" />
-    <Node UniqueName="[0-1064]FluentAssertions.Mvc3" Expanded="true" />
-    <Node UniqueName="[0-1065]FluentAssertions.Mvc3.Tests" Expanded="true" />
+    <Node UniqueName="[0-1075]G:\Dev\FluentAssertions.MVC\bin\Debug\Test\FluentAssertions.Mvc3.Tests.dll" Expanded="true" />
+    <Node UniqueName="[0-1076]FluentAssertions" Expanded="true" />
+    <Node UniqueName="[0-1077]FluentAssertions.Mvc3" Expanded="true" />
+    <Node UniqueName="[0-1078]FluentAssertions.Mvc3.Tests" Expanded="true" />
     <Node UniqueName="[0-1049]FluentAssertions.Mvc3.Tests.ActionResultAssertions_Tests" Expanded="true" />
     <Node UniqueName="[0-1008]FluentAssertions.Mvc3.Tests.ContentResultAssertions_Tests" Expanded="true" />
     <Node UniqueName="[0-1047]FluentAssertions.Mvc3.Tests.RedirectResultAssertions_Tests" Expanded="true" />
+    <Node UniqueName="[0-1062]FluentAssertions.Mvc3.Tests.RedirectToRoute_Tests" Expanded="true" />
     <Node UniqueName="[0-1033]FluentAssertions.Mvc3.Tests.RouteDataAssertions_Tests" Expanded="true" />
     <Node UniqueName="[0-1001]FluentAssertions.Mvc3.Tests.RouteValueDictionary_Extensions_Tests" Expanded="true" />
     <Node UniqueName="[0-1015]FluentAssertions.Mvc3.Tests.ViewResultAssertions_Tests" Expanded="true" />
-    <Node UniqueName="[0-1127]G:\Dev\FluentAssertions.MVC\bin\Debug\Test\FluentAssertions.Mvc3.Tests.dll" Expanded="true" />
-    <Node UniqueName="[0-1128]FluentAssertions" Expanded="true" />
-    <Node UniqueName="[0-1129]FluentAssertions.Mvc3" Expanded="true" />
-    <Node UniqueName="[0-1130]FluentAssertions.Mvc3.Tests" Expanded="true" />
   </Nodes>
 </VisualState>
diff --git a/FluentAssertionsMvc.nunit b/FluentAssertionsMvc.nunit
@@ -1,5 +1,5 @@
 ﻿<NUnitProject>
-  <Settings activeconfig="Debug" processModel="Default" domainUsage="Default" />
+  <Settings activeconfig="Debug" />
   <Config name="Debug" binpathtype="Auto">
     <assembly path="bin\Debug\Test\FluentAssertions.Mvc3.Tests.dll" />
   </Config>
diff --git a/Package.cmd b/Package.cmd
@@ -8,7 +8,7 @@ echo.
 echo *** BUILD SUCCESSFUL ***
 echo.
 
-cd package
+cd release
 nuget pack
 if errorlevel 1 goto PackageFail
 
diff --git a/_todo_.txt b/_todo_.txt
@@ -5,4 +5,10 @@
 [ ] Change all dictionary asserts to us Subject.RouteValues.Should().Contain
 [ ] FluentAssertions should *not* blow up if given null reasonArgs and a reason
 [ ] Should because syntax in sample code
-[ ] XML comments every where
+[ ] XML comments every where
+[ ] Should assertions be more domain focused? i.e. routes.Should().MapTo()...
+[ ] Create RouteCollection.GenerateUrl(RouteValues)
+[ ] Need to test reason injection into fail messages
+[ ] Every mvc assertion type needs to inherit from ObjectAssertions
+[ ] If .BecauseOf isn't called FluentAssertions blows up
+[ ] Consolidate all messages into central resource file
diff --git a/samples/FluentAssertions.Mvc3.Samples/Controllers/ProductController.cs b/samples/FluentAssertions.Mvc3.Samples/Controllers/ProductController.cs
@@ -1,20 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+﻿using System.Web.Mvc;
 
 namespace FluentAssertions.Mvc3.Samples.Controllers
 {
     public class ProductController : Controller
     {
-        //
-        // GET: /Product/
-
-        public ActionResult Index()
+        public ActionResult List()
         {
-            return View();
+            return View("Index");
         }
-
     }
 }
diff --git a/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj b/samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Services\IProductService.cs" />
     <Compile Include="Services\ProductService.cs" />
     <Compile Include="Tests\ProductController_Tests.cs" />
+    <Compile Include="Tests\Route_Tests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
diff --git a/samples/FluentAssertions.Mvc3.Samples/Global.asax.cs b/samples/FluentAssertions.Mvc3.Samples/Global.asax.cs
@@ -21,6 +21,15 @@ public static void RegisterRoutes(RouteCollection routes)
         {
             routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
 
+            routes.MapRoute(
+                    name: "ProductIndex",
+                    url: "Product/List",
+                    defaults: new
+                    {
+                        Controller = "Product",
+                        Action = "List"
+                    });
+
             routes.MapRoute(
                 "Default", // Route name
                 "{controller}/{action}/{id}", // URL with parameters
diff --git a/samples/FluentAssertions.Mvc3.Samples/Models/ProductViewModel.cs b/samples/FluentAssertions.Mvc3.Samples/Models/ProductViewModel.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
+﻿
 namespace FluentAssertions.Mvc3.Samples.Models
 {
     public class ProductViewModel
diff --git a/samples/FluentAssertions.Mvc3.Samples/Services/IProductService.cs b/samples/FluentAssertions.Mvc3.Samples/Services/IProductService.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+﻿using System.Collections.Generic;
 using FluentAssertions.Mvc3.Samples.Models;
 
 namespace FluentAssertions.Mvc3.Samples.Services
diff --git a/samples/FluentAssertions.Mvc3.Samples/Services/ProductService.cs b/samples/FluentAssertions.Mvc3.Samples/Services/ProductService.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+﻿using System.Collections.Generic;
 using FluentAssertions.Mvc3.Samples.Models;
 
 namespace FluentAssertions.Mvc3.Samples.Services
diff --git a/samples/FluentAssertions.Mvc3.Samples/Tests/ProductController_Tests.cs b/samples/FluentAssertions.Mvc3.Samples/Tests/ProductController_Tests.cs
@@ -1,25 +1,18 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+﻿using FluentAssertions.Mvc3.Samples.Controllers;
 using NUnit.Framework;
-using System.Web.Mvc;
-using FluentAssertions.Mvc3.Samples.Controllers;
-using FluentAssertions.Mvc3;
-using FluentAssertions;
 
 namespace FluentAssertions.Mvc3.Samples.Tests
 {
     [TestFixture]
     public class ProductController_Tests
     {
         [Test]
-		public void Index_ShouldReturnView()
+		public void List_ShouldReturnView()
 		{
             var controller = new ProductController();
-            controller.Index()
-                .Should()
-                .BeView();
+            controller.List().Should()
+                .BeView()
+                .WithViewName("Index");
 		}
     }
 }
diff --git a/samples/FluentAssertions.Mvc3.Samples/Tests/Route_Tests.cs b/samples/FluentAssertions.Mvc3.Samples/Tests/Route_Tests.cs
@@ -0,0 +1,33 @@
+﻿using System.Web.Routing;
+using NUnit.Framework;
+
+namespace FluentAssertions.Mvc3.Samples.Tests
+{
+    [TestFixture]
+    public class Route_Tests
+    {
+        private RouteCollection _routes;
+
+        public Route_Tests()
+        {
+            _routes = new RouteCollection();
+            MvcApplication.RegisterRoutes(_routes);
+        }
+
+        [Test]
+        public void Incoming_ProductListRoute_ShouldMap()
+		{
+            RouteData rd = _routes.GetRouteDataForUrl("Product/List");
+            rd.Should()
+                    .HaveController("Product")
+                    .HaveAction("List");
+		}
+
+        [Test]
+		public void Incoming_ProductIndexRoute_ShouldNotMap()
+		{
+            RouteData rd = _routes.GetRouteDataForUrl("Product/Index");
+#warning todo
+		}
+    }
+}
diff --git a/src/FluentAssertions.Mvc3/ActionResultAssertions.cs b/src/FluentAssertions.Mvc3/ActionResultAssertions.cs
@@ -6,66 +6,102 @@
 namespace FluentAssertions.Mvc3
 {
     [DebuggerNonUserCode]
-	public class ActionResultAssertions : ReferenceTypeAssertions<ActionResult, ActionResultAssertions>
+	public class ActionResultAssertions : ObjectAssertions
 	{
         public struct Constants
         {
-            public const string CommonFailMessage = "Expected ActionResult to be {0} but was '{1}'";
+            public const string CommonFailMessage = "Expected ActionResult to be {0}{reason}, but found {1}";
         }
         
-		public ActionResultAssertions (ActionResult subject)
+		public ActionResultAssertions (ActionResult subject) : base(subject)
 		{
 			Subject = subject;
 		}
 
         public ContentResultAssertions BeContent()
+        {
+            return BeContent(string.Empty, null);
+        }
+
+        public ContentResultAssertions BeContent(string reason, params object[] reasonArgs)
         {
             Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
                     .ForCondition(Subject is ContentResult)
-                    .FailWith(string.Format(Constants.CommonFailMessage, typeof(ContentResult).Name, Subject.GetType().Name));
+                    .FailWith(Constants.CommonFailMessage, typeof(ContentResult).Name, Subject.GetType().Name);
 
             return new ContentResultAssertions(Subject as ContentResult);
         }
 
         public EmptyResult BeEmpty()
+        {
+            return BeEmpty(string.Empty, null);
+        }
+
+        public EmptyResult BeEmpty(string reason, params object[] reasonArgs)
         {
             Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
                     .ForCondition(Subject is EmptyResult)
                     .FailWith(Constants.CommonFailMessage, typeof(EmptyResult).Name, Subject.GetType().Name);
 
             return Subject as EmptyResult;
         }
 
         public RedirectToRouteAssertions BeRedirectToRoute()
+        {
+            return BeRedirectToRoute(string.Empty, null);
+        }
+
+        public RedirectToRouteAssertions BeRedirectToRoute(string reason, params object[] reasonArgs)
         {
             Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
                     .ForCondition(Subject is RedirectToRouteResult)
                     .FailWith(Constants.CommonFailMessage, typeof(RedirectToRouteResult).Name, Subject.GetType().Name);
 
             return new RedirectToRouteAssertions(Subject as RedirectToRouteResult);
         }
 
         public PartialViewResultAssertions BePartialView()
+        {
+            return BePartialView(string.Empty, null);
+        }
+
+        public PartialViewResultAssertions BePartialView(string reason, params object[] reasonArgs)
         {
             Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
                     .ForCondition(Subject is PartialViewResult)
                     .FailWith(Constants.CommonFailMessage, typeof(PartialViewResult).Name, Subject.GetType().Name);
 
             return new PartialViewResultAssertions(Subject as PartialViewResult);
         }
 
         public RedirectResultAssertions BeRedirect()
+        {
+            return BeRedirect(string.Empty, null);
+        }
+
+        public RedirectResultAssertions BeRedirect(string reason, params object[] reasonArgs)
         {
             Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
                     .ForCondition(Subject is RedirectResult)
                     .FailWith(Constants.CommonFailMessage, "RedirectResult", Subject.GetType().Name);
 
             return new RedirectResultAssertions(Subject as RedirectResult);
         }
 
-		public ViewResultAssertions BeView ()
+        public ViewResultAssertions BeView()
+        {
+            return BeView(string.Empty, null);
+        }
+
+        public ViewResultAssertions BeView(string reason, params object[] reasonArgs)
 		{
 			Execute.Verification
+                    .BecauseOf(reason, reasonArgs)
 					.ForCondition (Subject is ViewResult)
                     .FailWith(Constants.CommonFailMessage, "ViewResult", Subject.GetType().Name);
 			
diff --git a/src/FluentAssertions.Mvc3/RouteDataAssertions.cs b/src/FluentAssertions.Mvc3/RouteDataAssertions.cs
@@ -10,9 +10,10 @@
 namespace FluentAssertions.Mvc3
 {
     [DebuggerNonUserCode]
-    public class RouteDataAssertions : ReferenceTypeAssertions<RouteData, RouteDataAssertions>
+    public class RouteDataAssertions : ObjectAssertions
     {
         public RouteDataAssertions(RouteData subject)
+            : base(subject)
         {
             Subject = subject;
         }
@@ -49,12 +50,14 @@ public RouteDataAssertions HaveDataToken(string key, object expectedValue)
 
         public RouteDataAssertions HaveDataToken(string key, object expectedValue, string reason, params object[] reasonArgs)
         {
+            var subjectTyped = Subject as RouteData;
+
             Execute.Verification
-                    .ForCondition(Subject.DataTokens.ContainsKey(key))
+                    .ForCondition(subjectTyped.DataTokens.ContainsKey(key))
                     .BecauseOf(reason, reasonArgs)
                     .FailWith("RouteData.DataTokens does not contain key '{0}'", key);
 
-            var actualValue = Subject.DataTokens[key];
+            var actualValue = subjectTyped.DataTokens[key];
             actualValue.Should().Be(expectedValue);
 
             return this;
@@ -68,12 +71,14 @@ public RouteDataAssertions HaveValue(string key, object expectedValue)
 
         public RouteDataAssertions HaveValue(string key, object expectedValue, string reason, params object[] reasonArgs)
         {
+            var subjectTyped = Subject as RouteData;
+
             Execute.Verification
-                    .ForCondition(Subject.Values.ContainsKey(key))
+                    .ForCondition(subjectTyped.Values.ContainsKey(key))
                     .BecauseOf(reason, reasonArgs)
                     .FailWith("RouteData.Values does not contain key '{0}'", key);
 
-            var actualValue = Subject.Values[key];
+            var actualValue = subjectTyped.Values[key];
             actualValue.Should().Be(expectedValue);
 
             return this;
diff --git a/src/FluentAssertions.Mvc3/RouteValueDictionary_Extensions.cs b/src/FluentAssertions.Mvc3/RouteValueDictionary_Extensions.cs
@@ -1,9 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+﻿using System.Web.Mvc;
 using System.Web.Routing;
-using System.Web.Mvc;
 using FluentAssertions.Mvc3.Fakes;
 
 namespace FluentAssertions.Mvc3
diff --git a/tests/FluentAssertions.Mvc3.Tests/ActionResultAssertions_Tests.cs b/tests/FluentAssertions.Mvc3.Tests/ActionResultAssertions_Tests.cs
diff --git a/tests/FluentAssertions.Mvc3.Tests/RedirectResultAssertions_Tests.cs b/tests/FluentAssertions.Mvc3.Tests/RedirectResultAssertions_Tests.cs
diff --git a/tests/FluentAssertions.Mvc3.Tests/RouteDataAssertions_Tests.cs b/tests/FluentAssertions.Mvc3.Tests/RouteDataAssertions_Tests.cs
diff --git a/tests/FluentAssertions.Mvc3.Tests/RouteValueDictionary_Extensions_Tests.cs b/tests/FluentAssertions.Mvc3.Tests/RouteValueDictionary_Extensions_Tests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,12 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Web;`
`5`		`-using System.Web.Mvc;`
	`1`	`+using System.Web.Mvc;`
`6`	`2`
`7`	`3`	`namespace FluentAssertions.Mvc3.Samples.Controllers`
`8`	`4`	`{`
`9`	`5`	`public class ProductController : Controller`
`10`	`6`	`{`
`11`		`- //`
`12`		`- // GET: /Product/`
`13`		`-`
`14`		`- public ActionResult Index()`
	`7`	`+ public ActionResult List()`
`15`	`8`	`{`
`16`		`- return View();`
	`9`	`+ return View("Index");`
`17`	`10`	`}`
`18`		`-`
`19`	`11`	`}`
`20`	`12`	`}`