3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up various minor things

Browse Source
This commit is contained in:
Martin Hořeňovský
2017-08-29 14:02:14 +02:00
parent 5932576f53
commit bcb430b837
7 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_assertionresult.cpp
View File

@@ -9,6 +9,9 @@
#include "catch_assertionresult.h"
namespace Catch {
AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
resultType(_resultType),
lazyExpression(_lazyExpression) {}
std::string AssertionResultData::reconstructExpression() const {

5
include/internal/catch_assertionresult.h
View File

@@ -21,10 +21,7 @@ namespace Catch {
{
AssertionResultData() = delete;
AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression )
: resultType( _resultType ),
lazyExpression( _lazyExpression )
{}
AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
ResultWas::OfType resultType = ResultWas::Unknown;
std::string message;

9
include/internal/catch_fatal_condition.cpp
View File

@@ -47,9 +47,9 @@ namespace Catch {
};
LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) {
reportFatal(signalDefs[i].name);
for (auto const& def : signalDefs) {
if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
reportFatal(def.name);
}
}
// If its not an exception we care about, pass it along.
@@ -123,8 +123,7 @@ namespace Catch {
void FatalConditionHandler::handleSignal( int sig ) {
std::string name = "<unknown signal>";
for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
SignalDefs &def = signalDefs[i];
for (auto const& def : signalDefs) {
if (sig == def.id) {
name = def.name;
break;

4
include/internal/catch_reporter_registry.hpp
View File

@@ -21,14 +21,14 @@ namespace Catch {
~ReporterRegistry() override {}
IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override {
FactoryMap::const_iterator it = m_factories.find( name );
auto it = m_factories.find( name );
if( it == m_factories.end() )
return nullptr;
return it->second->create( ReporterConfig( config ) );
}
void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
m_factories.insert( { name, factory } );
m_factories.emplace(name, factory);
}
void registerListener( IReporterFactoryPtr const& factory ) {
m_listeners.push_back( factory );

3
include/internal/catch_test_case_info.cpp
View File

@@ -57,8 +57,7 @@ namespace Catch {
std::vector<std::string> tags;
std::string desc, tag;
bool inTag = false;
for( std::size_t i = 0; i < _descOrTags.size(); ++i ) {
char c = _descOrTags[i];
for (char c : _descOrTags) {
if( !inTag ) {
if( c == '[' )
inTag = true;

2
include/internal/catch_wildcard_pattern.hpp
View File

@@ -10,8 +10,6 @@
#include "catch_common.h"
#include <stdexcept>
namespace Catch
{

2
include/reporters/catch_reporter_bases.hpp
View File

@@ -174,7 +174,7 @@ namespace Catch {
}
else {
SectionNode& parentNode = *m_sectionStack.back();
typename SectionNode::ChildSections::const_iterator it =
auto it =
std::find_if( parentNode.childSections.begin(),
parentNode.childSections.end(),
BySectionInfo( sectionInfo ) );