Readability tweaks.

Removed superflous using directives.
Moved test method into appropriate region.
Indented if statement (as per code review.)
Removed unintended whitespace between region.
Corrected test name.
Corrected errant test body formatting.

Author: AlexArchive

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Net;
-using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using NUnit.Framework;
 using TestStack.FluentMVCTesting.Tests.TestControllers;
@@ -317,8 +316,6 @@ public void Check_for_invalid_partial_name()
         }
         #endregion
 
-
-
         #region File tests
 
         [Test]
@@ -427,7 +424,7 @@ public void Check_for_file_content_result_and_check_textual_content_and_check_co
         }
 
         [Test]
-        public void Check_for_file_content_result_and_check_textual_content_and_check_invalid_content_result()
+        public void Check_for_file_content_result_and_check_textual_content_and_check_invalid_content_typet()
         {
             const string contentType = "application/dummy";
 
@@ -438,7 +435,7 @@ public void Check_for_file_content_result_and_check_textual_content_and_check_in
         }
 
         [Test]
-        public void Check_for_file_content_result_and_check_invalid_textual_content_and_check_invalid_content_result()
+        public void Check_for_file_content_result_and_check_invalid_textual_content_and_check_invalid_content_type()
         {
             const string contents = "dummy content";
             const string contentType = "application/dummy";
@@ -471,9 +468,7 @@ public void Check_for_file_content_result_and_check_textual_content_using_given_
         public void Check_for_file_content_result_and_check_textual_content_using_invalid_given_char_encoding()
         {
             Assert.Throws<ActionResultAssertionException>(() =>
-                _controller.WithCallTo(c => c.TextualFile())
-                    .ShouldRenderFileContents(ControllerResultTestController.TextualFileContents,
-                        ControllerResultTestController.FileContentType, Encoding.BigEndianUnicode));
+                _controller.WithCallTo(c => c.TextualFile()).ShouldRenderFileContents(ControllerResultTestController.TextualFileContents, ControllerResultTestController.FileContentType, Encoding.BigEndianUnicode));
         }
 
         [Test]

TestStack.FluentMvcTesting/ControllerResultTest.cs

@@ -3,12 +3,10 @@
 using System.Linq.Expressions;
 using System.Net;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using System.Web.Routing;
-using System.Web.UI.WebControls;
 
 namespace TestStack.FluentMVCTesting
 {
@@ -216,27 +214,6 @@ public ViewResultTest ShouldRenderDefaultPartialView()
 
         #endregion
 
-        public FileContentResult ShouldRenderFileContents(string contents, string contentType = null, Encoding encoding = null)
-        {
-            ValidateActionReturnType<FileContentResult>();
-
-            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 (encoding == null) encoding = Encoding.UTF8;
-            var reconstitutedText = encoding.GetString(fileResult.FileContents);
-            if (contents != reconstitutedText)
-            {
-                throw new ActionResultAssertionException(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, reconstitutedText));
-            }
-
-            return fileResult;
-        }
-
         #region File Results
 
         public FileResult ShouldRenderAnyFile(string contentType = null)
@@ -275,6 +252,31 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string
             return fileResult;
         }
 
+        public FileContentResult ShouldRenderFileContents(string contents, string contentType = null, Encoding encoding = null)
+        {
+            ValidateActionReturnType<FileContentResult>();
+
+            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 (encoding == null)
+                encoding = Encoding.UTF8;
+
+            var reconstitutedText = encoding.GetString(fileResult.FileContents);
+            if (contents != reconstitutedText)
+            {
+                throw new ActionResultAssertionException(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, reconstitutedText));
+            }
+
+            return fileResult;
+        }
+
         [Obsolete("Obsolete: Use ShouldRenderFileContents instead.")]
         public FileContentResult ShouldRenderFile(string contentType = null)
         {