fix coding style deviations

This commit is contained in:
François Moisan 2014-03-25 15:42:07 -04:00
parent 36bed7af00
commit 527a84a467
6 changed files with 13 additions and 19 deletions

View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 33 (master branch)* *v1.0 build 34 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

View File

@ -157,8 +157,7 @@ namespace Catch {
return m_userHooks; return m_userHooks;
} }
void addUserHook(ITestCaseHook* hook) void addUserHook(ITestCaseHook* hook) {
{
m_userHooks.push_back(hook); m_userHooks.push_back(hook);
} }

View File

@ -35,8 +35,8 @@ namespace Catch {
Never Never
}; }; }; };
struct ITestCaseHook struct ITestCaseHook {
{
virtual ~ITestCaseHook() {} virtual ~ITestCaseHook() {}
virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0; virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0;

View File

@ -256,8 +256,7 @@ namespace Catch {
return action; return action;
} }
void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) {
{
std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks(); std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks();
for(std::vector<ITestCaseHook*>::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it) for(std::vector<ITestCaseHook*>::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it)
@ -266,8 +265,7 @@ namespace Catch {
} }
} }
void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) {
{
std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks(); std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks();
for(std::vector<ITestCaseHook*>::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it) for(std::vector<ITestCaseHook*>::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it)

View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 33, "master" ); Version libraryVersion( 1, 0, 34, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 34 (master branch) * CATCH v1.0 build 34 (master branch)
* Generated: 2014-03-25 14:43:34.962000 * Generated: 2014-03-25 15:40:48.212000
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -1520,8 +1520,8 @@ namespace Catch {
Never Never
}; }; }; };
struct ITestCaseHook struct ITestCaseHook {
{
virtual ~ITestCaseHook() {} virtual ~ITestCaseHook() {}
virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0; virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0;
@ -3010,8 +3010,7 @@ namespace Catch {
return m_userHooks; return m_userHooks;
} }
void addUserHook(ITestCaseHook* hook) void addUserHook(ITestCaseHook* hook) {
{
m_userHooks.push_back(hook); m_userHooks.push_back(hook);
} }
@ -5047,8 +5046,7 @@ namespace Catch {
return action; return action;
} }
void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) {
{
std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks(); std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks();
for(std::vector<ITestCaseHook*>::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it) for(std::vector<ITestCaseHook*>::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it)
@ -5057,8 +5055,7 @@ namespace Catch {
} }
} }
void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) {
{
std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks(); std::vector<ITestCaseHook*> const & validations = m_config->userTestCaseHooks();
for(std::vector<ITestCaseHook*>::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it) for(std::vector<ITestCaseHook*>::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it)