3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-16 02:05:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converted (almost) all for-loops with iterators or indices to range-based

Browse Source
This commit is contained in:
Phil Nash
2017-04-25 11:06:52 +01:00
parent 073377a4e4
commit 1f3ba8a0b6
19 changed files with 136 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/reporters/catch_reporter_console.hpp
View File

@@ -218,12 +218,10 @@ namespace Catch {
void printMessage() const {
if( !messageLabel.empty() )
stream << messageLabel << ':' << '\n';
for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
it != itEnd;
++it ) {
for( auto const& message : messages ) {
// If this assertion is a warning ignore any INFO messages
if( printInfoMessages || it->type != ResultWas::Info )
stream << Text( it->message, TextAttributes().setIndent(2) ) << '\n';
if( printInfoMessages || message.type != ResultWas::Info )
stream << Text( message.message, TextAttributes().setIndent(2) ) << '\n';
}
}
void printSourceInfo() const {
@@ -331,10 +329,10 @@ namespace Catch {
std::ostringstream oss;
oss << count;
std::string row = oss.str();
for( std::vector<std::string>::iterator it = rows.begin(); it != rows.end(); ++it ) {
while( it->size() < row.size() )
*it = ' ' + *it;
while( it->size() > row.size() )
for( auto& oldRow : rows ) {
while( oldRow.size() < row.size() )
oldRow = ' ' + oldRow;
while( oldRow.size() > row.size() )
row = ' ' + row;
}
rows.push_back( row );
@@ -379,9 +377,9 @@ namespace Catch {
}
}
void printSummaryRow( std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row ) {
for( std::vector<SummaryColumn>::const_iterator it = cols.begin(); it != cols.end(); ++it ) {
std::string value = it->rows[row];
if( it->label.empty() ) {
for( auto col : cols ) {
std::string value = col.rows[row];
if( col.label.empty() ) {
stream << label << ": ";
if( value != "0" )
stream << value;
@@ -390,8 +388,8 @@ namespace Catch {
}
else if( value != "0" ) {
stream << Colour( Colour::LightGrey ) << " | ";
stream << Colour( it->colour )
<< value << ' ' << it->label;
stream << Colour( col.colour )
<< value << ' ' << col.label;
}
}
stream << '\n';