New FailureMessageHelper class added to assist verifying test failure messages.

Author: kevinkuszyk

tests/FluentAssertions.Mvc3.Tests/FailureMessageHelper_Tests.cs

@@ -0,0 +1,49 @@
+using NUnit.Framework;
+using FluentAssertions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using FluentAssertions.Mvc3.Tests.Helpers;
+
+namespace FluentAssertions.Mvc3.Tests
+{
+    [TestFixture]
+    class FailureMessageHelper_Tests
+    {
+        [Test]
+        public void FailureMessageHelper_WithOneArg_Formats()
+        {
+            // Arrange
+            var message = "Test failure message {0}.";
+            var value = "reason";
+
+            var expected = "Test failure message \"reason\".";
+
+            // Act
+            var result = FailureMessageHelper.Format(message, value);
+
+            // Assert
+            result.Should().Be(expected);
+        }
+
+        [Test]
+        public void FailureMessageHelper_WithMultipleArgs_Formats()
+        {
+            // Arrange
+            var message = "Test failure message {0}, {1}, {2}.";
+            var reason1 = "reason one";
+            var reason2 = "reason two";
+            var reason3 = "reason three";
+
+            var expected = "Test failure message \"reason one\", \"reason two\", \"reason three\".";
+
+            // Act
+            var result = FailureMessageHelper.Format(message, reason1, reason2, reason3);
+
+            // Assert
+            result.Should().Be(expected);
+        }
+    }
+}

tests/FluentAssertions.Mvc3.Tests/FluentAssertions.Mvc3.Tests.csproj

@@ -49,6 +49,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ContentResultAssertions_Tests.cs" />
+    <Compile Include="FailureMessageHelper_Tests.cs" />
+    <Compile Include="Helpers\FailureMessageHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Fakes\FakeController.cs" />
     <Compile Include="ActionResultAssertions_Tests.cs" />

tests/FluentAssertions.Mvc3.Tests/Helpers/FailureMessageHelper.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace FluentAssertions.Mvc3.Tests.Helpers
+{
+    static class FailureMessageHelper
+    {
+        public static string Format(string message, params string[] args)
+        { 
+            var formattedArg = args.Select(x => String.Format("\"{0}\"", x)).ToArray();
+
+            return String.Format(message, formattedArg);
+        }
+    }
+}

tests/FluentAssertions.Mvc3.Tests/ViewResultAssertions_Tests.cs

@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using System.Web.Mvc;
 using FluentAssertions.Mvc3;
+using FluentAssertions.Mvc3.Tests.Helpers;
 using FluentAssertions.Mvc3.Tests.Fakes;
 
 namespace FluentAssertions.Mvc3.Tests
@@ -233,10 +234,7 @@ public void ModelAs_GivenWrongType_ShouldFail()
         public void ModelAs_Null_ShouldFail()
         {
             ActionResult result = new ViewResult();
-
-            // TODO: Improve the comparision of failure messages.
-            string value = String.Format("\"{0}\"", typeof(Object).Name);
-            string failureMessage = String.Format(FailureMessages.ViewResultBase_NullModel, value);
+            string failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_NullModel, typeof(Object).Name);
 
             Action a = () => result.Should().BeView().ModelAs<Object>();
 
@@ -259,10 +257,7 @@ public void WithDefaultViewName_GivenExpectedValue_ShouldPass()
         public void WithDefaultViewName_GivenUnexpectedValue_ShouldFail()
         {
             string viewName = "index";
-
-            // TODO: Improve the comparision of failure messages.
-            string value = String.Format("\"{0}\"", viewName);
-            string failureMessage = String.Format(FailureMessages.ViewResultBase_WithDefaultViewName, value);
+            string failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_WithDefaultViewName, viewName);
 
             ActionResult result = new ViewResult
             {