Readability tweaks.

Author: AlexArchive

TestStack.FluentMVCTesting.Tests/Internal/ExpressionInspectorTests.cs

@@ -36,32 +36,32 @@ public void Correctly_parse_equality_comparison_with_property_operand()
         }
 
         [Test]
-        public void Correctly_parse_equality_comparison_with_property_operands()
+        public void Correctly_parse_equality_comparison_with_two_property_operands()
         {
-            Expression<Func<PostViewModel, bool>> func = post => post.Title == post.Slug;
+            Expression<Func<PostViewModel, bool>> func = post => 
+                post.Title == post.Slug;
             ExpressionInspector sut = new ExpressionInspector();
             var actual = sut.Inspect(func);
             Assert.AreEqual("post => (post.Title == post.Slug)", actual);
         }
 
         [Test]
-        public void Correctly_parse_inequality_comparison()
+        public void Correctly_parse_equality_comparison_with_captured_constant_operand()
         {
-            Expression<Func<int, bool>> func = number => number != 5;
+            const int Number = 5;
+            Expression<Func<int, bool>> func = number => number == Number;
             ExpressionInspector sut = new ExpressionInspector();
             var actual = sut.Inspect(func);
-            Assert.AreEqual("number => (number != 5)", actual);
+            Assert.AreEqual(string.Concat("number => (number == ", Number, ")"), actual);
         }
 
         [Test]
-        public void Correctly_parse_equality_comparison_with_captured_constant_operand()
+        public void Correctly_parse_inequality_comparison()
         {
-            const int Number = 5;
-            Expression<Func<int, bool>> func = number => number == Number;
+            Expression<Func<int, bool>> func = number => number != 5;
             ExpressionInspector sut = new ExpressionInspector();
             var actual = sut.Inspect(func);
-            Assert.AreEqual(
-                string.Concat("number => (number == ", Number, ")"), actual);
+            Assert.AreEqual("number => (number != 5)", actual);
         }
 
         [Test]
@@ -73,6 +73,25 @@ public void Correctly_parse_relational_comparison()
             Assert.AreEqual("number => (number < 5)", actual);
         }
 
+        [Test]
+        public void Correctly_parse_expression_whose_source_text_contains_parentheses()
+        {
+            Expression<Func<PostViewModel, bool>> func = post => post.Title.Contains("");
+            ExpressionInspector sut = new ExpressionInspector();
+            var actual = sut.Inspect(func);
+            Assert.AreEqual("post => post.Title.Contains(\"\")", actual);
+        }
+
+        [Test]
+        public void Correctly_parse_null_coalescing_operator()
+        {
+            Expression<Func<string, bool>> func =
+                text => text == ("" ?? "a");
+            ExpressionInspector sut = new ExpressionInspector();
+            var actual = sut.Inspect(func);
+            Assert.AreEqual("text => (text == (\"\" ?? \"a\"))", actual);
+        }
+
         [Test]
         public void Correctly_parse_conditional_or_operator()
         {
@@ -90,10 +109,10 @@ public void Correctly_parse_two_conditional_or_operators()
                 text => text == "any" || text.Length == 3 || text.Length == 9;
             ExpressionInspector sut = new ExpressionInspector();
             var actual = sut.Inspect(func);
-            Assert.AreEqual("text => (((text == \"any\") || (text.Length == 3)) || (text.Length == 9))", actual);
+            Assert.AreEqual(
+                "text => (((text == \"any\") || (text.Length == 3)) || (text.Length == 9))", actual);
         }
 
-
         [Test]
         public void Correctly_parse_conditional_and_operator()
         {
@@ -114,7 +133,6 @@ public void Correctly_parse_logical_and_operator()
             Assert.AreEqual("text => ((text == \"any\") & (text.Length == 3))", actual);
         }
 
-
         [Test]
         public void Correctly_parse_logical_or_operator()
         {
@@ -125,16 +143,6 @@ public void Correctly_parse_logical_or_operator()
             Assert.AreEqual("text => ((text == \"any\") | (text.Length == 3))", actual);
         }
 
-        [Test]
-        public void Correctly_parse_null_coalescing_operator()
-        {
-            Expression<Func<string, bool>> func =
-                text => text == ("" ?? "a");
-            ExpressionInspector sut = new ExpressionInspector();
-            var actual = sut.Inspect(func);
-            Assert.AreEqual("text => (text == (\"\" ?? \"a\"))", actual);
-        }
-
         [Test]
         public void Not_mistake_property_called_OrElse_for_conditional_or_operator()
         {
@@ -145,15 +153,6 @@ public void Not_mistake_property_called_OrElse_for_conditional_or_operator()
             Assert.AreEqual("post => ((post.Title == \"\") || (post.OrElse == \"\"))", actual);
         }
 
-        [Test]
-        public void Correctly_parse_expression_whose_source_text_contains_parentheses()
-        {
-            Expression<Func<PostViewModel, bool>> func = post => post.Title.Contains("");
-            ExpressionInspector sut = new ExpressionInspector();
-            var actual = sut.Inspect(func);
-            Assert.AreEqual("post => post.Title.Contains(\"\")", actual);
-        }
-
         [Test]
         public void Correctly_parse_logical_xor_operator()
         {

TestStack.FluentMvcTesting/Internal/ExpressionInspector.cs

@@ -1,5 +1,4 @@
 using System.Linq.Expressions;
-using System.Text.RegularExpressions;
 
 namespace TestStack.FluentMVCTesting.Internal
 {
@@ -12,7 +11,6 @@ internal string Inspect(LambdaExpression expression)
                 .Replace(" AndAlso ", " && ")
                 .Replace(" Or ", " | ")
                 .Replace(" And ", " & ");
-
         }
     }
 }