View result assertion failure messages moved to resource file, and fixed broken view result tests.

Author: kevinkuszyk

src/FluentAssertions.Mvc3/FailureMessages.Designer.cs

@@ -135,7 +135,19 @@
   <data name="ViewResultBase_NullModel" xml:space="preserve">
     <value>Expected Model to be of type {0}, but no Model was supplied.</value>
   </data>
+  <data name="ViewResultBase_ViewData_ContainsKey" xml:space="preserve">
+    <value>ViewData does not contain key of {0}.</value>
+  </data>
+  <data name="ViewResultBase_ViewData_HaveValue" xml:space="preserve">
+    <value>Expected ViewData[{0}] to have value {1}, but found {2}.</value>
+  </data>
+  <data name="ViewResultBase_ViewName" xml:space="preserve">
+    <value>Expected ViewName to be {0} but found {1}.</value>
+  </data>
   <data name="ViewResultBase_WithDefaultViewName" xml:space="preserve">
     <value>Expected default view, but view {0} was rendered.</value>
   </data>
+  <data name="ViewResult_MasterName" xml:space="preserve">
+    <value>Expected MasterName to be {0} but found {1}.</value>
+  </data>
 </root>

src/FluentAssertions.Mvc3/FailureMessages.resx

@@ -23,7 +23,7 @@ public ViewResultAssertions WithMasterName(string expectedMasterName, string rea
             Execute.Verification
                     .ForCondition(string.Equals(expectedMasterName, actualMasterName, StringComparison.InvariantCultureIgnoreCase))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected MasterName to be '{0}' but was '{1}'", expectedMasterName, actualMasterName);
+                    .FailWith(FailureMessages.ViewResult_MasterName, expectedMasterName, actualMasterName);
             return this;
         }
 	}

src/FluentAssertions.Mvc3/ViewResultAssertions.cs

@@ -31,7 +31,7 @@ public ViewResultBaseAssertions<T> WithViewName(string expectedViewName, string
             Execute.Verification
                     .ForCondition(string.Equals(expectedViewName, actualViewName, StringComparison.InvariantCultureIgnoreCase))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith("Expected ViewName to be '{0}' but was '{1}'", expectedViewName, actualViewName);
+                    .FailWith(FailureMessages.ViewResultBase_ViewName, expectedViewName, actualViewName);
             return this;
         }
 
@@ -48,9 +48,14 @@ public ViewResultBaseAssertions<T> WithViewData(string key, object expectedValue
             Execute.Verification
                     .ForCondition(actualViewData.ContainsKey(key))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith("ViewData does not contain key of '{0}'", key);
+                    .FailWith(FailureMessages.ViewResultBase_ViewData_ContainsKey, key);
 
-            actualViewData[key].Should().Be(expectedValue);
+            var actualValue = actualViewData[key];
+
+            Execute.Verification
+                    .ForCondition(actualValue.Equals(expectedValue))
+                    .BecauseOf(reason, reasonArgs)
+                    .FailWith(FailureMessages.ViewResultBase_ViewData_HaveValue, key, expectedValue, actualValue); 
 
             return this;
         }

src/FluentAssertions.Mvc3/ViewResultBaseAssertions.cs

@@ -29,14 +29,18 @@ public void WithMasterName_GivenExpectedValue_ShouldPass()
         [Test]
         public void WithMasterName_GivenUnexpectedValue_ShouldFail()
         {
+            var actualMasterName = "master";
+            var expectedMasterName = "xyz";
             ActionResult result = new ViewResult
             {
-                MasterName = "master",
+                MasterName = actualMasterName,
             };
+            var failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResult_MasterName, expectedMasterName, actualMasterName);
+
+            Action action = () => result.Should().BeView().WithMasterName(expectedMasterName);
 
-            Action action = () => result.Should().BeView().WithMasterName("xyz");
             action.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]
@@ -53,14 +57,18 @@ public void WithViewName_GivenExpectedValue_ShouldPass()
         [Test]
         public void WithViewName_GivenUnexpectedValue_ShouldFail()
         {
+            var actualViewName = "index";
+            var expectedViewName = "xyz";
+            var failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_ViewName, expectedViewName, actualViewName);
             ActionResult result = new ViewResult
             {
-                ViewName = "index",
+                ViewName = actualViewName,
             };
 
-            Action action = () => result.Should().BeView().WithViewName("xyz");
+            Action action = () => result.Should().BeView().WithViewName(expectedViewName);
+            
             action.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]
@@ -146,27 +154,36 @@ public void WithViewData_GivenTwoExpectedValues_ShouldPass()
         [Test]
         public void WithViewData_GivenUnexpectedValue_ShouldFail()
         {
+            var key = "key1";
+            var actualValue = "value1";
+            var expectedValue = "abc";
+            var failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_ViewData_HaveValue, key, expectedValue, actualValue);
             ActionResult result = new ViewResult
             {
-                ViewData = new ViewDataDictionary { { "key1", "value1" } }
+                ViewData = new ViewDataDictionary { { key, actualValue } }
             };
+            
+            Action a = () => result.Should().BeView().WithViewData(key, expectedValue);
 
-            Action a = () => result.Should().BeView().WithViewData("key1", "xyz");
             a.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]
         public void WithViewData_GivenUnexpectedKey_ShouldFail()
         {
+            var actualKey = "key1";
+            var expectedKey = "xyz";
             ActionResult result = new ViewResult
             {
-                ViewData = new ViewDataDictionary { { "key1", "value1" } }
+                ViewData = new ViewDataDictionary { { actualKey, "value1" } }
             };
+            var failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_ViewData_ContainsKey, expectedKey, actualKey);
+
+            Action a = () => result.Should().BeView().WithViewData(expectedKey, "value1");
 
-            Action a = () => result.Should().BeView().WithViewData("xyz", "value1");
             a.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]