Changed "const X ref"s to "X const ref"s
- Brought older code up to current convention (with the help of a Python script)
diff --git a/include/internal/catch_approx.hpp b/include/internal/catch_approx.hpp
index 128ef05..2f467a3 100644
--- a/include/internal/catch_approx.hpp
+++ b/include/internal/catch_approx.hpp
@@ -24,7 +24,7 @@
m_value( value )
{}
- Approx( const Approx& other )
+ Approx( Approx const& other )
: m_epsilon( other.m_epsilon ),
m_scale( other.m_scale ),
m_value( other.m_value )
@@ -41,20 +41,20 @@
return approx;
}
- friend bool operator == ( double lhs, const Approx& rhs ) {
+ friend bool operator == ( double lhs, Approx const& rhs ) {
// Thanks to Richard Harris for his help refining this formula
return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
}
- friend bool operator == ( const Approx& lhs, double rhs ) {
+ friend bool operator == ( Approx const& lhs, double rhs ) {
return operator==( rhs, lhs );
}
- friend bool operator != ( double lhs, const Approx& rhs ) {
+ friend bool operator != ( double lhs, Approx const& rhs ) {
return !operator==( lhs, rhs );
}
- friend bool operator != ( const Approx& lhs, double rhs ) {
+ friend bool operator != ( Approx const& lhs, double rhs ) {
return !operator==( rhs, lhs );
}
@@ -82,7 +82,7 @@
}
template<>
-inline std::string toString<Detail::Approx>( const Detail::Approx& value ) {
+inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
return value.toString();
}
diff --git a/include/internal/catch_assertionresult.h b/include/internal/catch_assertionresult.h
index 37372b6..b3f63e0 100644
--- a/include/internal/catch_assertionresult.h
+++ b/include/internal/catch_assertionresult.h
@@ -16,9 +16,9 @@
struct AssertionInfo
{
AssertionInfo() {}
- AssertionInfo( const std::string& _macroName,
- const SourceLineInfo& _lineInfo,
- const std::string& _capturedExpression,
+ AssertionInfo( std::string const& _macroName,
+ SourceLineInfo const& _lineInfo,
+ std::string const& _capturedExpression,
ResultDisposition::Flags _resultDisposition );
std::string macroName;
@@ -39,7 +39,7 @@
class AssertionResult {
public:
AssertionResult();
- AssertionResult( const AssertionInfo& info, const AssertionResultData& data );
+ AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
~AssertionResult();
bool isOk() const;
diff --git a/include/internal/catch_assertionresult.hpp b/include/internal/catch_assertionresult.hpp
index 9185330..5ba2f45 100644
--- a/include/internal/catch_assertionresult.hpp
+++ b/include/internal/catch_assertionresult.hpp
@@ -13,9 +13,9 @@
namespace Catch {
- AssertionInfo::AssertionInfo( const std::string& _macroName,
- const SourceLineInfo& _lineInfo,
- const std::string& _capturedExpression,
+ AssertionInfo::AssertionInfo( std::string const& _macroName,
+ SourceLineInfo const& _lineInfo,
+ std::string const& _capturedExpression,
ResultDisposition::Flags _resultDisposition )
: macroName( _macroName ),
lineInfo( _lineInfo ),
@@ -28,7 +28,7 @@
AssertionResult::AssertionResult() {}
- AssertionResult::AssertionResult( const AssertionInfo& info, const AssertionResultData& data )
+ AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
: m_info( info ),
m_resultData( data )
{}
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 81eb4a0..a8aa98b 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -27,8 +27,8 @@
}
template<typename MatcherT>
- ExpressionResultBuilder expressionResultBuilderFromMatcher( const MatcherT& matcher,
- const std::string& matcherCallAsString ) {
+ ExpressionResultBuilder expressionResultBuilderFromMatcher( MatcherT const& matcher,
+ std::string const& matcherCallAsString ) {
std::string matcherAsString = matcher.toString();
if( matcherAsString == "{?}" )
matcherAsString = matcherCallAsString;
@@ -38,18 +38,18 @@
}
template<typename MatcherT, typename ArgT>
- ExpressionResultBuilder expressionResultBuilderFromMatcher( const MatcherT& matcher,
- const ArgT& arg,
- const std::string& matcherCallAsString ) {
+ ExpressionResultBuilder expressionResultBuilderFromMatcher( MatcherT const& matcher,
+ ArgT const& arg,
+ std::string const& matcherCallAsString ) {
return expressionResultBuilderFromMatcher( matcher, matcherCallAsString )
.setLhs( Catch::toString( arg ) )
.setResultType( matcher.match( arg ) );
}
template<typename MatcherT, typename ArgT>
- ExpressionResultBuilder expressionResultBuilderFromMatcher( const MatcherT& matcher,
+ ExpressionResultBuilder expressionResultBuilderFromMatcher( MatcherT const& matcher,
ArgT* arg,
- const std::string& matcherCallAsString ) {
+ std::string const& matcherCallAsString ) {
return expressionResultBuilderFromMatcher( matcher, matcherCallAsString )
.setLhs( Catch::toString( arg ) )
.setResultType( matcher.match( arg ) );
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp
index 4c32d7f..7657da6 100644
--- a/include/internal/catch_commandline.hpp
+++ b/include/internal/catch_commandline.hpp
@@ -17,20 +17,20 @@
public:
Command(){}
- explicit Command( const std::string& name ) : m_name( name ) {
+ explicit Command( std::string const& name ) : m_name( name ) {
}
- Command& operator += ( const std::string& arg ) {
+ Command& operator += ( std::string const& arg ) {
m_args.push_back( arg );
return *this;
}
- Command& operator += ( const Command& other ) {
+ Command& operator += ( Command const& other ) {
std::copy( other.m_args.begin(), other.m_args.end(), std::back_inserter( m_args ) );
if( m_name.empty() )
m_name = other.m_name;
return *this;
}
- Command operator + ( const Command& other ) {
+ Command operator + ( Command const& other ) {
Command newCommand( *this );
newCommand += other;
return newCommand;
@@ -45,7 +45,7 @@
std::size_t argsCount() const { return m_args.size(); }
CATCH_ATTRIBUTE_NORETURN
- void raiseError( const std::string& message ) const {
+ void raiseError( std::string const& message ) const {
std::ostringstream oss;
if( m_name.empty() )
oss << "Error while parsing " << m_name << ". " << message << ".";
@@ -76,14 +76,14 @@
exeName = exeName.substr( pos+1 );
return exeName;
}
- Command find( const std::string& arg1, const std::string& arg2, const std::string& arg3 ) const {
+ Command find( std::string const& arg1, std::string const& arg2, std::string const& arg3 ) const {
return find( arg1 ) + find( arg2 ) + find( arg3 );
}
- Command find( const std::string& shortArg, const std::string& longArg ) const {
+ Command find( std::string const& shortArg, std::string const& longArg ) const {
return find( shortArg ) + find( longArg );
}
- Command find( const std::string& arg ) const {
+ Command find( std::string const& arg ) const {
if( arg.empty() )
return getArgs( "", 1 );
else
@@ -97,7 +97,7 @@
}
private:
- Command getArgs( const std::string& cmdName, std::size_t from ) const {
+ Command getArgs( std::string const& cmdName, std::size_t from ) const {
Command command( cmdName );
for( std::size_t i = from; i < m_argc && m_argv[i][0] != '-'; ++i )
command += m_argv[i];
@@ -116,7 +116,7 @@
virtual ~OptionParser() {}
- Command find( const CommandParser& parser ) const {
+ Command find( CommandParser const& parser ) const {
Command cmd;
for( std::vector<std::string>::const_iterator it = m_optionNames.begin();
it != m_optionNames.end();
@@ -125,7 +125,7 @@
return cmd;
}
- void validateArgs( const Command& args ) const {
+ void validateArgs( Command const& args ) const {
if( tooFewArgs( args ) || tooManyArgs( args ) ) {
std::ostringstream oss;
if( m_maxArgs == -1 )
@@ -138,14 +138,14 @@
}
}
- void parseIntoConfig( const CommandParser& parser, ConfigData& config ) {
+ void parseIntoConfig( CommandParser const& parser, ConfigData& config ) {
if( Command cmd = find( parser ) ) {
validateArgs( cmd );
parseIntoConfig( cmd, config );
}
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) = 0;
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) = 0;
virtual std::string argsSynopsis() const = 0;
virtual std::string optionSummary() const = 0;
virtual std::string optionDescription() const { return ""; }
@@ -171,10 +171,10 @@
protected:
- bool tooFewArgs( const Command& args ) const {
+ bool tooFewArgs( Command const& args ) const {
return args.argsCount() < static_cast<std::size_t>( m_minArgs );
}
- bool tooManyArgs( const Command& args ) const {
+ bool tooManyArgs( Command const& args ) const {
return m_maxArgs >= 0 && args.argsCount() > static_cast<std::size_t>( m_maxArgs );
}
std::vector<std::string> m_optionNames;
@@ -201,7 +201,7 @@
return "";
}
- virtual void parseIntoConfig( const Command&, ConfigData& ) {
+ virtual void parseIntoConfig( Command const&, ConfigData& ) {
// Does not affect config
}
};
@@ -254,7 +254,7 @@
"that start with 'a/b/', except 'a/b/c', which is included";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
std::string groupName;
for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
if( i != 0 )
@@ -300,7 +300,7 @@
"matches all tests tagged [one], except those also tagged [two]";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
std::string groupName;
for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
if( i != 0 )
@@ -345,7 +345,7 @@
;//" -l xml";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
config.listSpec = List::Tests;
if( cmd.argsCount() >= 1 ) {
if( cmd[0] == "all" )
@@ -404,7 +404,7 @@
"of the root node.";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
config.reporter = cmd[0];
}
};
@@ -438,7 +438,7 @@
" -o %debug \t(The IDE's debug output window - currently only Windows' "
"OutputDebugString is supported).";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
if( cmd[0][0] == '%' )
config.stream = cmd[0].substr( 1 );
else
@@ -465,7 +465,7 @@
"added worked first time!). To see successful, as well as failing, test results "
"just pass this option.";
}
- virtual void parseIntoConfig( const Command&, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const&, ConfigData& config ) {
config.includeWhichResults = Include::SuccessfulResults;
}
};
@@ -491,7 +491,7 @@
"built your code with the DEBUG preprocessor symbol";
}
- virtual void parseIntoConfig( const Command&, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const&, ConfigData& config ) {
config.shouldDebugBreak = true;
}
};
@@ -521,7 +521,7 @@
" -n \"tests of the widget component\"";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
config.name = cmd[0];
}
};
@@ -550,7 +550,7 @@
"number causes it to abort after that number of assertion failures.";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
int threshold = 1;
if( cmd.argsCount() == 1 ) {
std::stringstream ss;
@@ -589,7 +589,7 @@
"as not to contribute additional noise.";
}
- virtual void parseIntoConfig( const Command&, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const&, ConfigData& config ) {
config.allowThrows = false;
}
};
@@ -620,7 +620,7 @@
" -w NoAssertions";
}
- virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+ virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
if( cmd[i] == "NoAssertions" )
config.warnings = (ConfigData::WarnAbout::What)( config.warnings | ConfigData::WarnAbout::NoAssertions );
@@ -655,7 +655,7 @@
add<Options::HelpOptionParser>(); // Keep this one last
}
- void parseIntoConfig( const CommandParser& parser, ConfigData& config ) {
+ void parseIntoConfig( CommandParser const& parser, ConfigData& config ) {
config.name = parser.exeName();
if( endsWith( config.name, ".exe" ) )
config.name = config.name.substr( 0, config.name.size()-4 );
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h
index d662787..954f617 100644
--- a/include/internal/catch_common.h
+++ b/include/internal/catch_common.h
@@ -28,8 +28,8 @@
namespace Catch {
class NonCopyable {
- NonCopyable( const NonCopyable& );
- void operator = ( const NonCopyable& );
+ NonCopyable( NonCopyable const& );
+ void operator = ( NonCopyable const& );
protected:
NonCopyable() {}
virtual ~NonCopyable();
@@ -67,17 +67,17 @@
}
template<typename ContainerT, typename Function>
- inline void forEach( const ContainerT& container, Function function ) {
+ inline void forEach( ContainerT const& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
- inline bool startsWith( const std::string& s, const std::string& prefix ) {
+ inline bool startsWith( std::string const& s, std::string const& prefix ) {
return s.size() >= prefix.size() && s.substr( 0, prefix.size() ) == prefix;
}
- inline bool endsWith( const std::string& s, const std::string& suffix ) {
+ inline bool endsWith( std::string const& s, std::string const& suffix ) {
return s.size() >= suffix.size() && s.substr( s.size()-suffix.size(), suffix.size() ) == suffix;
}
- inline bool contains( const std::string& s, const std::string& infix ) {
+ inline bool contains( std::string const& s, std::string const& infix ) {
return s.find( infix ) != std::string::npos;
}
inline void toLowerInPlace( std::string& s ) {
@@ -90,12 +90,12 @@
}
struct pluralise {
- pluralise( std::size_t count, const std::string& label )
+ pluralise( std::size_t count, std::string const& label )
: m_count( count ),
m_label( label )
{}
- friend std::ostream& operator << ( std::ostream& os, const pluralise& pluraliser ) {
+ friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
os << pluraliser.m_count << " " << pluraliser.m_label;
if( pluraliser.m_count != 1 )
os << "s";
@@ -109,11 +109,11 @@
struct SourceLineInfo {
SourceLineInfo() : line( 0 ){}
- SourceLineInfo( const std::string& _file, std::size_t _line )
+ SourceLineInfo( std::string const& _file, std::size_t _line )
: file( _file ),
line( _line )
{}
- SourceLineInfo( const SourceLineInfo& other )
+ SourceLineInfo( SourceLineInfo const& other )
: file( other.file ),
line( other.line )
{}
@@ -125,7 +125,7 @@
std::size_t line;
};
- inline std::ostream& operator << ( std::ostream& os, const SourceLineInfo& info ) {
+ inline std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
#ifndef __GNUG__
os << info.file << "(" << info.line << ")";
#else
@@ -135,7 +135,7 @@
}
CATCH_ATTRIBUTE_NORETURN
- inline void throwLogicError( const std::string& message, const SourceLineInfo& locationInfo ) {
+ inline void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) {
std::ostringstream oss;
oss << locationInfo << ": Internal Catch error: '" << message << "'";
throw std::logic_error( oss.str() );
diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp
index 0e5de38..87c7d73 100644
--- a/include/internal/catch_config.hpp
+++ b/include/internal/catch_config.hpp
@@ -77,8 +77,8 @@
class Config : public IConfig {
private:
- Config( const Config& other );
- Config& operator = ( const Config& other );
+ Config( Config const& other );
+ Config& operator = ( Config const& other );
virtual void dummy();
public:
@@ -86,7 +86,7 @@
: m_os( std::cout.rdbuf() )
{}
- Config( const ConfigData& data )
+ Config( ConfigData const& data )
: m_data( data ),
m_os( std::cout.rdbuf() )
{}
@@ -96,7 +96,7 @@
m_stream.release();
}
- void setFilename( const std::string& filename ) {
+ void setFilename( std::string const& filename ) {
m_data.outputFilename = filename;
}
@@ -104,7 +104,7 @@
return m_data.listSpec;
}
- const std::string& getFilename() const {
+ std::string const& getFilename() const {
return m_data.outputFilename ;
}
@@ -132,14 +132,14 @@
m_os.rdbuf( buf ? buf : std::cout.rdbuf() );
}
- void useStream( const std::string& streamName ) {
+ void useStream( std::string const& streamName ) {
Stream stream = createStream( streamName );
setStreamBuf( stream.streamBuf );
m_stream.release();
m_stream = stream;
}
- void addTestSpec( const std::string& testSpec ) {
+ void addTestSpec( std::string const& testSpec ) {
TestCaseFilters filters( testSpec );
filters.addFilter( TestCaseFilter( testSpec ) );
m_data.filters.push_back( filters );
@@ -157,7 +157,7 @@
return m_data.allowThrows;
}
- const ConfigData& data() const {
+ ConfigData const& data() const {
return m_data;
}
ConfigData& data() {
diff --git a/include/internal/catch_context.h b/include/internal/catch_context.h
index 831d22a..5b4976c 100644
--- a/include/internal/catch_context.h
+++ b/include/internal/catch_context.h
@@ -29,7 +29,7 @@
virtual IResultCapture& getResultCapture() = 0;
virtual IRunner& getRunner() = 0;
- virtual size_t getGeneratorIndex( const std::string& fileInfo, size_t totalSize ) = 0;
+ virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0;
virtual bool advanceGeneratorsForCurrentTest() = 0;
virtual const IConfig* getConfig() const = 0;
};
@@ -45,7 +45,7 @@
IContext& getCurrentContext();
IMutableContext& getCurrentMutableContext();
void cleanUpContext();
- Stream createStream( const std::string& streamName );
+ Stream createStream( std::string const& streamName );
}
diff --git a/include/internal/catch_context_impl.hpp b/include/internal/catch_context_impl.hpp
index e969572..d14aed4 100644
--- a/include/internal/catch_context_impl.hpp
+++ b/include/internal/catch_context_impl.hpp
@@ -18,8 +18,8 @@
class Context : public IMutableContext {
Context() : m_config( NULL ) {}
- Context( const Context& );
- void operator=( const Context& );
+ Context( Context const& );
+ void operator=( Context const& );
public: // IContext
virtual IResultCapture& getResultCapture() {
@@ -28,7 +28,7 @@
virtual IRunner& getRunner() {
return *m_runner;
}
- virtual size_t getGeneratorIndex( const std::string& fileInfo, size_t totalSize ) {
+ virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) {
return getGeneratorsForCurrentTest()
.getGeneratorInfo( fileInfo, totalSize )
.getCurrentIndex();
@@ -95,7 +95,7 @@
return getCurrentMutableContext();
}
- Stream createStream( const std::string& streamName ) {
+ Stream createStream( std::string const& streamName ) {
if( streamName == "stdout" ) return Stream( std::cout.rdbuf(), false );
if( streamName == "stderr" ) return Stream( std::cerr.rdbuf(), false );
if( streamName == "debug" ) return Stream( new StreamBufImpl<OutputDebugWriter>, true );
diff --git a/include/internal/catch_debugger.hpp b/include/internal/catch_debugger.hpp
index 4276989..89e15d6 100644
--- a/include/internal/catch_debugger.hpp
+++ b/include/internal/catch_debugger.hpp
@@ -103,11 +103,11 @@
#ifdef CATCH_PLATFORM_WINDOWS
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
-inline void writeToDebugConsole( const std::string& text ) {
+inline void writeToDebugConsole( std::string const& text ) {
::OutputDebugStringA( text.c_str() );
}
#else
-inline void writeToDebugConsole( const std::string& text ) {
+inline void writeToDebugConsole( std::string const& text ) {
// !TBD: Need a version for Mac/ XCode and other IDEs
std::cout << text;
}
diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp
index db1be5e..3592e2a 100644
--- a/include/internal/catch_evaluate.hpp
+++ b/include/internal/catch_evaluate.hpp
@@ -34,7 +34,7 @@
template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
template<typename T>
- inline T& opCast(const T& t) { return const_cast<T&>(t); }
+ inline T& opCast(T const& t) { return const_cast<T&>(t); }
// nullptr_t support based on pull request #154 from Konstantin Baumann
#ifdef CATCH_CONFIG_CPP11_NULLPTR
@@ -49,43 +49,43 @@
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsEqualTo> {
- static bool evaluate( const T1& lhs, const T2& rhs) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs) {
return opCast( lhs ) == opCast( rhs );
}
};
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsNotEqualTo> {
- static bool evaluate( const T1& lhs, const T2& rhs ) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs ) {
return opCast( lhs ) != opCast( rhs );
}
};
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsLessThan> {
- static bool evaluate( const T1& lhs, const T2& rhs ) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs ) {
return opCast( lhs ) < opCast( rhs );
}
};
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsGreaterThan> {
- static bool evaluate( const T1& lhs, const T2& rhs ) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs ) {
return opCast( lhs ) > opCast( rhs );
}
};
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
- static bool evaluate( const T1& lhs, const T2& rhs ) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs ) {
return opCast( lhs ) >= opCast( rhs );
}
};
template<typename T1, typename T2>
struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
- static bool evaluate( const T1& lhs, const T2& rhs ) {
+ static bool evaluate( T1 const& lhs, T2 const& rhs ) {
return opCast( lhs ) <= opCast( rhs );
}
};
template<Operator Op, typename T1, typename T2>
- bool applyEvaluator( const T1& lhs, const T2& rhs ) {
+ bool applyEvaluator( T1 const& lhs, T2 const& rhs ) {
return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
}
@@ -94,7 +94,7 @@
// "base" overload
template<Operator Op, typename T1, typename T2>
- bool compare( const T1& lhs, const T2& rhs ) {
+ bool compare( T1 const& lhs, T2 const& rhs ) {
return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
}
diff --git a/include/internal/catch_expression_decomposer.hpp b/include/internal/catch_expression_decomposer.hpp
index 1d8ca73..9d8fd35 100644
--- a/include/internal/catch_expression_decomposer.hpp
+++ b/include/internal/catch_expression_decomposer.hpp
@@ -17,8 +17,8 @@
public:
template<typename T>
- ExpressionLhs<const T&> operator->* ( const T & operand ) {
- return ExpressionLhs<const T&>( operand );
+ ExpressionLhs<T const&> operator->* ( T const& operand ) {
+ return ExpressionLhs<T const&>( operand );
}
ExpressionLhs<bool> operator->* ( bool value ) {
diff --git a/include/internal/catch_expression_lhs.hpp b/include/internal/catch_expression_lhs.hpp
index 2cc7397..21cc593 100644
--- a/include/internal/catch_expression_lhs.hpp
+++ b/include/internal/catch_expression_lhs.hpp
@@ -19,38 +19,38 @@
// in an ExpressionResultBuilder object
template<typename T>
class ExpressionLhs {
- void operator = ( const ExpressionLhs& );
+ void operator = ( ExpressionLhs const& );
public:
ExpressionLhs( T lhs ) : m_lhs( lhs ) {}
template<typename RhsT>
- ExpressionResultBuilder& operator == ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator == ( RhsT const& rhs ) {
return captureExpression<Internal::IsEqualTo>( rhs );
}
template<typename RhsT>
- ExpressionResultBuilder& operator != ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator != ( RhsT const& rhs ) {
return captureExpression<Internal::IsNotEqualTo>( rhs );
}
template<typename RhsT>
- ExpressionResultBuilder& operator < ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator < ( RhsT const& rhs ) {
return captureExpression<Internal::IsLessThan>( rhs );
}
template<typename RhsT>
- ExpressionResultBuilder& operator > ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator > ( RhsT const& rhs ) {
return captureExpression<Internal::IsGreaterThan>( rhs );
}
template<typename RhsT>
- ExpressionResultBuilder& operator <= ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator <= ( RhsT const& rhs ) {
return captureExpression<Internal::IsLessThanOrEqualTo>( rhs );
}
template<typename RhsT>
- ExpressionResultBuilder& operator >= ( const RhsT& rhs ) {
+ ExpressionResultBuilder& operator >= ( RhsT const& rhs ) {
return captureExpression<Internal::IsGreaterThanOrEqualTo>( rhs );
}
@@ -72,14 +72,14 @@
// Only simple binary expressions are allowed on the LHS.
// If more complex compositions are required then place the sub expression in parentheses
- template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( const RhsT& );
- template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( const RhsT& );
- template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( const RhsT& );
- template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( const RhsT& );
+ template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( RhsT const& );
+ template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( RhsT const& );
+ template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( RhsT const& );
+ template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( RhsT const& );
private:
template<Internal::Operator Op, typename RhsT>
- ExpressionResultBuilder& captureExpression( const RhsT& rhs ) {
+ ExpressionResultBuilder& captureExpression( RhsT const& rhs ) {
return m_result
.setResultType( Internal::compare<Op>( m_lhs, rhs ) )
.setLhs( Catch::toString( m_lhs ) )
diff --git a/include/internal/catch_expressionresult_builder.h b/include/internal/catch_expressionresult_builder.h
index eb9109f..5bf4137 100644
--- a/include/internal/catch_expressionresult_builder.h
+++ b/include/internal/catch_expressionresult_builder.h
@@ -22,26 +22,26 @@
public:
ExpressionResultBuilder( ResultWas::OfType resultType = ResultWas::Unknown );
- ExpressionResultBuilder( const ExpressionResultBuilder& other );
- ExpressionResultBuilder& operator=(const ExpressionResultBuilder& other );
+ ExpressionResultBuilder( ExpressionResultBuilder const& other );
+ ExpressionResultBuilder& operator=(ExpressionResultBuilder const& other );
ExpressionResultBuilder& setResultType( ResultWas::OfType result );
ExpressionResultBuilder& setResultType( bool result );
- ExpressionResultBuilder& setLhs( const std::string& lhs );
- ExpressionResultBuilder& setRhs( const std::string& rhs );
- ExpressionResultBuilder& setOp( const std::string& op );
+ ExpressionResultBuilder& setLhs( std::string const& lhs );
+ ExpressionResultBuilder& setRhs( std::string const& rhs );
+ ExpressionResultBuilder& setOp( std::string const& op );
ExpressionResultBuilder& endExpression( ResultDisposition::Flags resultDisposition );
template<typename T>
- ExpressionResultBuilder& operator << ( const T& value ) {
+ ExpressionResultBuilder& operator << ( T const& value ) {
m_stream << value;
return *this;
}
- std::string reconstructExpression( const AssertionInfo& info ) const;
+ std::string reconstructExpression( AssertionInfo const& info ) const;
- AssertionResult buildResult( const AssertionInfo& info ) const;
+ AssertionResult buildResult( AssertionInfo const& info ) const;
private:
AssertionResultData m_data;
diff --git a/include/internal/catch_expressionresult_builder.hpp b/include/internal/catch_expressionresult_builder.hpp
index c1484fb..ec4774b 100644
--- a/include/internal/catch_expressionresult_builder.hpp
+++ b/include/internal/catch_expressionresult_builder.hpp
@@ -17,13 +17,13 @@
ExpressionResultBuilder::ExpressionResultBuilder( ResultWas::OfType resultType ) {
m_data.resultType = resultType;
}
- ExpressionResultBuilder::ExpressionResultBuilder( const ExpressionResultBuilder& other )
+ ExpressionResultBuilder::ExpressionResultBuilder( ExpressionResultBuilder const& other )
: m_data( other.m_data ),
m_exprComponents( other.m_exprComponents )
{
m_stream << other.m_stream.str();
}
- ExpressionResultBuilder& ExpressionResultBuilder::operator=(const ExpressionResultBuilder& other ) {
+ ExpressionResultBuilder& ExpressionResultBuilder::operator=(ExpressionResultBuilder const& other ) {
m_data = other.m_data;
m_exprComponents = other.m_exprComponents;
m_stream.str("");
@@ -42,19 +42,19 @@
m_exprComponents.shouldNegate = shouldNegate( resultDisposition );
return *this;
}
- ExpressionResultBuilder& ExpressionResultBuilder::setLhs( const std::string& lhs ) {
+ ExpressionResultBuilder& ExpressionResultBuilder::setLhs( std::string const& lhs ) {
m_exprComponents.lhs = lhs;
return *this;
}
- ExpressionResultBuilder& ExpressionResultBuilder::setRhs( const std::string& rhs ) {
+ ExpressionResultBuilder& ExpressionResultBuilder::setRhs( std::string const& rhs ) {
m_exprComponents.rhs = rhs;
return *this;
}
- ExpressionResultBuilder& ExpressionResultBuilder::setOp( const std::string& op ) {
+ ExpressionResultBuilder& ExpressionResultBuilder::setOp( std::string const& op ) {
m_exprComponents.op = op;
return *this;
}
- AssertionResult ExpressionResultBuilder::buildResult( const AssertionInfo& info ) const
+ AssertionResult ExpressionResultBuilder::buildResult( AssertionInfo const& info ) const
{
assert( m_data.resultType != ResultWas::Unknown );
@@ -76,7 +76,7 @@
}
return AssertionResult( info, data );
}
- std::string ExpressionResultBuilder::reconstructExpression( const AssertionInfo& info ) const {
+ std::string ExpressionResultBuilder::reconstructExpression( AssertionInfo const& info ) const {
if( m_exprComponents.op == "" )
return m_exprComponents.lhs.empty() ? info.capturedExpression : m_exprComponents.op + m_exprComponents.lhs;
else if( m_exprComponents.op == "matches" )
diff --git a/include/internal/catch_generators_impl.hpp b/include/internal/catch_generators_impl.hpp
index 23304f9..75af739 100644
--- a/include/internal/catch_generators_impl.hpp
+++ b/include/internal/catch_generators_impl.hpp
@@ -50,7 +50,7 @@
deleteAll( m_generatorsInOrder );
}
- IGeneratorInfo& getGeneratorInfo( const std::string& fileInfo, std::size_t size ) {
+ IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) {
std::map<std::string, IGeneratorInfo*>::const_iterator it = m_generatorsByName.find( fileInfo );
if( it == m_generatorsByName.end() ) {
IGeneratorInfo* info = new GeneratorInfo( size );
diff --git a/include/internal/catch_interfaces_capture.h b/include/internal/catch_interfaces_capture.h
index c6c327a..8cc68cc 100644
--- a/include/internal/catch_interfaces_capture.h
+++ b/include/internal/catch_interfaces_capture.h
@@ -36,7 +36,7 @@
virtual bool shouldDebugBreak() const = 0;
- virtual void acceptMessage( const MessageBuilder& messageBuilder ) = 0;
+ virtual void acceptMessage( MessageBuilder const& messageBuilder ) = 0;
virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) = 0;
virtual std::string getCurrentTestName() const = 0;
diff --git a/include/internal/catch_interfaces_generators.h b/include/internal/catch_interfaces_generators.h
index 8907adb..03b01d9 100644
--- a/include/internal/catch_interfaces_generators.h
+++ b/include/internal/catch_interfaces_generators.h
@@ -21,7 +21,7 @@
struct IGeneratorsForTest {
virtual ~IGeneratorsForTest();
- virtual IGeneratorInfo& getGeneratorInfo( const std::string& fileInfo, std::size_t size ) = 0;
+ virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0;
virtual bool moveNext() = 0;
};
diff --git a/include/internal/catch_interfaces_registry_hub.h b/include/internal/catch_interfaces_registry_hub.h
index 7d932bd..7fae3ab 100644
--- a/include/internal/catch_interfaces_registry_hub.h
+++ b/include/internal/catch_interfaces_registry_hub.h
@@ -23,15 +23,15 @@
struct IRegistryHub {
virtual ~IRegistryHub();
- virtual const IReporterRegistry& getReporterRegistry() const = 0;
- virtual const ITestCaseRegistry& getTestCaseRegistry() const = 0;
+ virtual IReporterRegistry const& getReporterRegistry() const = 0;
+ virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
};
struct IMutableRegistryHub {
virtual ~IMutableRegistryHub();
- virtual void registerReporter( const std::string& name, IReporterFactory* factory ) = 0;
- virtual void registerTest( const TestCase& testInfo ) = 0;
+ virtual void registerReporter( std::string const& name, IReporterFactory* factory ) = 0;
+ virtual void registerTest( TestCase const& testInfo ) = 0;
virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
};
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index 3fa228b..751135b 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -303,11 +303,11 @@
virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0;
virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0;
virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0;
- virtual void EndSection( std::string const& sectionName, const Counts& assertions ) = 0;
+ virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0;
virtual void NoAssertionsInSection( std::string const& sectionName ) = 0;
virtual void NoAssertionsInTestCase( std::string const& testName ) = 0;
virtual void Aborted() = 0;
- virtual void Result( const AssertionResult& result ) = 0;
+ virtual void Result( AssertionResult const& result ) = 0;
};
@@ -322,7 +322,7 @@
virtual ~IReporterRegistry();
virtual IStreamingReporter* create( std::string const& name, ReporterConfig const& config ) const = 0;
- virtual const FactoryMap& getFactories() const = 0;
+ virtual FactoryMap const& getFactories() const = 0;
};
inline std::string trim( std::string const& str ) {
diff --git a/include/internal/catch_interfaces_testcase.h b/include/internal/catch_interfaces_testcase.h
index 3f0c707..90d1200 100644
--- a/include/internal/catch_interfaces_testcase.h
+++ b/include/internal/catch_interfaces_testcase.h
@@ -26,8 +26,8 @@
struct ITestCaseRegistry {
virtual ~ITestCaseRegistry();
- virtual const std::vector<TestCase>& getAllTests() const = 0;
- virtual std::vector<TestCase> getMatchingTestCases( const std::string& rawTestSpec ) const = 0;
+ virtual std::vector<TestCase> const& getAllTests() const = 0;
+ virtual std::vector<TestCase> getMatchingTestCases( std::string const& rawTestSpec ) const = 0;
};
}
diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp
index b1504f4..aa47b13 100644
--- a/include/internal/catch_list.hpp
+++ b/include/internal/catch_list.hpp
@@ -16,7 +16,7 @@
#include <algorithm>
namespace Catch {
- inline bool matchesFilters( const std::vector<TestCaseFilters>& filters, const TestCase& testCase ) {
+ inline bool matchesFilters( std::vector<TestCaseFilters> const& filters, TestCase const& testCase ) {
std::vector<TestCaseFilters>::const_iterator it = filters.begin();
std::vector<TestCaseFilters>::const_iterator itEnd = filters.end();
for(; it != itEnd; ++it )
@@ -25,7 +25,7 @@
return true;
}
- inline void listTests( const ConfigData& config ) {
+ inline void listTests( ConfigData const& config ) {
if( config.filters.empty() )
std::cout << "All available test cases:\n";
else
@@ -100,7 +100,7 @@
std::cout << pluralise( matchedTests, "matching test case" ) << std::endl;
}
- inline void listTags( const ConfigData& config ) {
+ inline void listTags( ConfigData const& config ) {
if( config.filters.empty() )
std::cout << "All available tags:\n";
else
@@ -152,7 +152,7 @@
std::cout << pluralise( tagCounts.size(), "tag" ) << std::endl;
}
- inline void listReporters( const ConfigData& /*config*/ ) {
+ inline void listReporters( ConfigData const& /*config*/ ) {
std::cout << "Available reports:\n";
IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
IReporterRegistry::FactoryMap::const_iterator it = factories.begin(), itEnd = factories.end();
@@ -163,7 +163,7 @@
std::cout << std::endl;
}
- inline void list( const ConfigData& config ) {
+ inline void list( ConfigData const& config ) {
if( config.listSpec & List::Tests )
listTests( config );
if( config.listSpec & List::Tags )
diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp
index 667224d..55d592a 100644
--- a/include/internal/catch_matchers.hpp
+++ b/include/internal/catch_matchers.hpp
@@ -27,7 +27,7 @@
struct MatcherImpl : Matcher<ExpressionT> {
virtual Ptr<Matcher<ExpressionT> > clone() const {
- return Ptr<Matcher<ExpressionT> >( new DerivedT( static_cast<const DerivedT&>( *this ) ) );
+ return Ptr<Matcher<ExpressionT> >( new DerivedT( static_cast<DerivedT const&>( *this ) ) );
}
};
@@ -38,13 +38,13 @@
public:
AllOf() {}
- AllOf( const AllOf& other ) : m_matchers( other.m_matchers ) {}
+ AllOf( AllOf const& other ) : m_matchers( other.m_matchers ) {}
- AllOf& add( const Matcher<ExpressionT>& matcher ) {
+ AllOf& add( Matcher<ExpressionT> const& matcher ) {
m_matchers.push_back( matcher.clone() );
return *this;
}
- virtual bool match( const ExpressionT& expr ) const
+ virtual bool match( ExpressionT const& expr ) const
{
for( std::size_t i = 0; i < m_matchers.size(); ++i )
if( !m_matchers[i]->match( expr ) )
@@ -72,13 +72,13 @@
public:
AnyOf() {}
- AnyOf( const AnyOf& other ) : m_matchers( other.m_matchers ) {}
+ AnyOf( AnyOf const& other ) : m_matchers( other.m_matchers ) {}
- AnyOf& add( const Matcher<ExpressionT>& matcher ) {
+ AnyOf& add( Matcher<ExpressionT> const& matcher ) {
m_matchers.push_back( matcher.clone() );
return *this;
}
- virtual bool match( const ExpressionT& expr ) const
+ virtual bool match( ExpressionT const& expr ) const
{
for( std::size_t i = 0; i < m_matchers.size(); ++i )
if( m_matchers[i]->match( expr ) )
@@ -105,16 +105,16 @@
namespace StdString {
- inline std::string makeString( const std::string& str ) { return str; }
+ inline std::string makeString( std::string const& str ) { return str; }
inline std::string makeString( const char* str ) { return str ? std::string( str ) : std::string(); }
struct Equals : MatcherImpl<Equals, std::string> {
- Equals( const std::string& str ) : m_str( str ){}
- Equals( const Equals& other ) : m_str( other.m_str ){}
+ Equals( std::string const& str ) : m_str( str ){}
+ Equals( Equals const& other ) : m_str( other.m_str ){}
virtual ~Equals();
- virtual bool match( const std::string& expr ) const {
+ virtual bool match( std::string const& expr ) const {
return m_str == expr;
}
virtual std::string toString() const {
@@ -125,12 +125,12 @@
};
struct Contains : MatcherImpl<Contains, std::string> {
- Contains( const std::string& substr ) : m_substr( substr ){}
- Contains( const Contains& other ) : m_substr( other.m_substr ){}
+ Contains( std::string const& substr ) : m_substr( substr ){}
+ Contains( Contains const& other ) : m_substr( other.m_substr ){}
virtual ~Contains();
- virtual bool match( const std::string& expr ) const {
+ virtual bool match( std::string const& expr ) const {
return expr.find( m_substr ) != std::string::npos;
}
virtual std::string toString() const {
@@ -141,12 +141,12 @@
};
struct StartsWith : MatcherImpl<StartsWith, std::string> {
- StartsWith( const std::string& substr ) : m_substr( substr ){}
- StartsWith( const StartsWith& other ) : m_substr( other.m_substr ){}
+ StartsWith( std::string const& substr ) : m_substr( substr ){}
+ StartsWith( StartsWith const& other ) : m_substr( other.m_substr ){}
virtual ~StartsWith();
- virtual bool match( const std::string& expr ) const {
+ virtual bool match( std::string const& expr ) const {
return expr.find( m_substr ) == 0;
}
virtual std::string toString() const {
@@ -157,12 +157,12 @@
};
struct EndsWith : MatcherImpl<EndsWith, std::string> {
- EndsWith( const std::string& substr ) : m_substr( substr ){}
- EndsWith( const EndsWith& other ) : m_substr( other.m_substr ){}
+ EndsWith( std::string const& substr ) : m_substr( substr ){}
+ EndsWith( EndsWith const& other ) : m_substr( other.m_substr ){}
virtual ~EndsWith();
- virtual bool match( const std::string& expr ) const {
+ virtual bool match( std::string const& expr ) const {
return expr.find( m_substr ) == expr.size() - m_substr.size();
}
virtual std::string toString() const {
@@ -177,47 +177,47 @@
// The following functions create the actual matcher objects.
// This allows the types to be inferred
template<typename ExpressionT>
- inline Impl::Generic::AllOf<ExpressionT> AllOf( const Impl::Matcher<ExpressionT>& m1,
- const Impl::Matcher<ExpressionT>& m2 ) {
+ inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+ Impl::Matcher<ExpressionT> const& m2 ) {
return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 );
}
template<typename ExpressionT>
- inline Impl::Generic::AllOf<ExpressionT> AllOf( const Impl::Matcher<ExpressionT>& m1,
- const Impl::Matcher<ExpressionT>& m2,
- const Impl::Matcher<ExpressionT>& m3 ) {
+ inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+ Impl::Matcher<ExpressionT> const& m2,
+ Impl::Matcher<ExpressionT> const& m3 ) {
return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
}
template<typename ExpressionT>
- inline Impl::Generic::AnyOf<ExpressionT> AnyOf( const Impl::Matcher<ExpressionT>& m1,
- const Impl::Matcher<ExpressionT>& m2 ) {
+ inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+ Impl::Matcher<ExpressionT> const& m2 ) {
return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 );
}
template<typename ExpressionT>
- inline Impl::Generic::AnyOf<ExpressionT> AnyOf( const Impl::Matcher<ExpressionT>& m1,
- const Impl::Matcher<ExpressionT>& m2,
- const Impl::Matcher<ExpressionT>& m3 ) {
+ inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+ Impl::Matcher<ExpressionT> const& m2,
+ Impl::Matcher<ExpressionT> const& m3 ) {
return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
}
- inline Impl::StdString::Equals Equals( const std::string& str ) {
+ inline Impl::StdString::Equals Equals( std::string const& str ) {
return Impl::StdString::Equals( str );
}
inline Impl::StdString::Equals Equals( const char* str ) {
return Impl::StdString::Equals( Impl::StdString::makeString( str ) );
}
- inline Impl::StdString::Contains Contains( const std::string& substr ) {
+ inline Impl::StdString::Contains Contains( std::string const& substr ) {
return Impl::StdString::Contains( substr );
}
inline Impl::StdString::Contains Contains( const char* substr ) {
return Impl::StdString::Contains( Impl::StdString::makeString( substr ) );
}
- inline Impl::StdString::StartsWith StartsWith( const std::string& substr ) {
+ inline Impl::StdString::StartsWith StartsWith( std::string const& substr ) {
return Impl::StdString::StartsWith( substr );
}
inline Impl::StdString::StartsWith StartsWith( const char* substr ) {
return Impl::StdString::StartsWith( Impl::StdString::makeString( substr ) );
}
- inline Impl::StdString::EndsWith EndsWith( const std::string& substr ) {
+ inline Impl::StdString::EndsWith EndsWith( std::string const& substr ) {
return Impl::StdString::EndsWith( substr );
}
inline Impl::StdString::EndsWith EndsWith( const char* substr ) {
diff --git a/include/internal/catch_notimplemented_exception.h b/include/internal/catch_notimplemented_exception.h
index 5aa25e0..e543bda 100644
--- a/include/internal/catch_notimplemented_exception.h
+++ b/include/internal/catch_notimplemented_exception.h
@@ -16,7 +16,7 @@
class NotImplementedException : public std::exception
{
public:
- NotImplementedException( const SourceLineInfo& lineInfo );
+ NotImplementedException( SourceLineInfo const& lineInfo );
virtual ~NotImplementedException() throw() {}
diff --git a/include/internal/catch_notimplemented_exception.hpp b/include/internal/catch_notimplemented_exception.hpp
index 36368e8..7cbe817 100644
--- a/include/internal/catch_notimplemented_exception.hpp
+++ b/include/internal/catch_notimplemented_exception.hpp
@@ -13,7 +13,7 @@
namespace Catch {
- NotImplementedException::NotImplementedException( const SourceLineInfo& lineInfo )
+ NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo )
: m_lineInfo( lineInfo ) {
std::ostringstream oss;
oss << lineInfo << ": function ";
diff --git a/include/internal/catch_objc.hpp b/include/internal/catch_objc.hpp
index a25dd8c..640b4cc 100644
--- a/include/internal/catch_objc.hpp
+++ b/include/internal/catch_objc.hpp
@@ -56,13 +56,13 @@
namespace Detail{
- inline bool startsWith( const std::string& str, const std::string& sub ) {
+ inline bool startsWith( std::string const& str, std::string const& sub ) {
return str.length() > sub.length() && str.substr( 0, sub.length() ) == sub;
}
inline std::string getAnnotation( Class cls,
- const std::string& annotationName,
- const std::string& testCaseName ) {
+ std::string const& annotationName,
+ std::string const& testCaseName ) {
NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
SEL sel = NSSelectorFromString( selStr );
arcSafeRelease( selStr );
diff --git a/include/internal/catch_option.hpp b/include/internal/catch_option.hpp
index 0b01a4d..9d6dec1 100644
--- a/include/internal/catch_option.hpp
+++ b/include/internal/catch_option.hpp
@@ -41,7 +41,7 @@
nullableValue = NULL;
}
T& operator*() { return *nullableValue; }
- const T& operator*() const { return *nullableValue; }
+ T const& operator*() const { return *nullableValue; }
T* operator->() { return nullableValue; }
const T* operator->() const { return nullableValue; }
diff --git a/include/internal/catch_registry_hub.hpp b/include/internal/catch_registry_hub.hpp
index 05d602e..14038af 100644
--- a/include/internal/catch_registry_hub.hpp
+++ b/include/internal/catch_registry_hub.hpp
@@ -20,16 +20,16 @@
class RegistryHub : public IRegistryHub, public IMutableRegistryHub {
- RegistryHub( const RegistryHub& );
- void operator=( const RegistryHub& );
+ RegistryHub( RegistryHub const& );
+ void operator=( RegistryHub const& );
public: // IRegistryHub
RegistryHub() {
}
- virtual const IReporterRegistry& getReporterRegistry() const {
+ virtual IReporterRegistry const& getReporterRegistry() const {
return m_reporterRegistry;
}
- virtual const ITestCaseRegistry& getTestCaseRegistry() const {
+ virtual ITestCaseRegistry const& getTestCaseRegistry() const {
return m_testCaseRegistry;
}
virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() {
@@ -37,10 +37,10 @@
}
public: // IMutableRegistryHub
- virtual void registerReporter( const std::string& name, IReporterFactory* factory ) {
+ virtual void registerReporter( std::string const& name, IReporterFactory* factory ) {
m_reporterRegistry.registerReporter( name, factory );
}
- virtual void registerTest( const TestCase& testInfo ) {
+ virtual void registerTest( TestCase const& testInfo ) {
m_testCaseRegistry.registerTest( testInfo );
}
virtual void registerTranslator( const IExceptionTranslator* translator ) {
diff --git a/include/internal/catch_reporter_registrars.hpp b/include/internal/catch_reporter_registrars.hpp
index 93e1966..f2c482b 100644
--- a/include/internal/catch_reporter_registrars.hpp
+++ b/include/internal/catch_reporter_registrars.hpp
@@ -18,7 +18,7 @@
class ReporterFactory : public IReporterFactory {
- virtual IStreamingReporter* create( const ReporterConfig& config ) const {
+ virtual IStreamingReporter* create( ReporterConfig const& config ) const {
return new LegacyReporterAdapter( new T( config ), config );
}
@@ -29,7 +29,7 @@
public:
- LegacyReporterRegistrar( const std::string& name ) {
+ LegacyReporterRegistrar( std::string const& name ) {
getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
}
};
@@ -50,7 +50,7 @@
// In fact, ideally, please contact me anyway to let me know you've hit this - as I have
// no idea who is actually using custom reporters at all (possibly no-one!).
// The new interface is designed to minimise exposure to interface changes in the future.
- virtual IStreamingReporter* create( const ReporterConfig& config ) const {
+ virtual IStreamingReporter* create( ReporterConfig const& config ) const {
return new T( config );
}
@@ -61,7 +61,7 @@
public:
- ReporterRegistrar( const std::string& name ) {
+ ReporterRegistrar( std::string const& name ) {
getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
}
};
diff --git a/include/internal/catch_reporter_registry.hpp b/include/internal/catch_reporter_registry.hpp
index 7821980..8298758 100644
--- a/include/internal/catch_reporter_registry.hpp
+++ b/include/internal/catch_reporter_registry.hpp
@@ -22,18 +22,18 @@
deleteAllValues( m_factories );
}
- virtual IStreamingReporter* create( const std::string& name, const ReporterConfig& config ) const {
+ virtual IStreamingReporter* create( std::string const& name, ReporterConfig const& config ) const {
FactoryMap::const_iterator it = m_factories.find( name );
if( it == m_factories.end() )
return NULL;
return it->second->create( config );
}
- void registerReporter( const std::string& name, IReporterFactory* factory ) {
+ void registerReporter( std::string const& name, IReporterFactory* factory ) {
m_factories.insert( std::make_pair( name, factory ) );
}
- const FactoryMap& getFactories() const {
+ FactoryMap const& getFactories() const {
return m_factories;
}
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp
index 2dcf92a..18a3e03 100644
--- a/include/internal/catch_runner_impl.hpp
+++ b/include/internal/catch_runner_impl.hpp
@@ -51,12 +51,12 @@
class Runner : public IResultCapture, public IRunner {
- Runner( const Runner& );
- void operator =( const Runner& );
+ Runner( Runner const& );
+ void operator =( Runner const& );
public:
- explicit Runner( const Config& config, const Ptr<IStreamingReporter>& reporter )
+ explicit Runner( Config const& config, Ptr<IStreamingReporter> const& reporter )
: m_runInfo( config.data().name ),
m_context( getCurrentMutableContext() ),
m_runningTest( NULL ),
@@ -87,7 +87,7 @@
m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) );
}
- Totals runMatching( const std::string& testSpec, std::size_t groupIndex, std::size_t groupsCount ) {
+ Totals runMatching( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) {
std::vector<TestCase> matchingTests = getRegistryHub().getTestCaseRegistry().getMatchingTestCases( testSpec );
@@ -104,7 +104,7 @@
return totals;
}
- Totals runTest( const TestCase& testCase ) {
+ Totals runTest( TestCase const& testCase ) {
Totals prevTotals = m_totals;
std::string redirectedCout;
@@ -149,22 +149,22 @@
return deltaTotals;
}
- const Config& config() const {
+ Config const& config() const {
return m_config;
}
private: // IResultCapture
- virtual void acceptMessage( const MessageBuilder& messageBuilder ) {
+ virtual void acceptMessage( MessageBuilder const& messageBuilder ) {
m_messages.push_back( messageBuilder.build() );
}
- virtual ResultAction::Value acceptExpression( const ExpressionResultBuilder& assertionResult, const AssertionInfo& assertionInfo ) {
+ virtual ResultAction::Value acceptExpression( ExpressionResultBuilder const& assertionResult, AssertionInfo const& assertionInfo ) {
m_lastAssertionInfo = assertionInfo;
return actOnCurrentResult( assertionResult.buildResult( assertionInfo ) );
}
- virtual void assertionEnded( const AssertionResult& result ) {
+ virtual void assertionEnded( AssertionResult const& result ) {
if( result.getResultType() == ResultWas::Ok ) {
m_totals.assertions.passed++;
}
@@ -252,7 +252,7 @@
private:
- ResultAction::Value actOnCurrentResult( const AssertionResult& result ) {
+ ResultAction::Value actOnCurrentResult( AssertionResult const& result ) {
m_lastResult = result;
assertionEnded( m_lastResult );
@@ -315,7 +315,7 @@
RunningTest* m_runningTest;
AssertionResult m_lastResult;
- const Config& m_config;
+ Config const& m_config;
Totals m_totals;
Ptr<IStreamingReporter> m_reporter;
std::vector<MessageInfo> m_messages;
diff --git a/include/internal/catch_running_test.hpp b/include/internal/catch_running_test.hpp
index 8787f8e..c5ad8a6 100644
--- a/include/internal/catch_running_test.hpp
+++ b/include/internal/catch_running_test.hpp
@@ -24,7 +24,7 @@
};
public:
- explicit RunningTest( const TestCase& info )
+ explicit RunningTest( TestCase const& info )
: m_info( info ),
m_runStatus( RanAtLeastOneSection ),
m_rootSection( info.getTestCaseInfo().name ),
@@ -64,7 +64,7 @@
}
}
- bool addSection( const std::string& name ) {
+ bool addSection( std::string const& name ) {
if( m_runStatus == NothingRun )
m_runStatus = EncounteredASection;
@@ -78,7 +78,7 @@
return false;
}
- void endSection( const std::string&, bool stealth ) {
+ void endSection( std::string const&, bool stealth ) {
if( m_currentSection->ran() ) {
if( !stealth )
m_runStatus = RanAtLeastOneSection;
@@ -92,7 +92,7 @@
m_currentSection = m_currentSection->getParent();
}
- const TestCase& getTestCase() const {
+ TestCase const& getTestCase() const {
return m_info;
}
@@ -105,7 +105,7 @@
RunningTest( RunningTest const& );
void operator=( RunningTest const& );
- const TestCase& m_info;
+ TestCase const& m_info;
RunStatus m_runStatus;
RunningSection m_rootSection;
RunningSection* m_currentSection;
diff --git a/include/internal/catch_section.hpp b/include/internal/catch_section.hpp
index 67bced6..fd19536 100644
--- a/include/internal/catch_section.hpp
+++ b/include/internal/catch_section.hpp
@@ -18,9 +18,9 @@
class Section {
public:
- Section( const SourceLineInfo& lineInfo,
- const std::string& name,
- const std::string& description = "" )
+ Section( SourceLineInfo const& lineInfo,
+ std::string const& name,
+ std::string const& description = "" )
: m_info( name, description, lineInfo ),
m_sectionIncluded( getCurrentContext().getResultCapture().sectionStarted( m_info, m_assertions ) )
{}
diff --git a/include/internal/catch_section_info.hpp b/include/internal/catch_section_info.hpp
index 7a326df..1ea24ee 100644
--- a/include/internal/catch_section_info.hpp
+++ b/include/internal/catch_section_info.hpp
@@ -28,13 +28,13 @@
TestedLeaf
};
- RunningSection( RunningSection* parent, const std::string& name )
+ RunningSection( RunningSection* parent, std::string const& name )
: m_state( Unknown ),
m_parent( parent ),
m_name( name )
{}
- RunningSection( const std::string& name )
+ RunningSection( std::string const& name )
: m_state( Root ),
m_parent( NULL ),
m_name( name )
@@ -77,7 +77,7 @@
return m_parent;
}
- RunningSection* findOrAddSubSection( const std::string& name, bool& changed ) {
+ RunningSection* findOrAddSubSection( std::string const& name, bool& changed ) {
for( SubSections::const_iterator it = m_subSections.begin();
it != m_subSections.end();
++it)
diff --git a/include/internal/catch_stream.hpp b/include/internal/catch_stream.hpp
index b313575..5abde5a 100644
--- a/include/internal/catch_stream.hpp
+++ b/include/internal/catch_stream.hpp
@@ -57,7 +57,7 @@
struct OutputDebugWriter {
- void operator()( const std::string &str ) {
+ void operator()( std::string const&str ) {
writeToDebugConsole( str );
}
};
diff --git a/include/internal/catch_tags.hpp b/include/internal/catch_tags.hpp
index 74d6ee4..7b21098 100644
--- a/include/internal/catch_tags.hpp
+++ b/include/internal/catch_tags.hpp
@@ -24,7 +24,7 @@
public:
virtual ~TagParser();
- void parse( const std::string& str ) {
+ void parse( std::string const& str ) {
std::size_t pos = 0;
while( pos < str.size() ) {
char c = str[pos];
@@ -48,7 +48,7 @@
}
protected:
- virtual void acceptTag( const std::string& tag ) = 0;
+ virtual void acceptTag( std::string const& tag ) = 0;
virtual void acceptChar( char c ) = 0;
virtual void endParse() {}
@@ -69,14 +69,14 @@
}
private:
- virtual void acceptTag( const std::string& tag ) {
+ virtual void acceptTag( std::string const& tag ) {
m_tags.insert( toLower( tag ) );
}
virtual void acceptChar( char c ) {
m_remainder += c;
}
- TagExtracter& operator=(const TagExtracter&);
+ TagExtracter& operator=(TagExtracter const&);
std::set<std::string>& m_tags;
std::string m_remainder;
@@ -88,7 +88,7 @@
: m_isNegated( false )
{}
- Tag( const std::string& name, bool isNegated )
+ Tag( std::string const& name, bool isNegated )
: m_name( name ),
m_isNegated( isNegated )
{}
@@ -112,7 +112,7 @@
class TagSet {
typedef std::map<std::string, Tag> TagMap;
public:
- void add( const Tag& tag ) {
+ void add( Tag const& tag ) {
m_tags.insert( std::make_pair( toLower( tag.getName() ), tag ) );
}
@@ -120,7 +120,7 @@
return m_tags.empty();
}
- bool matches( const std::set<std::string>& tags ) const {
+ bool matches( std::set<std::string> const& tags ) const {
TagMap::const_iterator it = m_tags.begin();
TagMap::const_iterator itEnd = m_tags.end();
for(; it != itEnd; ++it ) {
@@ -137,7 +137,7 @@
class TagExpression {
public:
- bool matches( const std::set<std::string>& tags ) const {
+ bool matches( std::set<std::string> const& tags ) const {
std::vector<TagSet>::const_iterator it = m_tagSets.begin();
std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
for(; it != itEnd; ++it )
@@ -162,7 +162,7 @@
~TagExpressionParser();
private:
- virtual void acceptTag( const std::string& tag ) {
+ virtual void acceptTag( std::string const& tag ) {
m_currentTagSet.add( Tag( tag, m_isNegated ) );
m_isNegated = false;
}
@@ -181,7 +181,7 @@
m_exp.m_tagSets.push_back( m_currentTagSet );
}
- TagExpressionParser& operator=(const TagExpressionParser&);
+ TagExpressionParser& operator=(TagExpressionParser const&);
bool m_isNegated;
TagSet m_currentTagSet;
diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h
index ba804b1..72d73f0 100644
--- a/include/internal/catch_test_case_info.h
+++ b/include/internal/catch_test_case_info.h
@@ -24,14 +24,14 @@
struct ITestCase;
struct TestCaseInfo {
- TestCaseInfo( const std::string& _name,
- const std::string& _className,
- const std::string& _description,
- const std::set<std::string>& _tags,
+ TestCaseInfo( std::string const& _name,
+ std::string const& _className,
+ std::string const& _description,
+ std::set<std::string> const& _tags,
bool _isHidden,
- const SourceLineInfo& _lineInfo );
+ SourceLineInfo const& _lineInfo );
- TestCaseInfo( const TestCaseInfo& other );
+ TestCaseInfo( TestCaseInfo const& other );
std::string name;
std::string className;
@@ -45,34 +45,34 @@
class TestCase : protected TestCaseInfo {
public:
- TestCase( ITestCase* testCase, const TestCaseInfo& info );
- TestCase( const TestCase& other );
+ TestCase( ITestCase* testCase, TestCaseInfo const& info );
+ TestCase( TestCase const& other );
- TestCase withName( const std::string& _newName ) const;
+ TestCase withName( std::string const& _newName ) const;
void invoke() const;
- const TestCaseInfo& getTestCaseInfo() const;
+ TestCaseInfo const& getTestCaseInfo() const;
bool isHidden() const;
- bool hasTag( const std::string& tag ) const;
- bool matchesTags( const std::string& tagPattern ) const;
- const std::set<std::string>& getTags() const;
+ bool hasTag( std::string const& tag ) const;
+ bool matchesTags( std::string const& tagPattern ) const;
+ std::set<std::string> const& getTags() const;
void swap( TestCase& other );
- bool operator == ( const TestCase& other ) const;
- bool operator < ( const TestCase& other ) const;
- TestCase& operator = ( const TestCase& other );
+ bool operator == ( TestCase const& other ) const;
+ bool operator < ( TestCase const& other ) const;
+ TestCase& operator = ( TestCase const& other );
private:
Ptr<ITestCase> test;
};
TestCase makeTestCase( ITestCase* testCase,
- const std::string& className,
- const std::string& name,
- const std::string& description,
- const SourceLineInfo& lineInfo );
+ std::string const& className,
+ std::string const& name,
+ std::string const& description,
+ SourceLineInfo const& lineInfo );
}
#ifdef __clang__
diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp
index a5412b6..d3a2719 100644
--- a/include/internal/catch_test_case_info.hpp
+++ b/include/internal/catch_test_case_info.hpp
@@ -16,10 +16,10 @@
namespace Catch {
TestCase makeTestCase( ITestCase* _testCase,
- const std::string& _className,
- const std::string& _name,
- const std::string& _descOrTags,
- const SourceLineInfo& _lineInfo )
+ std::string const& _className,
+ std::string const& _name,
+ std::string const& _descOrTags,
+ SourceLineInfo const& _lineInfo )
{
std::string desc = _descOrTags;
bool isHidden( startsWith( _name, "./" ) );
@@ -32,12 +32,12 @@
return TestCase( _testCase, info );
}
- TestCaseInfo::TestCaseInfo( const std::string& _name,
- const std::string& _className,
- const std::string& _description,
- const std::set<std::string>& _tags,
+ TestCaseInfo::TestCaseInfo( std::string const& _name,
+ std::string const& _className,
+ std::string const& _description,
+ std::set<std::string> const& _tags,
bool _isHidden,
- const SourceLineInfo& _lineInfo )
+ SourceLineInfo const& _lineInfo )
: name( _name ),
className( _className ),
description( _description ),
@@ -51,7 +51,7 @@
tagsAsString = oss.str();
}
- TestCaseInfo::TestCaseInfo( const TestCaseInfo& other )
+ TestCaseInfo::TestCaseInfo( TestCaseInfo const& other )
: name( other.name ),
className( other.className ),
description( other.description ),
@@ -61,14 +61,14 @@
isHidden( other.isHidden )
{}
- TestCase::TestCase( ITestCase* testCase, const TestCaseInfo& info ) : TestCaseInfo( info ), test( testCase ) {}
+ TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
- TestCase::TestCase( const TestCase& other )
+ TestCase::TestCase( TestCase const& other )
: TestCaseInfo( other ),
test( other.test )
{}
- TestCase TestCase::withName( const std::string& _newName ) const {
+ TestCase TestCase::withName( std::string const& _newName ) const {
TestCase other( *this );
other.name = _newName;
return other;
@@ -82,15 +82,15 @@
return TestCaseInfo::isHidden;
}
- bool TestCase::hasTag( const std::string& tag ) const {
+ bool TestCase::hasTag( std::string const& tag ) const {
return tags.find( toLower( tag ) ) != tags.end();
}
- bool TestCase::matchesTags( const std::string& tagPattern ) const {
+ bool TestCase::matchesTags( std::string const& tagPattern ) const {
TagExpression exp;
TagExpressionParser( exp ).parse( tagPattern );
return exp.matches( tags );
}
- const std::set<std::string>& TestCase::getTags() const {
+ std::set<std::string> const& TestCase::getTags() const {
return tags;
}
@@ -102,22 +102,22 @@
std::swap( lineInfo, other.lineInfo );
}
- bool TestCase::operator == ( const TestCase& other ) const {
+ bool TestCase::operator == ( TestCase const& other ) const {
return test.get() == other.test.get() &&
name == other.name &&
className == other.className;
}
- bool TestCase::operator < ( const TestCase& other ) const {
+ bool TestCase::operator < ( TestCase const& other ) const {
return name < other.name;
}
- TestCase& TestCase::operator = ( const TestCase& other ) {
+ TestCase& TestCase::operator = ( TestCase const& other ) {
TestCase temp( other );
swap( temp );
return *this;
}
- const TestCaseInfo& TestCase::getTestCaseInfo() const
+ TestCaseInfo const& TestCase::getTestCaseInfo() const
{
return *this;
}
diff --git a/include/internal/catch_test_case_registry_impl.hpp b/include/internal/catch_test_case_registry_impl.hpp
index ffccb28..0f09369 100644
--- a/include/internal/catch_test_case_registry_impl.hpp
+++ b/include/internal/catch_test_case_registry_impl.hpp
@@ -25,7 +25,7 @@
TestRegistry() : m_unnamedCount( 0 ) {}
virtual ~TestRegistry();
- virtual void registerTest( const TestCase& testCase ) {
+ virtual void registerTest( TestCase const& testCase ) {
std::string name = testCase.getTestCaseInfo().name;
if( name == "" ) {
std::ostringstream oss;
@@ -40,7 +40,7 @@
m_nonHiddenFunctions.push_back( testCase );
}
else {
- const TestCase& prev = *m_functions.find( testCase );
+ TestCase const& prev = *m_functions.find( testCase );
std::cerr << "error: TEST_CASE( \"" << name << "\" ) already defined.\n"
<< "\tFirst seen at " << SourceLineInfo( prev.getTestCaseInfo().lineInfo ) << "\n"
<< "\tRedefined at " << SourceLineInfo( testCase.getTestCaseInfo().lineInfo ) << std::endl;
@@ -48,23 +48,23 @@
}
}
- virtual const std::vector<TestCase>& getAllTests() const {
+ virtual std::vector<TestCase> const& getAllTests() const {
return m_functionsInOrder;
}
- virtual const std::vector<TestCase>& getAllNonHiddenTests() const {
+ virtual std::vector<TestCase> const& getAllNonHiddenTests() const {
return m_nonHiddenFunctions;
}
// !TBD deprecated
- virtual std::vector<TestCase> getMatchingTestCases( const std::string& rawTestSpec ) const {
+ virtual std::vector<TestCase> getMatchingTestCases( std::string const& rawTestSpec ) const {
std::vector<TestCase> matchingTests;
getMatchingTestCases( rawTestSpec, matchingTests );
return matchingTests;
}
// !TBD deprecated
- virtual void getMatchingTestCases( const std::string& rawTestSpec, std::vector<TestCase>& matchingTestsOut ) const {
+ virtual void getMatchingTestCases( std::string const& rawTestSpec, std::vector<TestCase>& matchingTestsOut ) const {
TestCaseFilter filter( rawTestSpec );
std::vector<TestCase>::const_iterator it = m_functionsInOrder.begin();
@@ -75,7 +75,7 @@
}
}
}
- virtual void getMatchingTestCases( const TestCaseFilters& filters, std::vector<TestCase>& matchingTestsOut ) const {
+ virtual void getMatchingTestCases( TestCaseFilters const& filters, std::vector<TestCase>& matchingTestsOut ) const {
std::vector<TestCase>::const_iterator it = m_functionsInOrder.begin();
std::vector<TestCase>::const_iterator itEnd = m_functionsInOrder.end();
// !TBD: replace with algorithm
@@ -109,7 +109,7 @@
TestFunction m_fun;
};
- inline std::string extractClassName( const std::string& classOrQualifiedMethodName ) {
+ inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) {
std::string className = classOrQualifiedMethodName;
if( className[0] == '&' )
{
diff --git a/include/internal/catch_test_registry.hpp b/include/internal/catch_test_registry.hpp
index ff0e3e8..65fe760 100644
--- a/include/internal/catch_test_registry.hpp
+++ b/include/internal/catch_test_registry.hpp
@@ -67,8 +67,8 @@
~AutoReg();
private:
- AutoReg( const AutoReg& );
- void operator= ( const AutoReg& );
+ AutoReg( AutoReg const& );
+ void operator= ( AutoReg const& );
};
} // end namespace Catch
diff --git a/include/internal/catch_test_spec.h b/include/internal/catch_test_spec.h
index 6683970..36dc55c 100644
--- a/include/internal/catch_test_spec.h
+++ b/include/internal/catch_test_spec.h
@@ -32,7 +32,7 @@
};
public:
- TestCaseFilter( const std::string& testSpec, IfFilterMatches::DoWhat matchBehaviour = IfFilterMatches::AutoDetectBehaviour )
+ TestCaseFilter( std::string const& testSpec, IfFilterMatches::DoWhat matchBehaviour = IfFilterMatches::AutoDetectBehaviour )
: m_stringToMatch( toLower( testSpec ) ),
m_filterType( matchBehaviour ),
m_wildcardPosition( NoWildcard )
@@ -65,7 +65,7 @@
return m_filterType;
}
- bool shouldInclude( const TestCase& testCase ) const {
+ bool shouldInclude( TestCase const& testCase ) const {
return isMatch( testCase ) == (m_filterType == IfFilterMatches::IncludeTests);
}
private:
@@ -75,7 +75,7 @@
#pragma clang diagnostic ignored "-Wunreachable-code"
#endif
- bool isMatch( const TestCase& testCase ) const {
+ bool isMatch( TestCase const& testCase ) const {
std::string name = testCase.getTestCaseInfo().name;
toLowerInPlace( name );
@@ -103,27 +103,27 @@
class TestCaseFilters {
public:
- TestCaseFilters( const std::string& name ) : m_name( name ) {}
+ TestCaseFilters( std::string const& name ) : m_name( name ) {}
std::string getName() const {
return m_name;
}
- void addFilter( const TestCaseFilter& filter ) {
+ void addFilter( TestCaseFilter const& filter ) {
if( filter.getFilterType() == IfFilterMatches::ExcludeTests )
m_exclusionFilters.push_back( filter );
else
m_inclusionFilters.push_back( filter );
}
- void addTags( const std::string& tagPattern ) {
+ void addTags( std::string const& tagPattern ) {
TagExpression exp;
TagExpressionParser( exp ).parse( tagPattern );
m_tagExpressions.push_back( exp );
}
- bool shouldInclude( const TestCase& testCase ) const {
+ bool shouldInclude( TestCase const& testCase ) const {
if( !m_tagExpressions.empty() ) {
std::vector<TagExpression>::const_iterator it = m_tagExpressions.begin();
std::vector<TagExpression>::const_iterator itEnd = m_tagExpressions.end();
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index 5d3bf39..fef7ad3 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -56,7 +56,7 @@
template<typename T>
struct IsStreamInsertable {
static std::ostream &s;
- static T const &t;
+ static T const&t;
enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
};
@@ -112,7 +112,7 @@
namespace Detail {
template<typename T>
- inline std::string makeString( const T& value ) {
+ inline std::string makeString( T const& value ) {
return StringMaker<T>::convert( value );
}
} // end namespace Detail
@@ -125,17 +125,17 @@
/// Overload (not specialise) this template for custom typs that you don't want
/// to provide an ostream overload for.
template<typename T>
-std::string toString( const T& value ) {
+std::string toString( T const& value ) {
return StringMaker<T>::convert( value );
}
// Built in overloads
-inline std::string toString( const std::string& value ) {
+inline std::string toString( std::string const& value ) {
return "\"" + value + "\"";
}
-inline std::string toString( const std::wstring& value ) {
+inline std::string toString( std::wstring const& value ) {
std::ostringstream oss;
oss << "\"";
for(size_t i = 0; i < value.size(); ++i )
diff --git a/include/internal/catch_totals.hpp b/include/internal/catch_totals.hpp
index 03832a2..2d10f7f 100644
--- a/include/internal/catch_totals.hpp
+++ b/include/internal/catch_totals.hpp
@@ -15,13 +15,13 @@
struct Counts {
Counts() : passed( 0 ), failed( 0 ) {}
- Counts operator - ( const Counts& other ) const {
+ Counts operator - ( Counts const& other ) const {
Counts diff;
diff.passed = passed - other.passed;
diff.failed = failed - other.failed;
return diff;
}
- Counts& operator += ( const Counts& other ) {
+ Counts& operator += ( Counts const& other ) {
passed += other.passed;
failed += other.failed;
return *this;
@@ -37,14 +37,14 @@
struct Totals {
- Totals operator - ( const Totals& other ) const {
+ Totals operator - ( Totals const& other ) const {
Totals diff;
diff.assertions = assertions - other.assertions;
diff.testCases = testCases - other.testCases;
return diff;
}
- Totals delta( const Totals& prevTotals ) const {
+ Totals delta( Totals const& prevTotals ) const {
Totals diff = *this - prevTotals;
if( diff.assertions.failed > 0 )
++diff.testCases.failed;
@@ -53,7 +53,7 @@
return diff;
}
- Totals& operator += ( const Totals& other ) {
+ Totals& operator += ( Totals const& other ) {
assertions += other.assertions;
testCases += other.testCases;
return *this;
diff --git a/include/internal/catch_xmlwriter.hpp b/include/internal/catch_xmlwriter.hpp
index 98e827f..5e43b88 100644
--- a/include/internal/catch_xmlwriter.hpp
+++ b/include/internal/catch_xmlwriter.hpp
@@ -24,7 +24,7 @@
: m_writer( writer )
{}
- ScopedElement( const ScopedElement& other )
+ ScopedElement( ScopedElement const& other )
: m_writer( other.m_writer ){
other.m_writer = NULL;
}
@@ -34,13 +34,13 @@
m_writer->endElement();
}
- ScopedElement& writeText( const std::string& text, bool indent = true ) {
+ ScopedElement& writeText( std::string const& text, bool indent = true ) {
m_writer->writeText( text, indent );
return *this;
}
template<typename T>
- ScopedElement& writeAttribute( const std::string& name, const T& attribute ) {
+ ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
m_writer->writeAttribute( name, attribute );
return *this;
}
@@ -66,7 +66,7 @@
endElement();
}
- XmlWriter& operator = ( const XmlWriter& other ) {
+ XmlWriter& operator = ( XmlWriter const& other ) {
XmlWriter temp( other );
swap( temp );
return *this;
@@ -80,7 +80,7 @@
std::swap( m_os, other.m_os );
}
- XmlWriter& startElement( const std::string& name ) {
+ XmlWriter& startElement( std::string const& name ) {
ensureTagClosed();
newlineIfNecessary();
stream() << m_indent << "<" << name;
@@ -90,7 +90,7 @@
return *this;
}
- ScopedElement scopedElement( const std::string& name ) {
+ ScopedElement scopedElement( std::string const& name ) {
ScopedElement scoped( this );
startElement( name );
return scoped;
@@ -110,7 +110,7 @@
return *this;
}
- XmlWriter& writeAttribute( const std::string& name, const std::string& attribute ) {
+ XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) {
if( !name.empty() && !attribute.empty() ) {
stream() << " " << name << "=\"";
writeEncodedText( attribute );
@@ -119,19 +119,19 @@
return *this;
}
- XmlWriter& writeAttribute( const std::string& name, bool attribute ) {
+ XmlWriter& writeAttribute( std::string const& name, bool attribute ) {
stream() << " " << name << "=\"" << ( attribute ? "true" : "false" ) << "\"";
return *this;
}
template<typename T>
- XmlWriter& writeAttribute( const std::string& name, const T& attribute ) {
+ XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
if( !name.empty() )
stream() << " " << name << "=\"" << attribute << "\"";
return *this;
}
- XmlWriter& writeText( const std::string& text, bool indent = true ) {
+ XmlWriter& writeText( std::string const& text, bool indent = true ) {
if( !text.empty() ){
bool tagWasOpen = m_tagIsOpen;
ensureTagClosed();
@@ -143,7 +143,7 @@
return *this;
}
- XmlWriter& writeComment( const std::string& text ) {
+ XmlWriter& writeComment( std::string const& text ) {
ensureTagClosed();
stream() << m_indent << "<!--" << text << "-->";
m_needsNewline = true;
@@ -176,7 +176,7 @@
}
}
- void writeEncodedText( const std::string& text ) {
+ void writeEncodedText( std::string const& text ) {
static const char* charsToEncode = "<&\"";
std::string mtext = text;
std::string::size_type pos = mtext.find_first_of( charsToEncode );