Moved partial view result assertion tests to PartialViewResultAssertions_Tests class.

Author: kevinkuszyk

tests/FluentAssertions.Mvc3.Tests/PartialViewResultAssertions_Tests.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Web.Mvc;
 using NUnit.Framework;
 
+using FluentAssertions.Mvc.Tests.Helpers;
+
 namespace FluentAssertions.Mvc.Tests
 {
     [TestFixture]
@@ -20,5 +19,75 @@ public void WithDefaultViewName_GivenExpectedValue_ShouldPass()
 
             result.Should().BePartialViewResult().WithDefaultViewName();
         }
+
+        [Test]
+        public void Model_GivenExpectedValue_ShouldPass()
+        {
+            ActionResult result = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary("hello")
+            };
+
+            result.Should().BePartialViewResult().Model.Should().Be("hello");
+        }
+
+        [Test]
+        public void Model_GivenUnexpectedValue_ShouldFail()
+        {
+            ActionResult result = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary("hello")
+            };
+
+            Action a = () => result.Should().BePartialViewResult().Model.Should().Be("xyx");
+            a.ShouldThrow<Exception>();
+        }
+
+        [Test]
+        public void ModelAs_GivenExpectedValue_ShouldPass()
+        {
+            ActionResult result = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary("hello")
+            };
+
+            result.Should().BePartialViewResult().ModelAs<string>().Should().Be("hello");
+        }
+
+        [Test]
+        public void ModelAs_GivenUnexpectedValue_ShouldFail()
+        {
+            ActionResult result = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary("hello")
+            };
+
+            Action a = () => result.Should().BePartialViewResult().ModelAs<string>().Should().Be("xyx");
+            a.ShouldThrow<Exception>();
+        }
+
+        [Test]
+        public void ModelAs_GivenWrongType_ShouldFail()
+        {
+            ActionResult result = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary("hello")
+            };
+
+            Action a = () => result.Should().BePartialViewResult().ModelAs<int>().Should().Be(2);
+            a.ShouldThrow<Exception>();
+        }
+
+        [Test]
+        public void ModelAs_Null_ShouldFail()
+        {
+            ActionResult result = new PartialViewResult();
+            string failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_NullModel, typeof(Object).Name);
+
+            Action a = () => result.Should().BePartialViewResult().ModelAs<Object>();
+
+            a.ShouldThrow<Exception>()
+                    .WithMessage(failureMessage);
+        }
     }
 }

tests/FluentAssertions.Mvc3.Tests/ViewResultAssertions_Tests.cs

@@ -187,7 +187,7 @@ public void WithViewData_GivenUnexpectedKey_ShouldFail()
         }
 
         [Test]
