From 240cb599d739c7d96138588f4a474c637d91e677 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 1 Oct 2021 02:48:31 +0800 Subject: remove a few trailing whitespaces --- include/cppunit/Asserter.h | 42 +++++++++++++++++++++--------------------- src/cppunit/Asserter.cpp | 12 ++++++------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h index 8858688..ca65593 100644 --- a/include/cppunit/Asserter.h +++ b/include/cppunit/Asserter.h @@ -19,23 +19,23 @@ class Message; * \code * #include * #include - * - * void + * + * void * checkXmlEqual( std::string expectedXml, * std::string actualXml, * CppUnit::SourceLine sourceLine ) * { * std::string expected = XmlUniformiser( expectedXml ).stripped(); * std::string actual = XmlUniformiser( actualXml ).stripped(); - * + * * if ( expected == actual ) * return; - * + * * ::CppUnit::Asserter::failNotEqual( expected, * actual, * sourceLine ); * } - * + * * /// Asserts that two XML strings are equivalent. * #define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \ * checkXmlEqual( expected, actual, \ @@ -47,14 +47,14 @@ struct Asserter { /*! \brief Throws a Exception with the specified message and location. */ - [[noreturn]] static void CPPUNIT_API fail( const Message &message, - const SourceLine &sourceLine = SourceLine() ); + [[noreturn]] static void CPPUNIT_API fail( const Message &message, + const SourceLine &sourceLine = SourceLine() ); /*! \brief Throws a Exception with the specified message and location. * \deprecated Use fail( Message, SourceLine ) instead. */ - [[noreturn]] static void CPPUNIT_API fail( std::string message, - const SourceLine &sourceLine = SourceLine() ); + [[noreturn]] static void CPPUNIT_API fail( std::string message, + const SourceLine &sourceLine = SourceLine() ); /*! \brief Throws a Exception with the specified message and location. * \param shouldFail if \c true then the exception is thrown. Otherwise @@ -62,8 +62,8 @@ struct Asserter * \param message Message explaining the assertion failiure. * \param sourceLine Location of the assertion. */ - static void CPPUNIT_API failIf( bool shouldFail, - const Message &message, + static void CPPUNIT_API failIf( bool shouldFail, + const Message &message, const SourceLine &sourceLine = SourceLine() ); /*! \brief Throws a Exception with the specified message and location. @@ -73,13 +73,13 @@ struct Asserter * \param message Message explaining the assertion failiure. * \param sourceLine Location of the assertion. */ - static void CPPUNIT_API failIf( bool shouldFail, - std::string message, + static void CPPUNIT_API failIf( bool shouldFail, + std::string message, const SourceLine &sourceLine = SourceLine() ); /*! \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 + * contains the expected content when writing unit tests for your custom * assertions. * * \param expectedValue String that represents the expected value. @@ -90,7 +90,7 @@ 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 + * contains the expected content when writing unit tests for your custom * assertions. * * \param expectedValue String that represents the expected value. @@ -129,7 +129,7 @@ struct Asserter /*! \brief Returns an actual value string for a message. * Typically used to create 'not equal' message, or to check that a message - * contains the expected content when writing unit tests for your custom + * contains the expected content when writing unit tests for your custom * assertions. * * \param actualValue String that represents the actual value. @@ -140,7 +140,7 @@ struct Asserter /*! * \deprecated Use makeMessage instead - */ + */ static Message CPPUNIT_API makeNotEqualMessage( const std::string &expectedValue, const std::string &actualValue, const AdditionalMessage &additionalMessage = AdditionalMessage(), @@ -159,8 +159,8 @@ struct Asserter * what are the differences between the expected and actual value. * \param shortDescription Short description for the failure message. */ - [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, - std::string actual, + [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, + std::string actual, const SourceLine &sourceLine, const AdditionalMessage &additionalMessage = AdditionalMessage(), std::string shortDescription = "equality assertion failed" ); @@ -231,8 +231,8 @@ struct Asserter * \param shortDescription Short description for the failure message. */ static void CPPUNIT_API failNotEqualIf( bool shouldFail, - std::string expected, - std::string actual, + std::string expected, + std::string actual, const SourceLine &sourceLine, const AdditionalMessage &additionalMessage = AdditionalMessage(), std::string shortDescription = "equality assertion failed" ); diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp index 9e74f1d..52f8625 100644 --- a/src/cppunit/Asserter.cpp +++ b/src/cppunit/Asserter.cpp @@ -23,7 +23,7 @@ Asserter::fail( const Message &message, } -void +void Asserter::failIf( bool shouldFail, const Message &message, const SourceLine &sourceLine ) @@ -33,7 +33,7 @@ Asserter::failIf( bool shouldFail, } -void +void Asserter::failIf( bool shouldFail, std::string message, const SourceLine &sourceLine ) @@ -77,7 +77,7 @@ Asserter::makeExpectedGreaterEqual( const std::string& expectedValue ) return "Expected greater or equal than: " + expectedValue; } -std::string +std::string Asserter::makeActual( const std::string &actualValue ) { return "Actual : " + actualValue; @@ -99,7 +99,7 @@ Asserter::makeMessage( const std::string& expectedMessage, } -Message +Message Asserter::makeNotEqualMessage( const std::string &expectedValue, const std::string &actualValue, const AdditionalMessage &additionalMessage, @@ -109,7 +109,7 @@ Asserter::makeNotEqualMessage( const std::string &expectedValue, } -void +void Asserter::failNotEqual( std::string expected, std::string actual, const SourceLine &sourceLine, @@ -180,7 +180,7 @@ Asserter::failNotGreaterEqual( std::string expected, additionalMessage ), sourceLine ); } -void +void Asserter::failNotEqualIf( bool shouldFail, std::string expected, std::string actual, -- cgit v1.2.1