changed compose-log-expected to be multi-line aware.

florianbaer · Mar 26, 2016 · 5541d82 · 5541d82
1 parent 2e9cbe7
commit 5541d82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/ExAs/Assertions/MemberAssertions/Strings/EqualAssertion.cs b/src/ExAs/Assertions/MemberAssertions/Strings/EqualAssertion.cs
@@ -2,7 +2,6 @@
 using ExAs.Results;
 using ExAs.Utils;
 using ExAs.Utils.StringExtensions;
-using static ExAs.Utils.StringExtensions.StringFormattingFunctions;
 
 namespace ExAs.Assertions.MemberAssertions.Strings
 {
@@ -18,21 +17,14 @@ public EqualAssertion(string expected)
         public ValueAssertionResult AssertValue(string actual)
         {
             var actualValueString = actual.ToValueString();
-            var expectationString = Expected(expected);
+            var expectationString = ComposeLog.Expected(expected.ToValueString());
             Tuple<string, string> harmonizedOutput = HarmonizeLineCountWith(actualValueString, expectationString);
             return new ValueAssertionResult(
                 string.Equals(actual, expected), 
                 harmonizedOutput.Item1, 
                 harmonizedOutput.Item2);
         }
 
-        private string Expected(string input)
-        {
-            string apostrophedInput = input.ToValueString();
-            string inputWithExpectedPrefix = HangingIndent("(expected: ", apostrophedInput);
-            return string.Format("{0})", inputWithExpectedPrefix);
-        }
-
         private Tuple<string, string> HarmonizeLineCountWith(string firstString, string otherString)
         {
             int firstStringLineCount = firstString.SplitLines().Length;

diff --git a/src/ExAs/Utils/ComposeLog.cs b/src/ExAs/Utils/ComposeLog.cs
@@ -1,12 +1,13 @@
 using ExAs.Utils.StringExtensions;
+using static ExAs.Utils.StringExtensions.StringFormattingFunctions;
 
 namespace ExAs.Utils
 {
     public static class ComposeLog
     {
-        public static string Expected(string expectedValue)
+        public static string Expected(string expectationString)
         {
-            return "(expected: ".Add(expectedValue).Add(")");
+            return $"{HangingIndent("(expected: ", expectationString)})";
         }
     }
 }