Moved content assertions common failure message to resource file, and fixed broken content assertion tests.

Author: kevinkuszyk

src/FluentAssertions.Mvc3/ContentResultAssertions.cs

@@ -10,11 +10,6 @@ namespace FluentAssertions.Mvc3
 {
     public class ContentResultAssertions : ObjectAssertions
     {
-        class Constants
-        {
-            public const string CommonFailMessage = "Expect {0} to be '{1}' but was '{2}'";
-        }
-
         public ContentResultAssertions(ContentResult subject) : base(subject)
         {
         }
@@ -32,7 +27,7 @@ public ContentResultAssertions WithContent(string expectedContent, string reason
             Execute.Verification
                     .ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(Constants.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
+                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
 
             return this;
         }
@@ -50,7 +45,7 @@ public ContentResultAssertions WithContentType(string expectedContent, string re
             Execute.Verification
                     .ForCondition(string.Equals(expectedContent, actualContentType, StringComparison.InvariantCultureIgnoreCase))
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith(Constants.CommonFailMessage, "ContentResult.ContentType", expectedContent, actualContentType);
+                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContent, actualContentType));
 
             return this;
         }
@@ -68,7 +63,7 @@ public ContentResultAssertions WithContentEncoding(Encoding expectedEncoding, st
             Execute.Verification
                     .ForCondition(expectedEncoding == actualContentEncoding)
                     .BecauseOf(reason, reasonArgs)
-                    .FailWith(Constants.CommonFailMessage, "ContentResult.ContentType", expectedEncoding.ToString(), actualContentEncoding.ToString());
+                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedEncoding.ToString(), actualContentEncoding.ToString()));
 
             return this;
         }

src/FluentAssertions.Mvc3/FailureMessages.Designer.cs

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CommonFailMessage" xml:space="preserve">
+    <value>Expected {0} to be '{1}' but found '{2}'</value>
+  </data>
   <data name="RouteData_DataTokens_ContainsKey" xml:space="preserve">
     <value>RouteData.DataTokens does not contain key {0}.</value>
   </data>

src/FluentAssertions.Mvc3/FailureMessages.resx

@@ -20,10 +20,15 @@ public void WithContent_GivenExpected_ShouldPass()
         [Test]
         public void WithContent_GivenUnexpected_ShouldFail()
         {
-            ActionResult result = new ContentResult { Content = "content" };
-            Action a = () => result.Should().BeContent().WithContent("xyz");
+            var actualContent = "content";
+            var expectedContent = "xyz";
+            ActionResult result = new ContentResult { Content = actualContent };
+            var failureMessage = String.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent);
+
+            Action a = () => result.Should().BeContent().WithContent(expectedContent);
+            
             a.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]
@@ -36,10 +41,15 @@ public void WithContentType_GivenExpected_ShouldPass()
         [Test]
         public void WithContentType_GivenUnexpected_ShouldFail()
         {
-            ActionResult result = new ContentResult { ContentType = "text/html" };
-            Action a = () => result.Should().BeContent().WithContentType("xyz");
+            var actualContentType = "text/html";
+            var expectedContentType = "xyz";
+            ActionResult result = new ContentResult { ContentType = actualContentType };
+            var failureMessage = String.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContentType, actualContentType);
+
+            Action a = () => result.Should().BeContent().WithContentType(expectedContentType);
+            
             a.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
 
         [Test]
@@ -52,10 +62,15 @@ public void WithContentEncoding_GivenExpected_ShouldPass()
         [Test]
         public void WithContentEncoding_GivenUnexpected_ShouldFail()
         {
-            ActionResult result = new ContentResult { ContentEncoding = Encoding.ASCII };
-            Action a = () => result.Should().BeContent().WithContentEncoding(Encoding.Unicode);
+            var actualEncoding = Encoding.ASCII;
+            var expectedEncoding = Encoding.Unicode;
+            ActionResult result = new ContentResult { ContentEncoding = actualEncoding };
+            var failureMessage = String.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedEncoding, actualEncoding);
+
+            Action a = () => result.Should().BeContent().WithContentEncoding(expectedEncoding);
+            
             a.ShouldThrow<Exception>()
-                    .WithMessage("");
+                    .WithMessage(failureMessage);
         }
     }
 }