Refactored certain file methods to test the content type first.

Partial implementation of #3

Author: AlexArchive

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs

@@ -382,6 +382,19 @@ public void Check_for_file_content_result_and_check_invalid_content_type()
             Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, ControllerResultTestController.FileContentType)));
         }
 
+        [Test]
+        public void Check_for_file_content_result_and_check_invalid_binary_content_and_check_invalid_content_type()
+        {
+            byte[] contents = { 1, 2 };
+            const string contentType = "application/dummy";
+
+            var exception = Assert.Throws<ActionResultAssertionException>(() => 
+                _controller.WithCallTo(c => c.File()).ShouldRenderFileContents(contents, contentType));
+
+            // When supplied with both an invalid content type and invalid content, test the content type first.
+            Assert.That(exception.Message.Contains("content type"));
+        }
+
         [Test]
         public void Check_for_file_result()
         {
@@ -457,6 +470,19 @@ public void Check_for_file_path_result_and_check_file_name_and_check_invalid_con
             Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, ControllerResultTestController.FileContentType)));
         }
 
+        [Test]
+        public void Check_for_file_path_result_and_check_invalid_file_name_and_check_invalid_content_type()
+        {
+            const string contentType = "application/dummy";
+            const string name = "dummy";
+
+            var exception = Assert.Throws<ActionResultAssertionException>(() =>
+                _controller.WithCallTo(c => c.EmptyFilePath()).ShouldRenderFilePath(name, contentType));
+
+            // When supplied with both an invalid content type and invalid file name, test the content type first.
+            Assert.That(exception.Message.Contains("content type"));
+        }
+
         #endregion
 
         #region HTTP Status tests

TestStack.FluentMvcTesting/ControllerResultTest.cs

@@ -237,6 +237,11 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string
 
             var fileResult = (FileContentResult) _actionResult;
 
+            if (contentType != null && fileResult.ContentType != contentType)
+            {
+                throw new ActionResultAssertionException(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, fileResult.ContentType));
+            }
+
             if (contents != null && !fileResult.FileContents.SequenceEqual(contents))
             {
                 throw new ActionResultAssertionException(string.Format(
@@ -245,11 +250,6 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string
                     string.Join(", ", fileResult.FileContents)));
             }
 
-            if (contentType != null && fileResult.ContentType != contentType)
-            {
-                throw new ActionResultAssertionException(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, fileResult.ContentType));
-            }
-
             return fileResult;
         }
 
@@ -288,14 +288,14 @@ public FilePathResult ShouldRenderFilePath(string fileName = null, string conten
 
             var fileResult = (FilePathResult)_actionResult;
 
-            if (fileName != null && fileName != fileResult.FileName)
+            if (contentType != null && fileResult.ContentType != contentType)
             {
-                throw new ActionResultAssertionException(string.Format("Expected file name to be '{0}', but instead was given '{1}'.", fileName, fileResult.FileName));
+                throw new ActionResultAssertionException(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, fileResult.ContentType));
             }
 
-            if (contentType != null && fileResult.ContentType != contentType)
+            if (fileName != null && fileName != fileResult.FileName)
             {
-                throw new ActionResultAssertionException(string.Format("Expected file to be of content type '{0}', but instead was given '{1}'.", contentType, fileResult.ContentType));
+                throw new ActionResultAssertionException(string.Format("Expected file name to be '{0}', but instead was given '{1}'.", fileName, fileResult.FileName));
             }
 
             return fileResult;