Merge pull request #57 from gedaiu/55-update-code-parsing

move source result init in Result struct

core/fluentasserts/core/base.d

@@ -28,16 +28,22 @@ struct Result {
   string file;
   size_t line;
 
+  private string reason;
+
   void because(string reason) {
-    message.prependText("Because " ~ reason ~ ", ");
+    this.reason = "Because " ~ reason ~ ", ";
   }
 
   void perform() {
     if(!willThrow) {
       return;
     }
 
-    throw new TestException(cast(IResult) message ~ results, file, line);
+    auto sourceResult = new SourceResult(file, line);
+    message.prependValue(sourceResult.getValue);
+    message.prependText(reason);
+
+    throw new TestException(cast(IResult) message ~ results ~ sourceResult, file, line);
   }
 
   ~this() {
@@ -179,12 +185,11 @@ mixin template ShouldCommons()
     }
 
     Result result(bool value, IResult res, string file, size_t line) {
-       return result(value, [], [ res ], file, line);
+      return result(value, [], [ res ], file, line);
     }
 
     Result result(bool value, Message[] msg, IResult[] res, const string file, const size_t line) {
-      auto sourceResult = new SourceResult(file, line);
-      auto finalMessage = new MessageResult(sourceResult.getValue ~ " should");
+      auto finalMessage = new MessageResult(" should");
 
       messages ~= Message(false, ".");
 
@@ -200,9 +205,7 @@ mixin template ShouldCommons()
         }
       }
 
-      IResult[] results = res ~ cast(IResult) sourceResult;
-
-      return Result(expectedValue != value, results, finalMessage, file, line);
+      return Result(expectedValue != value, res, finalMessage, file, line);
     }
   }
 }

core/fluentasserts/core/callable.d

@@ -139,7 +139,7 @@ unittest
   }
 
   t.should.not.beNull;
-  t.msg.split("\n")[0].should.equal("({↲      throw new CustomException(\"test\");↲    }) should throw a `CustomException` with message equal `other`. `test` is not equal to `other`.");
+  t.msg.should.startWith("({\n      throw new CustomException(\"test\");\n    }) should throw a `CustomException` with message equal `other`. `test` is not equal to `other`.");
 }
 
 /// Should fail if an exception is not thrown
@@ -196,7 +196,7 @@ unittest
   }
 
   exception.should.not.beNull.because("we wait 20 milliseconds");
-  exception.msg.split("\n")[0].should.startWith("({↲      Thread.sleep(2.msecs);↲    }) should have execution time less than `1 ms`.");
+  exception.msg.should.startWith("({\n      Thread.sleep(2.msecs);\n    }) should have execution time less than `1 ms`.");
 }
 
 /// It should check if a delagate is null

core/fluentasserts/core/results.d

@@ -183,6 +183,10 @@ class MessageResult : IResult
     this.messages = Message(false, text) ~ this.messages;
   }
 
+  void prependValue(string text) {
+    this.messages = Message(true, text) ~ this.messages;
+  }
+
   void print(ResultPrinter printer)
   {
     foreach(message; messages) {