From 23c7ea0eeb8eb15b310475b08cf2418ef3035ae8 Mon Sep 17 00:00:00 2001 From: "Steve M. Robbins" Date: Fri, 12 Jan 2007 04:56:34 +0000 Subject: Arrange class initializers in correct order. --- ChangeLog | 11 +++++++++++ examples/cppunittest/MockFunctor.h | 4 ++-- examples/cppunittest/MockProtector.h | 6 +++--- examples/cppunittest/XmlOutputterTest.cpp | 6 +++--- examples/cppunittest/XmlUniformiser.cpp | 4 ++-- src/DllPlugInTester/CommandLineParser.cpp | 4 ++-- src/cppunit/DynamicLibraryManagerException.cpp | 4 ++-- src/cppunit/TestCaseDecorator.cpp | 4 ++-- src/cppunit/TextTestRunner.cpp | 4 ++-- src/cppunit/XmlDocument.cpp | 4 ++-- 10 files changed, 31 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c38167..6f78734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2007-01-11 Steve M. Robbins + * examples/cppunittest/MockFunctor.h: + * examples/cppunittest/MockProtector.h: + * examples/cppunittest/XmlOutputterTest.cpp: + * examples/cppunittest/XmlUniformiser.cpp: + * src/DllPlugInTester/CommandLineParser.cpp: + * src/cppunit/DynamicLibraryManagerException.cpp: + * src/cppunit/TestCaseDecorator.cpp: + * src/cppunit/TextTestRunner.cpp: + * src/cppunit/XmlDocument.cpp: Arrange field initializers in + correct order. + * include/cppunit/plugin/TestPlugIn.h (struct CppUnitTestPlugIn): * include/cppunit/extensions/TestFixtureFactory.h (class TestFixtureFactory): * include/cppunit/XmlOutputterHook.h (XmlOutputterHook): Add diff --git a/examples/cppunittest/MockFunctor.h b/examples/cppunittest/MockFunctor.h index fcc5a7a..888273b 100644 --- a/examples/cppunittest/MockFunctor.h +++ b/examples/cppunittest/MockFunctor.h @@ -11,12 +11,12 @@ class MockFunctor : public CPPUNIT_NS::Functor { public: MockFunctor() - : m_shouldThrow( false ) + : m_shouldSucceed( true ) + , m_shouldThrow( false ) , m_shouldThrowFailureException( false ) , m_hasExpectation( false ) , m_actualCallCount( 0 ) , m_expectedCallCount( 0 ) - , m_shouldSucceed( true ) { } diff --git a/examples/cppunittest/MockProtector.h b/examples/cppunittest/MockProtector.h index 54790e9..ace538d 100644 --- a/examples/cppunittest/MockProtector.h +++ b/examples/cppunittest/MockProtector.h @@ -19,10 +19,10 @@ class MockProtector : public CPPUNIT_NS::Protector { public: MockProtector() - : m_expectException( false ) - , m_hasExpectation( false ) - , m_wasCalled( false ) + : m_wasCalled( false ) , m_wasTrapped( false ) + , m_expectException( false ) + , m_hasExpectation( false ) , m_shouldPropagateException( false ) { } diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp index 4ca9f25..dad689c 100644 --- a/examples/cppunittest/XmlOutputterTest.cpp +++ b/examples/cppunittest/XmlOutputterTest.cpp @@ -230,11 +230,11 @@ public: int &statisticsCalls, int &successfulTestCalls, int &failedTestCalls ) - : m_successfulTestCalls( successfulTestCalls ) - , m_failedTestCalls( failedTestCalls ) - , m_beginCalls( beginCalls ) + : m_beginCalls( beginCalls ) , m_endCalls( endCalls ) , m_statisticsCalls( statisticsCalls ) + , m_successfulTestCalls( successfulTestCalls ) + , m_failedTestCalls( failedTestCalls ) { } diff --git a/examples/cppunittest/XmlUniformiser.cpp b/examples/cppunittest/XmlUniformiser.cpp index 44ad9b8..48c0207 100644 --- a/examples/cppunittest/XmlUniformiser.cpp +++ b/examples/cppunittest/XmlUniformiser.cpp @@ -41,8 +41,8 @@ checkXmlEqual( std::string expectedXml, XmlUniformiser::XmlUniformiser( const std::string &xml ) : - m_xml( xml ), - m_index( 0 ) + m_index( 0 ), + m_xml( xml ) { } diff --git a/src/DllPlugInTester/CommandLineParser.cpp b/src/DllPlugInTester/CommandLineParser.cpp index f4c19f5..1ad0245 100644 --- a/src/DllPlugInTester/CommandLineParser.cpp +++ b/src/DllPlugInTester/CommandLineParser.cpp @@ -3,14 +3,14 @@ CommandLineParser::CommandLineParser( int argc, const char *argv[] ) - : m_currentArgument( 0 ) - , m_useCompiler( false ) + : m_useCompiler( false ) , m_useXml( false ) , m_briefProgress( false ) , m_noProgress( false ) , m_useText( false ) , m_useCout( false ) , m_waitBeforeExit( false ) + , m_currentArgument( 0 ) { for ( int index =1; index < argc; ++index ) { diff --git a/src/cppunit/DynamicLibraryManagerException.cpp b/src/cppunit/DynamicLibraryManagerException.cpp index 71bbb76..8498652 100644 --- a/src/cppunit/DynamicLibraryManagerException.cpp +++ b/src/cppunit/DynamicLibraryManagerException.cpp @@ -9,8 +9,8 @@ DynamicLibraryManagerException::DynamicLibraryManagerException( const std::string &libraryName, const std::string &errorDetail, Cause cause ) - : m_cause( cause ) - , std::runtime_error( "" ) + : std::runtime_error( "" ), + m_cause( cause ) { if ( cause == loadingFailed ) m_message = "Failed to load dynamic library: " + libraryName + "\n" + diff --git a/src/cppunit/TestCaseDecorator.cpp b/src/cppunit/TestCaseDecorator.cpp index 4fb8f80..a7229f4 100644 --- a/src/cppunit/TestCaseDecorator.cpp +++ b/src/cppunit/TestCaseDecorator.cpp @@ -4,8 +4,8 @@ CPPUNIT_NS_BEGIN TestCaseDecorator::TestCaseDecorator( TestCase *test ) - : m_test( test ) - , TestCase( test->getName() ) + : TestCase( test->getName() ), + m_test( test ) { } diff --git a/src/cppunit/TextTestRunner.cpp b/src/cppunit/TextTestRunner.cpp index 8ac76c6..1534ec0 100644 --- a/src/cppunit/TextTestRunner.cpp +++ b/src/cppunit/TextTestRunner.cpp @@ -18,9 +18,9 @@ CPPUNIT_NS_BEGIN * \param outputter used to print text result. Owned by the runner. */ TextTestRunner::TextTestRunner( Outputter *outputter ) - : m_outputter( outputter ) - , m_result( new TestResultCollector() ) + : m_result( new TestResultCollector() ) , m_eventManager( new TestResult() ) + , m_outputter( outputter ) { if ( !m_outputter ) m_outputter = new TextOutputter( m_result, stdCOut() ); diff --git a/src/cppunit/XmlDocument.cpp b/src/cppunit/XmlDocument.cpp index 8ad8575..31f9115 100644 --- a/src/cppunit/XmlDocument.cpp +++ b/src/cppunit/XmlDocument.cpp @@ -8,8 +8,8 @@ CPPUNIT_NS_BEGIN XmlDocument::XmlDocument( const std::string &encoding, const std::string &styleSheet ) - : m_rootElement( new XmlElement( "DummyRoot" ) ) - , m_styleSheet( styleSheet ) + : m_styleSheet( styleSheet ) + , m_rootElement( new XmlElement( "DummyRoot" ) ) , m_standalone( true ) { setEncoding( encoding ); -- cgit v1.2.3