1 files changed, 113 insertions, 4 deletions
diff --git a/3rdParty/CppUnit/src/include/cppunit/Asserter.h b/3rdParty/CppUnit/src/include/cppunit/Asserter.h
index 94dadaa..3321b87 100644
--- a/3rdParty/CppUnit/src/include/cppunit/Asserter.h
+++ b/3rdParty/CppUnit/src/include/cppunit/Asserter.h
@@ -44,2 +44,9 @@ class Message;
  */
+
+#if defined __GNUC__
+#   define NORETURN __attribute__((noreturn))
+#else
+#   define NORETURN
+#endif
+
 struct Asserter
@@ -48,3 +55,3 @@ struct Asserter
    */
-  static void CPPUNIT_API fail( const Message &message, 
+  NORETURN static void CPPUNIT_API fail( const Message &message, 
                                 const SourceLine &sourceLine = SourceLine() );
@@ -54,3 +61,3 @@ struct Asserter
    */
-  static void CPPUNIT_API fail( std::string message, 
+  NORETURN static void CPPUNIT_API fail( std::string message, 
                                 const SourceLine &sourceLine = SourceLine() );
@@ -78,3 +85,3 @@ struct Asserter
 
-  /*! \brief Returns a expected value string for a message.
+  /*! \brief Returns a expected value string for a message, case equal than
    * Typically used to create 'not equal' message, or to check that a message
@@ -85,2 +92,3 @@ struct Asserter
    * \return \a expectedValue prefixed with "Expected: ".
+   * \deprecated Use makeExpectedEqual instead
    * \see makeActual().
@@ -88,2 +96,40 @@ struct Asserter
   static std::string CPPUNIT_API makeExpected( const std::string &expectedValue );
+  /*! \brief Returns a expected value string for a message, case equal than
+   * Typically used to create 'not equal' message, or to check that a message
+   * contains the expected content when writing unit tests for your custom 
+   * assertions.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected: ".
+   * \see makeActual().
+   */
+  static std::string CPPUNIT_API makeExpectedEqual( const std::string &expectedValue );
+  /*! \brief Returns a expected value string for a message, case less than.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected less than: ".
+   * \see makeExpectedEqual().
+   */
+  static std::string CPPUNIT_API makeExpectedLess( const std::string &expectedValue );
+  /*! \brief Returns a expected value string for a message, case less or equal than.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected: ".
+   * \see makeExpectedEqual().
+   */
+  static std::string CPPUNIT_API makeExpectedLessEqual( const std::string &expectedValue );
+  /*! \brief Returns a expected value string for a message, case greater than.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected: ".
+   * \see makeExpectedEqual().
+   */
+  static std::string CPPUNIT_API makeExpectedGreater( const std::string &expectedValue );
+  /*! \brief Returns a expected value string for a message, greater or equal than.
+   *
+   * \param expectedValue String that represents the expected value.
+   * \return \a expectedValue prefixed with "Expected: ".
+   * \see makeExpectedEqual().
+   */
+  static std::string CPPUNIT_API makeExpectedGreaterEqual( const std::string &expectedValue );
 
@@ -100,2 +146,5 @@ struct Asserter
 
+  /*!
+   * \deprecated Use makeMessage instead
+   */ 
   static Message CPPUNIT_API makeNotEqualMessage( const std::string &expectedValue,
@@ -105,2 +154,7 @@ struct Asserter
 
+  static Message CPPUNIT_API makeMessage( const std::string &expectedValue,
+                                                  const std::string &actualValue,
+                                                  const std::string &shortDescription,
+                                                  const AdditionalMessage &additionalMessage = AdditionalMessage());
+
   /*! \brief Throws an Exception with the specified message and location.
@@ -113,3 +167,3 @@ struct Asserter
    */
-  static void CPPUNIT_API failNotEqual( std::string expected, 
+  NORETURN static void CPPUNIT_API failNotEqual( std::string expected, 
                                         std::string actual, 
@@ -120,2 +174,57 @@ struct Asserter
   /*! \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
+   *                          what are the differences between the expected and actual value.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotLess( std::string expected, 
+                                        std::string actual, 
+                                        const SourceLine &sourceLine,
+                                        const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                        std::string shortDescription = "less 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
+   *                          what are the differences between the expected and actual value.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotGreater( std::string expected, 
+                                        std::string actual, 
+                                        const SourceLine &sourceLine,
+                                        const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                        std::string shortDescription = "greater 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
+   *                          what are the differences between the expected and actual value.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotLessEqual( std::string expected, 
+                                        std::string actual, 
+                                        const SourceLine &sourceLine,
+                                        const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                        std::string shortDescription = "less equal 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
+   *                          what are the differences between the expected and actual value.
+   * \param shortDescription Short description for the failure message.
+   */
+  static void CPPUNIT_API failNotGreaterEqual( std::string expected, 
+                                        std::string actual, 
+                                        const SourceLine &sourceLine,
+                                        const AdditionalMessage &additionalMessage = AdditionalMessage(),
+                                        std::string shortDescription = "greater equal assertion failed" );  /*! \brief Throws an Exception with the specified message and location.
+
    * \param shouldFail if \c true then the exception is thrown. Otherwise