-        public void Model_ForViewResult_GivenExpectedValue_ShouldPass()
+        public void Model_GivenExpectedValue_ShouldPass()
         {
             ActionResult result = new ViewResult
             {
@@ -196,20 +196,9 @@ public void Model_ForViewResult_GivenExpectedValue_ShouldPass()
 
             result.Should().BeViewResult().Model.Should().Be("hello");
         }
-
+        
         [Test]
-        public void Model_ForPartialViewResult_GivenExpectedValue_ShouldPass()
-        {
-            ActionResult result = new PartialViewResult
-            {
-                ViewData = new ViewDataDictionary("hello")
-            };
-
-            result.Should().BePartialViewResult().Model.Should().Be("hello");
-        }
-
-        [Test]
-        public void Model_ForViewResult_GivenUnexpectedValue_ShouldFail()
+        public void Model_GivenUnexpectedValue_ShouldFail()
         {
             ActionResult result = new ViewResult
             {
@@ -219,21 +208,9 @@ public void Model_ForViewResult_GivenUnexpectedValue_ShouldFail()
             Action a = () => result.Should().BeViewResult().Model.Should().Be("xyx");
             a.ShouldThrow<Exception>();
         }
-
+        
         [Test]
-        public void Model_ForPartialViewResult_GivenUnexpectedValue_ShouldFail()
-        {
-            ActionResult result = new PartialViewResult
-            {
-                ViewData = new ViewDataDictionary("hello")
-            };
-
-            Action a = () => result.Should().BePartialViewResult().Model.Should().Be("xyx");
-            a.ShouldThrow<Exception>();
-        }
-
-        [Test]
-        public void ModelAs_ForViewResult_GivenExpectedValue_ShouldPass()
+        public void ModelAs_GivenExpectedValue_ShouldPass()
         {
             ActionResult result = new ViewResult
             {
@@ -244,18 +221,7 @@ public void ModelAs_ForViewResult_GivenExpectedValue_ShouldPass()
         }
 
         [Test]
-        public void ModelAs_ForPartialViewResult_GivenExpectedValue_ShouldPass()
-        {
-            ActionResult result = new PartialViewResult
-            {
-                ViewData = new ViewDataDictionary("hello")
-            };
-
-            result.Should().BePartialViewResult().ModelAs<string>().Should().Be("hello");
-        }
-
-        [Test]
-        public void ModelAs_ForViewResult_GivenUnexpectedValue_ShouldFail()
+        public void ModelAs_GivenUnexpectedValue_ShouldFail()
         {
             ActionResult result = new ViewResult
             {
@@ -265,21 +231,9 @@ public void ModelAs_ForViewResult_GivenUnexpectedValue_ShouldFail()
             Action a = () => result.Should().BeViewResult().ModelAs<string>().Should().Be("xyx");
             a.ShouldThrow<Exception>();
         }
-
+        
         [Test]
-        public void ModelAs_ForPartialViewResult_GivenUnexpectedValue_ShouldFail()
-        {
-            ActionResult result = new PartialViewResult
-            {
-                ViewData = new ViewDataDictionary("hello")
-            };
-
-            Action a = () => result.Should().BePartialViewResult().ModelAs<string>().Should().Be("xyx");
-            a.ShouldThrow<Exception>();
-        }
-
-        [Test]
-        public void ModelAs_ForViewResult_GivenWrongType_ShouldFail()
+        public void ModelAs_GivenWrongType_ShouldFail()
         {
             ActionResult result = new ViewResult
             {
@@ -289,21 +243,9 @@ public void ModelAs_ForViewResult_GivenWrongType_ShouldFail()
             Action a = () => result.Should().BeViewResult().ModelAs<int>().Should().Be(2);
             a.ShouldThrow<Exception>();
         }
-
-        [Test]
-        public void ModelAs_ForPartialViewResult_GivenWrongType_ShouldFail()
-        {
-            ActionResult result = new PartialViewResult
-            {
-                ViewData = new ViewDataDictionary("hello")
-            };
-
-            Action a = () => result.Should().BePartialViewResult().ModelAs<int>().Should().Be(2);
-            a.ShouldThrow<Exception>();
-        }
-
+        
         [Test]
-        public void ModelAs_ForViewResult_Null_ShouldFail()
+        public void ModelAs_Null_ShouldFail()
         {
             ActionResult result = new ViewResult();
             string failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_NullModel, typeof(Object).Name);
@@ -313,19 +255,7 @@ public void ModelAs_ForViewResult_Null_ShouldFail()
             a.ShouldThrow<Exception>()
                     .WithMessage(failureMessage);
         }
-
-        [Test]
-        public void ModelAs_ForPartialViewResult_Null_ShouldFail()
-        {
-            ActionResult result = new PartialViewResult();
-            string failureMessage = FailureMessageHelper.Format(FailureMessages.ViewResultBase_NullModel, typeof(Object).Name);
-
-            Action a = () => result.Should().BePartialViewResult().ModelAs<Object>();
-            
-            a.ShouldThrow<Exception>()
-                    .WithMessage(failureMessage);
-        }
-
+        
         [Test]
         public void WithDefaultViewName_GivenExpectedValue_ShouldPass()
         {