Hooked up the ExpressionInspector.

Author: AlexArchive

TestStack.FluentMVCTesting.Tests/ViewResultTestTests.cs

@@ -72,26 +72,26 @@ public void Check_for_invalid_model_using_predicate()
             var exception = Assert.Throws<ViewResultModelAssertionException>(() =>
                 _viewResultTest.WithModel<TestViewModel>(m => m.Property1 == null)
             );
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model {{\"Property1\":\"{0}\",\"Property2\":{1}}} to pass the given condition (m => m.Property1 == null), but it failed.", _model.Property1, _model.Property2)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model {{\"Property1\":\"{0}\",\"Property2\":{1}}} to pass the given condition (m => (m.Property1 == null)), but it failed.", _model.Property1, _model.Property2)));
         }
 
         [Test]
-        public void Check_for_invalid_model_using_predicate_with_two_conditions()
+        public void Check_for_invalid_model_using_predicate_with_conditional_or()
         {
             var exception = Assert.Throws<ViewResultModelAssertionException>(() =>
-                _viewResultTest.WithModel<TestViewModel>(m => m.Property1 == null && m.Property2 == 2)
+                _viewResultTest.WithModel<TestViewModel>(m => m.Property1 == null || m.Property2 == 1)
             );
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model {{\"Property1\":\"{0}\",\"Property2\":{1}}} to pass the given condition (m => m.Property1 == null && m.Property2 == 2), but it failed.", _model.Property1, _model.Property2)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model {{\"Property1\":\"{0}\",\"Property2\":{1}}} to pass the given condition (m => ((m.Property1 == null) || (m.Property2 == 1))), but it failed.", _model.Property1, _model.Property2)));
         }
 
         [Test]
-        public void Check_for_invalid_model_using_predicate_with_closure()
+        public void Check_for_invalid_model_using_predicate_with_primitive_operand()
         {
-            int capturedOuterVariable = 2;
+            _viewResult.ViewData.Model = "abc";
             var exception = Assert.Throws<ViewResultModelAssertionException>(() =>
-                _viewResultTest.WithModel<TestViewModel>(m => m.Property1 == null && m.Property2 == capturedOuterVariable)
+                _viewResultTest.WithModel<string>(m => m == "ab")
             );
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model {{\"Property1\":\"{0}\",\"Property2\":{1}}} to pass the given condition (m => m.Property1 == null AndAlso m.Property2 == 2), but it failed.", _model.Property1, capturedOuterVariable)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected view model \"{0}\" to pass the given condition (m => (m == \"ab\")), but it failed.", _viewResult.ViewData.Model)));
         }
 
         [Test]
@@ -114,7 +114,7 @@ public void Run_any_assertions_on_the_model()
         }
     }
 
-    class InvalidViewModel {}
+    class InvalidViewModel { }
     public class TestViewModel
     {
         public string Property1 { get; set; }

TestStack.FluentMvcTesting/ViewResultTest.cs

@@ -3,6 +3,7 @@
 using System.Text.RegularExpressions;
 using System.Web.Helpers;
 using System.Web.Mvc;
+using TestStack.FluentMVCTesting.Internal;
 
 namespace TestStack.FluentMVCTesting
 {
@@ -46,8 +47,9 @@ public ModelTest<TModel> WithModel<TModel>(Expression<Func<TModel, bool>> predic
 
             var model = _viewResult.Model as TModel;
 
+            var inspector = new ExpressionInspector();
             var modelLex = Json.Encode(model);
-            var predicateLex = Regex.Replace(predicate.ToString(), "[()]", "");
+            var predicateLex = inspector.Inspect(predicate);
             var compiledPredicate = predicate.Compile();
 
             if (!compiledPredicate(model))