CPPUNIT_ASSERT_PREDICATE about cppunit

[blytkerchan]

Patch to allow application of predicates in assertions (and get a useful message on failure)

--- cppunit-1.12.1/include/cppunit/Asserter.h
+++ cppunit-1.12.1/include/cppunit/Asserter.h
@@ -103,6 +103,10 @@
                                                   const AdditionalMessage &additionalMessage = AdditionalMessage(),
                                                   const std::string &shortDescription = "equality assertion failed");

+  static Message CPPUNIT_API makePredicateFailMessage( const std::string &expectedValue,
+                                                       const std::string &actualValue,
+                                                       const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                                       const std::string &shortDescription = "predicate failed");
   /*! \brief Throws an Exception with the specified message and location.
    * \param expected Text describing the expected value.
    * \param actual Text describing the actual value.
@@ -134,6 +138,20 @@
                                           const AdditionalMessage &additionalMessage = AdditionalMessage(),
                                           std::string shortDescription = "equality assertion failed" );

+
+  /*! \brief Throws an Exception with the specified message and location.
+   * \param expected Text describing the expected value.
+   * \param actual Text describing the actual value.
+   * \param sourceLine Location of the assertion.
+   * \param additionalMessage Additional message. Usually used to report
+   *                          where the "failed predicate" is located.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failPredicate( std::string expected, 
+                                         std::string actual, 
+                                         const SourceLine &sourceLine,
+                                         const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                         std::string shortDescription = "predicate failed" );
 };


--- cppunit-1.12.1/include/cppunit/TestAssert.h
+++ cppunit-1.12.1/include/cppunit/TestAssert.h
@@ -105,6 +105,25 @@
   }
 }

+/*! \brief (Implementation) Applies a given predicate to two values of the same type and asserts the predicate returns true.
+ * Use CPPUNIT_ASSERT_PREDICATE instead of this function.
+ * \sa assertion_traits, Asserter::failPredicate().
+ */
+template < class T, class P >
+void assertPredicate(const T& expected,
+                     const T& actual,
+                     const P& predicate,
+                     SourceLine sourceLine,
+                     const std::string &message)
+{
+    if (!predicate(actual, expected))
+    {
+        Asserter::failPredicate( assertion_traits<T>::toString(expected),
+                                 assertion_traits<T>::toString(actual),
+                                 sourceLine,
+                                 message );
+    }
+}

 /*! \brief (Implementation) Asserts that two double are equals given a tolerance.
  * Use CPPUNIT_ASSERT_DOUBLES_EQUAL instead of this function.
@@ -247,7 +266,12 @@
                                     CPPUNIT_SOURCELINE(),  \
                                     (message) ) )

-
+#define CPPUNIT_ASSERT_PREDICATE(message, expected, actual, predicate)  \
+    ( CPPUNIT_NS::assertPredicate( (expected),                          \
+                                   (actual),                            \
+                                   (predicate),                         \
+                                   CPPUNIT_SOURCELINE(),                \
+                                   (message) ) )
 /** Asserts that the given expression throws an exception of the specified type. 
  * \ingroup Assertions
  * Example of usage:
--- cppunit-1.12.1/src/cppunit/Asserter.cpp
+++ cppunit-1.12.1/src/cppunit/Asserter.cpp
@@ -69,7 +69,21 @@
   return message;
 }

+Message
+Asserter::makePredicateFailMessage( 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;
+}
+
+
 void 
 Asserter::failNotEqual( std::string expected, 
                         std::string actual, 
@@ -97,5 +111,18 @@
     failNotEqual( expected, actual, sourceLine, additionalMessage, shortDescription );
 }

+void Asserter::failPredicate( std::string expected, 
+                              std::string actual, 
+                              const SourceLine &sourceLine,
+                              const AdditionalMessage &additionalMessage,
+                              std::string shortDescription )
+{
+    fail( makePredicateFailMessage( expected,
+                                    actual,
+                                    additionalMessage,
+                                    shortDescription ), 
+          sourceLine );
+}

+
 CPPUNIT_NS_END

[blytkerchan]

Patch applied