1 files changed, 31 insertions, 28 deletions
diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp
index e43c19b..0b64f4f 100644
--- a/src/cppunit/Asserter.cpp
+++ b/src/cppunit/Asserter.cpp
@@ -10,7 +10,6 @@ namespace CppUnit
 namespace Asserter
 {
 
-
 void 
 fail( std::string message, 
       const SourceLine &sourceLine )
@@ -46,31 +45,32 @@ failIf( bool shouldFail,
 }
 
 
-void 
-failNotEqual( std::string expected, 
-              std::string actual, 
-              const SourceLine &sourceLine,
-              const Message &additionalMessage,
-              std::string shortDescription )
+std::string 
+makeExpected( const std::string &expectedValue )
 {
-  Message message( shortDescription,
-                   "Expected: " + expected,
-                   "Actual  : " + actual );
-  message.addDetail( additionalMessage );
-  fail( message, sourceLine );
+  return "Expected: " + expectedValue;
 }
 
 
-void 
-failNotEqualIf( bool shouldFail,
-                std::string expected, 
-                std::string actual, 
-                const SourceLine &sourceLine,
-                const Message &additionalMessage,
-                std::string shortDescription )
+std::string 
+makeActual( const std::string &actualValue )
 {
-  if ( shouldFail )
-    failNotEqual( expected, actual, sourceLine, additionalMessage, shortDescription );
+  return "Actual  : " + actualValue;
+}
+
+
+Message 
+makeNotEqualMessage( const std::string &expectedValue,
+                     const std::string &actualValue,
+                     const AdditionalMessage &additionalMessage,
+                     const std::string &shortDescription )
+{
+  Message message( shortDescription,
+                   makeExpected( expectedValue ),
+                   makeActual( actualValue ) );
+  message.addDetail( additionalMessage );
+
+  return message;
 }
 
 
@@ -78,12 +78,14 @@ void
 failNotEqual( std::string expected, 
               std::string actual, 
               const SourceLine &sourceLine,
-              std::string additionalMessage )
+              const AdditionalMessage &additionalMessage,
+              std::string shortDescription )
 {
-  Message message;
-  if ( !additionalMessage.empty() )
-    message.addDetail( additionalMessage );
-  failNotEqual( expected, actual, sourceLine, message );
+  fail( makeNotEqualMessage( expected,
+                             actual,
+                             additionalMessage,
+                             shortDescription ), 
+        sourceLine );
 }
 
 
@@ -92,10 +94,11 @@ failNotEqualIf( bool shouldFail,
                 std::string expected, 
                 std::string actual, 
                 const SourceLine &sourceLine,
-                std::string additionalMessage )
+                const AdditionalMessage &additionalMessage,
+                std::string shortDescription )
 {
   if ( shouldFail )
-    failNotEqual( expected, actual, sourceLine, additionalMessage );
+    failNotEqual( expected, actual, sourceLine, additionalMessage, shortDescription );
 }