diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 7558e257..4c32d7f3 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -322,7 +322,8 @@ namespace Catch { m_optionNames.push_back( "--list" ); } virtual std::string argsSynopsis() const { - return "[all | tests | reporters [xml]]"; +// return "[all | tests | reporters | tags [xml]]"; + return "[all | tests | reporters | tags]"; } virtual std::string optionSummary() const { return "Lists available tests or reporters"; @@ -331,29 +332,32 @@ namespace Catch { virtual std::string optionDescription() const { return "With no arguments this option will list all registered tests - one per line.\n" - "Supplying the xml argument formats the list as an xml document (which may be useful for " - "consumption by other tools).\n" +// "Supplying the xml argument formats the list as an xml document (which may be useful for " +// "consumption by other tools).\n" "Supplying the tests or reporters lists tests or reporters respectively - with descriptions.\n" "\n" "Examples:\n" "\n" " -l\n" " -l tests\n" + " -l tags\n" " -l reporters xml\n" - " -l xml"; + ;//" -l xml"; } virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) { - config.listSpec = List::TestNames; + config.listSpec = List::Tests; if( cmd.argsCount() >= 1 ) { if( cmd[0] == "all" ) config.listSpec = List::All; else if( cmd[0] == "tests" ) config.listSpec = List::Tests; + else if( cmd[0] == "tags" ) + config.listSpec = List::Tags; else if( cmd[0] == "reporters" ) config.listSpec = List::Reports; else - cmd.raiseError( "Expected [tests] or [reporters]" ); + cmd.raiseError( "Expected tests, reporters or tags" ); } if( cmd.argsCount() >= 2 ) { if( cmd[1] == "xml" ) @@ -361,7 +365,7 @@ namespace Catch { else if( cmd[1] == "text" ) config.listSpec = static_cast( config.listSpec | List::AsText ); else - cmd.raiseError( "Expected [xml] or [text]" ); + cmd.raiseError( "Expected xml or text" ); } } }; diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index 1ef3fff6..0e5de388 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -34,9 +34,8 @@ namespace Catch { Reports = 1, Tests = 2, - All = 3, - - TestNames = 6, + Tags = 4, + All = Reports | Tests | Tags, WhatMask = 0xf, diff --git a/include/internal/catch_line_wrap.h b/include/internal/catch_line_wrap.h index 0ec49cdb..7cd08055 100644 --- a/include/internal/catch_line_wrap.h +++ b/include/internal/catch_line_wrap.h @@ -28,6 +28,7 @@ namespace Catch { const_iterator begin() const { return lines.begin(); } const_iterator end() const { return lines.end(); } + std::string const& last() const { return lines.back(); } std::size_t size() const { return lines.size(); } std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } diff --git a/include/internal/catch_line_wrap.hpp b/include/internal/catch_line_wrap.hpp index a51e98a8..9c6f3019 100644 --- a/include/internal/catch_line_wrap.hpp +++ b/include/internal/catch_line_wrap.hpp @@ -66,7 +66,7 @@ namespace Catch { std::string withoutTab = _str.substr( 0, nextTab ) + _str.substr( nextTab+1 ); return wrapInternal( withoutTab ); } - else if( isWrapPoint( _str[pos] ) ) { + else if( pos > 0 && isWrapPoint( _str[pos] ) ) { wrapPoint = pos; } } diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp index f7f0c657..458c3a21 100644 --- a/include/internal/catch_list.hpp +++ b/include/internal/catch_list.hpp @@ -36,8 +36,10 @@ namespace Catch { std::size_t maxTagLen = 0; std::size_t maxNameLen = 0; for(; it != itEnd; ++it ) { - maxTagLen = (std::max)( it->getTestCaseInfo().tagsAsString.size(), maxTagLen ); - maxNameLen = (std::max)( it->getTestCaseInfo().name.size(), maxNameLen ); + if( matchesFilters( config.filters, *it ) ) { + maxTagLen = (std::max)( it->getTestCaseInfo().tagsAsString.size(), maxTagLen ); + maxNameLen = (std::max)( it->getTestCaseInfo().name.size(), maxNameLen ); + } } // Try to fit everything in. If not shrink tag column first, down to 30 @@ -66,9 +68,13 @@ namespace Catch { nameCol = nameWrapper[i]; else nameCol = " ..."; - std::cout << nameCol << " " << std::string( maxNameLen - nameCol.size(), ' ' ); - if( i < tagsWrapper.size() ) - std::cout << tagsWrapper[i]; + std::cout << nameCol; + if( i < tagsWrapper.size() && !tagsWrapper[i].empty() ) { + if( i == 0 ) + std::cout << " " << std::string( maxNameLen - nameCol.size(), '.' ) << " " << tagsWrapper[i]; + else + std::cout << std::string( maxNameLen - nameCol.size(), ' ' ) << " " << tagsWrapper[i]; + } std::cout << "\n"; } } @@ -78,6 +84,54 @@ namespace Catch { else std::cout << pluralise( matchedTests, "matching test case" ) << std::endl; } + + inline void listTags( const ConfigData& config ) { + if( config.filters.empty() ) + std::cout << "All available tags:\n"; + else + std::cout << "Matching tags:\n"; + std::vector const& allTests = getRegistryHub().getTestCaseRegistry().getAllTests(); + std::vector::const_iterator it = allTests.begin(), itEnd = allTests.end(); + + std::map tagCounts; + + std::size_t maxTagLen = 0; + + for(; it != itEnd; ++it ) { + if( matchesFilters( config.filters, *it ) ) { + for( std::set::const_iterator tagIt = it->getTestCaseInfo().tags.begin(), + tagItEnd = it->getTestCaseInfo().tags.end(); + tagIt != tagItEnd; + ++tagIt ) { + std::string tagName = "[" + *tagIt + "]"; + maxTagLen = (std::max)( maxTagLen, tagName.size() ); + std::map::iterator countIt = tagCounts.find( tagName ); + if( countIt == tagCounts.end() ) + tagCounts.insert( std::make_pair( tagName, 1 ) ); + else + countIt->second++; + } + } + } + maxTagLen +=2; + if( maxTagLen > CATCH_CONFIG_CONSOLE_WIDTH-10 ) + maxTagLen = CATCH_CONFIG_CONSOLE_WIDTH-10; + + for( std::map::const_iterator countIt = tagCounts.begin(), countItEnd = tagCounts.end(); + countIt != countItEnd; + ++countIt ) { + LineWrapper wrapper; + wrapper.setIndent(2).setRight( maxTagLen ).wrap( countIt->first ); + + std::cout << wrapper; + if( maxTagLen > wrapper.last().size() ) + std::cout << std::string( maxTagLen - wrapper.last().size(), '.' ); + std::cout << ".. " + << countIt->second + << "\n"; + } + std::cout << pluralise( tagCounts.size(), "tag" ) << std::endl; + } inline void listReporters( const ConfigData& /*config*/ ) { std::cout << "Available reports:\n"; @@ -93,9 +147,11 @@ namespace Catch { inline void list( const ConfigData& config ) { if( config.listSpec & List::Tests ) listTests( config ); - else if( config.listSpec & List::Reports ) + if( config.listSpec & List::Tags ) + listTags( config ); + if( config.listSpec & List::Reports ) listReporters( config ); - else + if( ( config.listSpec & List::All ) == 0 ) throw std::logic_error( "Unknown list type" ); } diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 43fd126a..cc251b7e 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -3673,8 +3673,8 @@ TestMain.cpp:226: PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) with expansion: - "Error while parsing arguments. threshold must be a number greater than - zero. Arguments were: 0" contains: "greater than zero" + "Error while parsing arguments. threshold must be a number greater than zero + . Arguments were: 0" contains: "greater than zero" ------------------------------------------------------------------------------- selftest/parser/2 @@ -3686,8 +3686,8 @@ TestMain.cpp:230: PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) with expansion: - "Error while parsing arguments. threshold must be a number greater than - zero. Arguments were: oops" contains: "greater than zero" + "Error while parsing arguments. threshold must be a number greater than zero + . Arguments were: oops" contains: "greater than zero" ------------------------------------------------------------------------------- selftest/parser/2 @@ -4173,7 +4173,7 @@ Long strings can be wrapped TestMain.cpp:435: PASSED: - CHECK( Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString ) + CHECK( Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString ) with expansion: "one two three four" == @@ -4181,7 +4181,7 @@ with expansion: TestMain.cpp:436: PASSED: - CHECK( Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString ) + CHECK( Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString ) with expansion: "one two three four" == @@ -4195,7 +4195,7 @@ Long strings can be wrapped TestMain.cpp:439: PASSED: - CHECK( Catch::LineWrapper( 17 ).wrap( testString ).toString() == "one two three\nfour" ) + CHECK( Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == "one two three\nfour" ) with expansion: "one two three four" @@ -4205,7 +4205,7 @@ with expansion: TestMain.cpp:440: PASSED: - CHECK( Catch::LineWrapper( 16 ).wrap( testString ).toString() == "one two three\nfour" ) + CHECK( Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == "one two three\nfour" ) with expansion: "one two three four" @@ -4215,7 +4215,7 @@ with expansion: TestMain.cpp:441: PASSED: - CHECK( Catch::LineWrapper( 15 ).wrap( testString ).toString() == "one two three\nfour" ) + CHECK( Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == "one two three\nfour" ) with expansion: "one two three four" @@ -4225,7 +4225,7 @@ with expansion: TestMain.cpp:442: PASSED: - CHECK( Catch::LineWrapper( 14 ).wrap( testString ).toString() == "one two three\nfour" ) + CHECK( Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == "one two three\nfour" ) with expansion: "one two three four" @@ -4235,7 +4235,7 @@ with expansion: TestMain.cpp:443: PASSED: - CHECK( Catch::LineWrapper( 13 ).wrap( testString ).toString() == "one two\nthree four" ) + CHECK( Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == "one two\nthree four" ) with expansion: "one two three four" @@ -4251,7 +4251,7 @@ Long strings can be wrapped TestMain.cpp:446: PASSED: - CHECK( Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" ) with expansion: "one two three @@ -4263,7 +4263,7 @@ with expansion: TestMain.cpp:447: PASSED: - CHECK( Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" ) with expansion: "one two three @@ -4281,7 +4281,7 @@ Long strings can be wrapped TestMain.cpp:450: PASSED: - CHECK( Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) with expansion: "one two @@ -4295,7 +4295,7 @@ with expansion: TestMain.cpp:451: PASSED: - CHECK( Catch::LineWrapper( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) with expansion: "one two @@ -4315,7 +4315,7 @@ Long strings can be wrapped TestMain.cpp:454: PASSED: - CHECK( Catch::LineWrapper( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" ) + CHECK( Catch::LineWrapper().setRight( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" ) with expansion: "abc- def" @@ -4325,7 +4325,7 @@ with expansion: TestMain.cpp:455: PASSED: - CHECK( Catch::LineWrapper( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" ) + CHECK( Catch::LineWrapper().setRight( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" ) with expansion: "abc- defg" @@ -4335,7 +4335,7 @@ with expansion: TestMain.cpp:456: PASSED: - CHECK( Catch::LineWrapper( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" ) + CHECK( Catch::LineWrapper().setRight( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" ) with expansion: "abc- def- @@ -4347,7 +4347,7 @@ with expansion: TestMain.cpp:458: PASSED: - CHECK( Catch::LineWrapper( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" ) + CHECK( Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" ) with expansion: "one two @@ -4363,7 +4363,7 @@ with expansion: TestMain.cpp:459: PASSED: - CHECK( Catch::LineWrapper( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" ) + CHECK( Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" ) with expansion: "one two @@ -4379,15 +4379,51 @@ with expansion: fo- ur" +------------------------------------------------------------------------------- +Long strings can be wrapped + plain string + As container +............................................................................... + +TestMain.cpp:464: +PASSED: + CHECK( wrapper.size() == 4 ) +with expansion: + 4 == 4 + +TestMain.cpp:465: +PASSED: + CHECK( wrapper[0] == "one" ) +with expansion: + "one" == "one" + +TestMain.cpp:466: +PASSED: + CHECK( wrapper[1] == "two" ) +with expansion: + "two" == "two" + +TestMain.cpp:467: +PASSED: + CHECK( wrapper[2] == "three" ) +with expansion: + "three" == "three" + +TestMain.cpp:468: +PASSED: + CHECK( wrapper[3] == "four" ) +with expansion: + "four" == "four" + ------------------------------------------------------------------------------- Long strings can be wrapped With newlines No wrapping ............................................................................... -TestMain.cpp:469: +TestMain.cpp:478: PASSED: - CHECK( Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString ) + CHECK( Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString ) with expansion: "one two three four" @@ -4395,9 +4431,9 @@ with expansion: "one two three four" -TestMain.cpp:470: +TestMain.cpp:479: PASSED: - CHECK( Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString ) + CHECK( Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString ) with expansion: "one two three four" @@ -4405,9 +4441,9 @@ with expansion: "one two three four" -TestMain.cpp:471: +TestMain.cpp:480: PASSED: - CHECK( Catch::LineWrapper( 10 ).wrap( testString ).toString() == testString ) + CHECK( Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString ) with expansion: "one two three four" @@ -4421,9 +4457,9 @@ Long strings can be wrapped Trailing newline ............................................................................... -TestMain.cpp:474: +TestMain.cpp:483: PASSED: - CHECK( Catch::LineWrapper( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" ) + CHECK( Catch::LineWrapper().setRight( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" ) with expansion: "abcdef " @@ -4431,15 +4467,15 @@ with expansion: "abcdef " -TestMain.cpp:475: +TestMain.cpp:484: PASSED: - CHECK( Catch::LineWrapper( 6 ).wrap( "abcdef" ).toString() == "abcdef" ) + CHECK( Catch::LineWrapper().setRight( 6 ).wrap( "abcdef" ).toString() == "abcdef" ) with expansion: "abcdef" == "abcdef" -TestMain.cpp:476: +TestMain.cpp:485: PASSED: - CHECK( Catch::LineWrapper( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" ) + CHECK( Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" ) with expansion: "abcdef " @@ -4453,9 +4489,9 @@ Long strings can be wrapped Wrapped once ............................................................................... -TestMain.cpp:479: +TestMain.cpp:488: PASSED: - CHECK( Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" ) with expansion: "one two three @@ -4465,9 +4501,9 @@ with expansion: three four" -TestMain.cpp:480: +TestMain.cpp:489: PASSED: - CHECK( Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" ) with expansion: "one two three @@ -4477,9 +4513,9 @@ with expansion: three four" -TestMain.cpp:481: +TestMain.cpp:490: PASSED: - CHECK( Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" ) with expansion: "one two three @@ -4495,9 +4531,9 @@ Long strings can be wrapped Wrapped twice ............................................................................... -TestMain.cpp:484: +TestMain.cpp:493: PASSED: - CHECK( Catch::LineWrapper( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) + CHECK( Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" ) with expansion: "one two @@ -4785,9 +4821,9 @@ with expansion: ------------------------------------------------------------------------------- Scenario: Do that thing with the thing - Given: This stuff exists - When: I do this - Then: it should do this + Given: This stuff exists + When: I do this + Then: it should do this ............................................................................... BDDTests.cpp:21: @@ -4798,10 +4834,10 @@ with expansion: ------------------------------------------------------------------------------- Scenario: Do that thing with the thing - Given: This stuff exists - When: I do this - Then: it should do this - And: do that + Given: This stuff exists + When: I do this + Then: it should do this + And: do that ............................................................................... BDDTests.cpp:23: @@ -4810,6 +4846,165 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector +............................................................................... + +BDDTests.cpp:32: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector + When: it is made larger + Then: the size and capacity go up +............................................................................... + +BDDTests.cpp:37: +PASSED: + REQUIRE( v.size() == 10 ) +with expansion: + 10 == 10 + +BDDTests.cpp:38: +PASSED: + REQUIRE( v.capacity() >= 10 ) +with expansion: + 10 >= 10 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector + When: it is made larger + Then: the size and capacity go up + And when: it is made smaller again + Then: the size goes down but the capacity stays the same +............................................................................... + +BDDTests.cpp:43: +PASSED: + REQUIRE( v.size() == 5 ) +with expansion: + 5 == 5 + +BDDTests.cpp:44: +PASSED: + REQUIRE( v.capacity() >= 10 ) +with expansion: + 10 >= 10 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector +............................................................................... + +BDDTests.cpp:32: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector + When: it is made larger + Then: the size and capacity go up +............................................................................... + +BDDTests.cpp:37: +PASSED: + REQUIRE( v.size() == 10 ) +with expansion: + 10 == 10 + +BDDTests.cpp:38: +PASSED: + REQUIRE( v.capacity() >= 10 ) +with expansion: + 10 >= 10 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector +............................................................................... + +BDDTests.cpp:32: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector + When: it is made larger + Then: the size and capacity go up +............................................................................... + +BDDTests.cpp:37: +PASSED: + REQUIRE( v.size() == 10 ) +with expansion: + 10 == 10 + +BDDTests.cpp:38: +PASSED: + REQUIRE( v.capacity() >= 10 ) +with expansion: + 10 >= 10 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector +............................................................................... + +BDDTests.cpp:32: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector +............................................................................... + +BDDTests.cpp:32: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: Vector resizing affects size and capacity + Given: an empty vector + When: we reserve more space + Then: The capacity is increased but the size remains the same +............................................................................... + +BDDTests.cpp:53: +PASSED: + REQUIRE( v.capacity() >= 10 ) +with expansion: + 10 >= 10 + +BDDTests.cpp:54: +PASSED: + REQUIRE( v.size() == 0 ) +with expansion: + 0 == 0 + +------------------------------------------------------------------------------- +Scenario: This is a really long scenario name to see how the list command deals with wrapping +............................................................................... + + +No assertions in test case, 'Scenario: This is a really long scenario name to see how the list command deals with wrapping' + ------------------------------------------------------------------------------- Anonymous test case 1 ............................................................................... @@ -4839,7 +5034,7 @@ with message: no assertions =============================================================================== -106 test cases - 47 failed (676 assertions - 104 failed) +108 test cases - 48 failed (697 assertions - 105 failed) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -5134,7 +5329,7 @@ with expansion: 13 test cases - 3 failed (40 assertions - 4 failed) - + @@ -5574,6 +5769,8 @@ TrickyTests.cpp:106 + + @@ -10377,7 +10574,7 @@ TestMain.cpp" line="423">
TestMain.cpp" line="435"> - Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString + Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString "one two three four" @@ -10387,7 +10584,7 @@ TestMain.cpp" line="435"> TestMain.cpp" line="436"> - Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString + Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString "one two three four" @@ -10403,7 +10600,7 @@ TestMain.cpp" line="436">
TestMain.cpp" line="439"> - Catch::LineWrapper( 17 ).wrap( testString ).toString() == "one two three\nfour" + Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == "one two three\nfour" "one two three @@ -10415,7 +10612,7 @@ four" TestMain.cpp" line="440"> - Catch::LineWrapper( 16 ).wrap( testString ).toString() == "one two three\nfour" + Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == "one two three\nfour" "one two three @@ -10427,7 +10624,7 @@ four" TestMain.cpp" line="441"> - Catch::LineWrapper( 15 ).wrap( testString ).toString() == "one two three\nfour" + Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == "one two three\nfour" "one two three @@ -10439,7 +10636,7 @@ four" TestMain.cpp" line="442"> - Catch::LineWrapper( 14 ).wrap( testString ).toString() == "one two three\nfour" + Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == "one two three\nfour" "one two three @@ -10451,7 +10648,7 @@ four" TestMain.cpp" line="443"> - Catch::LineWrapper( 13 ).wrap( testString ).toString() == "one two\nthree four" + Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == "one two\nthree four" "one two @@ -10469,7 +10666,7 @@ three four"
TestMain.cpp" line="446"> - Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" + Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" "one two @@ -10483,7 +10680,7 @@ four" TestMain.cpp" line="447"> - Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" + Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" "one two @@ -10503,7 +10700,7 @@ four"
TestMain.cpp" line="450"> - Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" + Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" "one @@ -10519,7 +10716,7 @@ four" TestMain.cpp" line="451"> - Catch::LineWrapper( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" + Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" "one @@ -10541,7 +10738,7 @@ four"
TestMain.cpp" line="454"> - Catch::LineWrapper( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" + Catch::LineWrapper().setRight( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" "abc- @@ -10553,7 +10750,7 @@ def" TestMain.cpp" line="455"> - Catch::LineWrapper( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" + Catch::LineWrapper().setRight( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" "abc- @@ -10565,7 +10762,7 @@ defg" TestMain.cpp" line="456"> - Catch::LineWrapper( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" + Catch::LineWrapper().setRight( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" "abc- @@ -10579,7 +10776,7 @@ gh" TestMain.cpp" line="458"> - Catch::LineWrapper( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" + Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" "one @@ -10597,7 +10794,7 @@ four" TestMain.cpp" line="459"> - Catch::LineWrapper( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" + Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" "one @@ -10619,14 +10816,60 @@ ur"
+
+
+TestMain.cpp" line="464"> + + wrapper.size() == 4 + + + 4 == 4 + + +TestMain.cpp" line="465"> + + wrapper[0] == "one" + + + "one" == "one" + + +TestMain.cpp" line="466"> + + wrapper[1] == "two" + + + "two" == "two" + + +TestMain.cpp" line="467"> + + wrapper[2] == "three" + + + "three" == "three" + + +TestMain.cpp" line="468"> + + wrapper[3] == "four" + + + "four" == "four" + + + +
+ +
-TestMain.cpp" line="469"> +TestMain.cpp" line="478"> - Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString + Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString "one two @@ -10636,9 +10879,9 @@ three four" three four" -TestMain.cpp" line="470"> +TestMain.cpp" line="479"> - Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString + Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString "one two @@ -10648,9 +10891,9 @@ three four" three four" -TestMain.cpp" line="471"> +TestMain.cpp" line="480"> - Catch::LineWrapper( 10 ).wrap( testString ).toString() == testString + Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString "one two @@ -10666,9 +10909,9 @@ three four"
-TestMain.cpp" line="474"> +TestMain.cpp" line="483"> - Catch::LineWrapper( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" + Catch::LineWrapper().setRight( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" "abcdef @@ -10678,17 +10921,17 @@ TestMain.cpp" line="474"> " -TestMain.cpp" line="475"> +TestMain.cpp" line="484"> - Catch::LineWrapper( 6 ).wrap( "abcdef" ).toString() == "abcdef" + Catch::LineWrapper().setRight( 6 ).wrap( "abcdef" ).toString() == "abcdef" "abcdef" == "abcdef" -TestMain.cpp" line="476"> +TestMain.cpp" line="485"> - Catch::LineWrapper( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" + Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" "abcdef @@ -10704,9 +10947,9 @@ TestMain.cpp" line="476">
-TestMain.cpp" line="479"> +TestMain.cpp" line="488"> - Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" + Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" "one two @@ -10718,9 +10961,9 @@ three four" -TestMain.cpp" line="480"> +TestMain.cpp" line="489"> - Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" + Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" "one two @@ -10732,9 +10975,9 @@ three four" -TestMain.cpp" line="481"> +TestMain.cpp" line="490"> - Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" + Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" "one two @@ -10752,9 +10995,9 @@ four"
-TestMain.cpp" line="484"> +TestMain.cpp" line="493"> - Catch::LineWrapper( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" + Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" "one @@ -11063,9 +11306,9 @@ TrickyTests.cpp" line="335"> -
-
-
+
+
+
BDDTests.cpp" line="21"> itDoesThis() @@ -11074,7 +11317,7 @@ BDDTests.cpp" line="21"> true -
+
BDDTests.cpp" line="23"> itDoesThat() @@ -11093,6 +11336,183 @@ BDDTests.cpp" line="23">
+ +
+BDDTests.cpp" line="32"> + + v.size() == 0 + + + 0 == 0 + + +
+
+BDDTests.cpp" line="37"> + + v.size() == 10 + + + 10 == 10 + + +BDDTests.cpp" line="38"> + + v.capacity() >= 10 + + + 10 >= 10 + + +
+
+BDDTests.cpp" line="43"> + + v.size() == 5 + + + 5 == 5 + + +BDDTests.cpp" line="44"> + + v.capacity() >= 10 + + + 10 >= 10 + + + +
+ +
+ +
+ +
+ +
+
+BDDTests.cpp" line="32"> + + v.size() == 0 + + + 0 == 0 + + +
+
+BDDTests.cpp" line="37"> + + v.size() == 10 + + + 10 == 10 + + +BDDTests.cpp" line="38"> + + v.capacity() >= 10 + + + 10 >= 10 + + +
+ +
+ +
+ +
+ +
+
+BDDTests.cpp" line="32"> + + v.size() == 0 + + + 0 == 0 + + +
+
+BDDTests.cpp" line="37"> + + v.size() == 10 + + + 10 == 10 + + +BDDTests.cpp" line="38"> + + v.capacity() >= 10 + + + 10 >= 10 + + + +
+ +
+ +
+
+BDDTests.cpp" line="32"> + + v.size() == 0 + + + 0 == 0 + + +
+ +
+ +
+
+BDDTests.cpp" line="32"> + + v.size() == 0 + + + 0 == 0 + + +
+
+BDDTests.cpp" line="53"> + + v.capacity() >= 10 + + + 10 >= 10 + + +BDDTests.cpp" line="54"> + + v.size() == 0 + + + 0 == 0 + + + +
+ +
+ +
+ + + + + @@ -11105,9 +11525,9 @@ BDDTests.cpp" line="23">
- + - + [Started testing: CatchSelfTest] [Started group: '~dummy'] @@ -12413,11 +12833,11 @@ TestMain.cpp:423: oneTag.matchesTags( "~[hide]" ) == false succeeded for: false [Running: Long strings can be wrapped] [Started section: 'plain string'] [Started section: 'No wrapping'] -TestMain.cpp:435: Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString succeeded for: +TestMain.cpp:435: Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString succeeded for: "one two three four" == "one two three four" -TestMain.cpp:436: Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString succeeded for: +TestMain.cpp:436: Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString succeeded for: "one two three four" == "one two three four" @@ -12427,31 +12847,31 @@ TestMain.cpp:436: Catch::LineWrapper( 18 ).wrap( testString ).toString() == test [Started section: 'plain string'] [Started section: 'Wrapped once'] -TestMain.cpp:439: Catch::LineWrapper( 17 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: +TestMain.cpp:439: Catch::LineWrapper().setRight( 17 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: "one two three four" == "one two three four" -TestMain.cpp:440: Catch::LineWrapper( 16 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: +TestMain.cpp:440: Catch::LineWrapper().setRight( 16 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: "one two three four" == "one two three four" -TestMain.cpp:441: Catch::LineWrapper( 15 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: +TestMain.cpp:441: Catch::LineWrapper().setRight( 15 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: "one two three four" == "one two three four" -TestMain.cpp:442: Catch::LineWrapper( 14 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: +TestMain.cpp:442: Catch::LineWrapper().setRight( 14 ).wrap( testString ).toString() == "one two three\nfour" succeeded for: "one two three four" == "one two three four" -TestMain.cpp:443: Catch::LineWrapper( 13 ).wrap( testString ).toString() == "one two\nthree four" succeeded for: +TestMain.cpp:443: Catch::LineWrapper().setRight( 13 ).wrap( testString ).toString() == "one two\nthree four" succeeded for: "one two three four" == @@ -12463,7 +12883,7 @@ three four" [Started section: 'plain string'] [Started section: 'Wrapped twice'] -TestMain.cpp:446: Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: +TestMain.cpp:446: Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: "one two three four" @@ -12471,7 +12891,7 @@ four" "one two three four" -TestMain.cpp:447: Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: +TestMain.cpp:447: Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: "one two three four" @@ -12485,7 +12905,7 @@ four" [Started section: 'plain string'] [Started section: 'Wrapped three times'] -TestMain.cpp:450: Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: +TestMain.cpp:450: Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: "one two three @@ -12495,7 +12915,7 @@ four" two three four" -TestMain.cpp:451: Catch::LineWrapper( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: +TestMain.cpp:451: Catch::LineWrapper().setRight( 5 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: "one two three @@ -12511,24 +12931,24 @@ four" [Started section: 'plain string'] [Started section: 'Short wrap'] -TestMain.cpp:454: Catch::LineWrapper( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" succeeded for: "abc- +TestMain.cpp:454: Catch::LineWrapper().setRight( 4 ).wrap( "abcdef" ).toString() == "abc-\ndef" succeeded for: "abc- def" == "abc- def" -TestMain.cpp:455: Catch::LineWrapper( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" succeeded for: "abc- +TestMain.cpp:455: Catch::LineWrapper().setRight( 4 ).wrap( "abcdefg" ).toString() == "abc-\ndefg" succeeded for: "abc- defg" == "abc- defg" -TestMain.cpp:456: Catch::LineWrapper( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" succeeded for: "abc- +TestMain.cpp:456: Catch::LineWrapper().setRight( 4 ).wrap("abcdefgh" ).toString() == "abc-\ndef-\ngh" succeeded for: "abc- def- gh" == "abc- def- gh" -TestMain.cpp:458: Catch::LineWrapper( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for: +TestMain.cpp:458: Catch::LineWrapper().setRight( 4 ).wrap( testString ).toString() == "one\ntwo\nthr-\nee\nfour" succeeded for: "one two thr- @@ -12540,7 +12960,7 @@ two thr- ee four" -TestMain.cpp:459: Catch::LineWrapper( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for: +TestMain.cpp:459: Catch::LineWrapper().setRight( 3 ).wrap( testString ).toString() == "one\ntwo\nth-\nree\nfo-\nur" succeeded for: "one two th- @@ -12558,21 +12978,32 @@ ur" [End of section: 'plain string' All 5 assertions passed] +[Started section: 'plain string'] +[Started section: 'As container'] +TestMain.cpp:464: wrapper.size() == 4 succeeded for: 4 == 4 +TestMain.cpp:465: wrapper[0] == "one" succeeded for: "one" == "one" +TestMain.cpp:466: wrapper[1] == "two" succeeded for: "two" == "two" +TestMain.cpp:467: wrapper[2] == "three" succeeded for: "three" == "three" +TestMain.cpp:468: wrapper[3] == "four" succeeded for: "four" == "four" +[End of section: 'As container' All 5 assertions passed] + +[End of section: 'plain string' All 5 assertions passed] + [Started section: 'With newlines'] [Started section: 'No wrapping'] -TestMain.cpp:469: Catch::LineWrapper( 80 ).wrap( testString ).toString() == testString succeeded for: +TestMain.cpp:478: Catch::LineWrapper().setRight( 80 ).wrap( testString ).toString() == testString succeeded for: "one two three four" == "one two three four" -TestMain.cpp:470: Catch::LineWrapper( 18 ).wrap( testString ).toString() == testString succeeded for: +TestMain.cpp:479: Catch::LineWrapper().setRight( 18 ).wrap( testString ).toString() == testString succeeded for: "one two three four" == "one two three four" -TestMain.cpp:471: Catch::LineWrapper( 10 ).wrap( testString ).toString() == testString succeeded for: +TestMain.cpp:480: Catch::LineWrapper().setRight( 10 ).wrap( testString ).toString() == testString succeeded for: "one two three four" == @@ -12584,13 +13015,13 @@ three four" [Started section: 'With newlines'] [Started section: 'Trailing newline'] -TestMain.cpp:474: Catch::LineWrapper( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef +TestMain.cpp:483: Catch::LineWrapper().setRight( 10 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef " == "abcdef " -TestMain.cpp:475: Catch::LineWrapper( 6 ).wrap( "abcdef" ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef" -TestMain.cpp:476: Catch::LineWrapper( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef +TestMain.cpp:484: Catch::LineWrapper().setRight( 6 ).wrap( "abcdef" ).toString() == "abcdef" succeeded for: "abcdef" == "abcdef" +TestMain.cpp:485: Catch::LineWrapper().setRight( 6 ).wrap( "abcdef\n" ).toString() == "abcdef\n" succeeded for: "abcdef " == "abcdef @@ -12601,7 +13032,7 @@ TestMain.cpp:476: Catch::LineWrapper( 6 ).wrap( "abcdef\n" ).toString() == "abcd [Started section: 'With newlines'] [Started section: 'Wrapped once'] -TestMain.cpp:479: Catch::LineWrapper( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: +TestMain.cpp:488: Catch::LineWrapper().setRight( 9 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: "one two three four" @@ -12609,7 +13040,7 @@ four" "one two three four" -TestMain.cpp:480: Catch::LineWrapper( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: +TestMain.cpp:489: Catch::LineWrapper().setRight( 8 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: "one two three four" @@ -12617,7 +13048,7 @@ four" "one two three four" -TestMain.cpp:481: Catch::LineWrapper( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: +TestMain.cpp:490: Catch::LineWrapper().setRight( 7 ).wrap( testString ).toString() == "one two\nthree\nfour" succeeded for: "one two three four" @@ -12631,7 +13062,7 @@ four" [Started section: 'With newlines'] [Started section: 'Wrapped twice'] -TestMain.cpp:484: Catch::LineWrapper( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: +TestMain.cpp:493: Catch::LineWrapper().setRight( 6 ).wrap( testString ).toString() == "one\ntwo\nthree\nfour" succeeded for: "one two three @@ -12645,7 +13076,7 @@ four" [End of section: 'With newlines' 1 assertion passed] -[Finished: 'Long strings can be wrapped' All tests passed (26 assertions in 1 test case)] +[Finished: 'Long strings can be wrapped' All tests passed (31 assertions in 1 test case)] [Running: ./succeeding/Tricky/std::pair] TrickyTests.cpp:37: (std::pair( 1, 2 )) == aNicePair succeeded for: std::pair( 1, 2 ) == std::pair( 1, 2 ) @@ -12749,22 +13180,91 @@ TrickyTests.cpp:335: Catch::isTrue( true ) succeeded for: true [Finished: 'Assertions then sections' All tests passed (6 assertions in 1 test case)] [Running: Scenario: Do that thing with the thing] -[Started section: 'Given: This stuff exists'] -[Started section: ' When: I do this'] -[Started section: ' Then: it should do this'] +[Started section: ' Given: This stuff exists'] +[Started section: ' When: I do this'] +[Started section: ' Then: it should do this'] BDDTests.cpp:21: itDoesThis() succeeded for: true -[Started section: ' And: do that'] +[Started section: ' And: do that'] BDDTests.cpp:23: itDoesThat() succeeded for: true -[End of section: ' And: do that' 1 assertion passed] +[End of section: ' And: do that' 1 assertion passed] -[End of section: ' Then: it should do this' All 2 assertions passed] +[End of section: ' Then: it should do this' All 2 assertions passed] -[End of section: ' When: I do this' All 2 assertions passed] +[End of section: ' When: I do this' All 2 assertions passed] -[End of section: 'Given: This stuff exists' All 2 assertions passed] +[End of section: ' Given: This stuff exists' All 2 assertions passed] [Finished: 'Scenario: Do that thing with the thing' All tests passed (2 assertions in 1 test case)] +[Running: Scenario: Vector resizing affects size and capacity] +[Started section: ' Given: an empty vector'] +BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0 +[Started section: ' When: it is made larger'] +[Started section: ' Then: the size and capacity go up'] +BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10 +BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10 +[Started section: 'And when: it is made smaller again'] +[Started section: ' Then: the size goes down but the capacity stays the same'] +BDDTests.cpp:43: v.size() == 5 succeeded for: 5 == 5 +BDDTests.cpp:44: v.capacity() >= 10 succeeded for: 10 >= 10 +[End of section: ' Then: the size goes down but the capacity stays the same' All 2 assertions passed] + +[End of section: 'And when: it is made smaller again' All 2 assertions passed] + +[End of section: ' Then: the size and capacity go up' All 4 assertions passed] + +[End of section: ' When: it is made larger' All 4 assertions passed] + +[End of section: ' Given: an empty vector' All 5 assertions passed] + +[Started section: ' Given: an empty vector'] +BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0 +[Started section: ' When: it is made larger'] +[Started section: ' Then: the size and capacity go up'] +BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10 +BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10 +[End of section: ' Then: the size and capacity go up' All 2 assertions passed] + +[End of section: ' When: it is made larger' All 2 assertions passed] + +[End of section: ' Given: an empty vector' All 3 assertions passed] + +[Started section: ' Given: an empty vector'] +BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0 +[Started section: ' When: it is made larger'] +[Started section: ' Then: the size and capacity go up'] +BDDTests.cpp:37: v.size() == 10 succeeded for: 10 == 10 +BDDTests.cpp:38: v.capacity() >= 10 succeeded for: 10 >= 10 +[End of section: ' Then: the size and capacity go up' All 2 assertions passed] + +[End of section: ' When: it is made larger' All 2 assertions passed] + +[End of section: ' Given: an empty vector' All 3 assertions passed] + +[Started section: ' Given: an empty vector'] +BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0 +[End of section: ' Given: an empty vector' 1 assertion passed] + +[Started section: ' Given: an empty vector'] +BDDTests.cpp:32: v.size() == 0 succeeded for: 0 == 0 +[Started section: ' When: we reserve more space'] +[Started section: ' Then: The capacity is increased but the size remains the same'] +BDDTests.cpp:53: v.capacity() >= 10 succeeded for: 10 >= 10 +BDDTests.cpp:54: v.size() == 0 succeeded for: 0 == 0 +[End of section: ' Then: The capacity is increased but the size remains the same' All 2 assertions passed] + +[End of section: ' When: we reserve more space' All 2 assertions passed] + +[End of section: ' Given: an empty vector' All 3 assertions passed] + +[Finished: 'Scenario: Vector resizing affects size and capacity' All tests passed (15 assertions in 1 test case)] + +[Running: Scenario: This is a really long scenario name to see how the list command deals with wrapping] + +No assertions in test case, 'Scenario: This is a really long scenario name to see how the list command deals with wrapping' + +[Finished: 'Scenario: This is a really long scenario name to see how the list command deals with wrapping' 1 test case failed (1 assertion failed)] + [Running: Anonymous test case 1] VariadicMacrosTests.cpp:14: succeeded [with message: anonymous test case] @@ -12782,10 +13282,10 @@ VariadicMacrosTests.cpp:26: succeeded [End of section: 'Section with one argument' 1 assertion passed] [Finished: 'Variadic macros' All tests passed (1 assertion in 1 test case)] -[End of group: '~dummy'. 47 of 106 test cases failed (104 of 676 assertions failed)] +[End of group: '~dummy'. 48 of 108 test cases failed (105 of 697 assertions failed)] -[Testing completed. 47 of 106 test cases failed (104 of 676 assertions failed)] +[Testing completed. 48 of 108 test cases failed (105 of 697 assertions failed)] [Started testing: CatchSelfTest] [Started group: '~dummy'] diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp index 161d8b09..bdde0333 100644 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp +++ b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp @@ -57,5 +57,8 @@ SCENARIO( "Vector resizing affects size and capacity", "[vector][bdd][size][capa } } -SCENARIO( "This is a really long scenario name to see how the list command deals with wrapping", "[very long tags][lots][long][tags][verbose]" ) { +SCENARIO( "This is a really long scenario name to see how the list command deals with wrapping", + "[very long tags][lots][long][tags][verbose]" + "[one very long tag name that should cause line wrapping writing out using the list command]" + "[anotherReallyLongTagNameButThisOneHasNoObviousWrapPointsSoShouldSplitWithinAWordUsingADashCharacter]" ) { }