catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Build 28
- Commit
fd879f7e774e8a6f676c24b9c3201e8d7f5d12d7- Author
- Phil Nash ·
- Parents
b9fea75109c4
Changes
README.md | 2 +- include/internal/catch_version.hpp | 2 +- .../SelfTest/Baselines/console.std.approved.txt | 2 +- .../SelfTest/Baselines/console.sw.approved.txt | 201 +------------------- projects/SelfTest/Baselines/junit.sw.approved.txt | 15 +- projects/SelfTest/Baselines/xml.sw.approved.txt | 208 +-------------------- single_include/catch.hpp | 6 +- 7 files changed, 10 insertions(+), 426 deletions(-) diff --git a/README.md b/README.md index bdfdc7f8..e578936d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@  -*v1.0 build 27 (master branch)* +*v1.0 build 28 (master branch)* Build status (on Travis CI) [](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 441f64df..06be4c17 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 27, "master" ); + Version libraryVersion( 1, 0, 28, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 3bf4d6c2..e1df1550 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -750,5 +750,5 @@ with expansion: "first" == "second" =============================================================================== -123 test cases - 36 failed (676 assertions - 91 failed) +122 test cases - 36 failed (658 assertions - 91 failed) diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 64ed0577..353d36ec 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -6726,205 +6726,6 @@ PASSED: with message: boo! -------------------------------------------------------------------------------- -cmdline - process name -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.processName == "test" ) -with expansion: - "test" == "test" - -------------------------------------------------------------------------------- -cmdline - arg separated by spaces -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - arg separated by colon -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - arg separated by = -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - long opt -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.fileName == "%stdout" ) -with expansion: - "%stdout" == "%stdout" - -------------------------------------------------------------------------------- -cmdline - a number -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.number == 42 ) -with expansion: - 42 == 42 - -------------------------------------------------------------------------------- -cmdline - not a number -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK_THROWS( parseInto( cli, argv, config ) ) - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config.number == 0 ) -with expansion: - 0 == 0 - -------------------------------------------------------------------------------- -cmdline - two parsers -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config1.number == 42 ) -with expansion: - 42 == 42 - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE_FALSE( unusedTokens.empty() ) -with expansion: - !false - -CmdLineTests.cpp:<line number>: -PASSED: - CHECK( config2.description == "some text" ) -with expansion: - "some text" == "some text" - -------------------------------------------------------------------------------- -cmdline - methods - in range -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.index == 3 ) -with expansion: - 3 == 3 - -------------------------------------------------------------------------------- -cmdline - methods - out of range -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE_THROWS( parseInto( cli, argv, config ) ) - -------------------------------------------------------------------------------- -cmdline - flags - set -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.flag ) -with expansion: - true - -------------------------------------------------------------------------------- -cmdline - flags - not set -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.flag == false ) -with expansion: - false == false - -------------------------------------------------------------------------------- -cmdline - positional -------------------------------------------------------------------------------- -CmdLineTests.cpp:<line number> -............................................................................... - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.firstPos == "1st" ) -with expansion: - "1st" == "1st" - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.secondPos == "2nd" ) -with expansion: - "2nd" == "2nd" - -CmdLineTests.cpp:<line number>: -PASSED: - REQUIRE( config.unpositional == "3rd" ) -with expansion: - "3rd" == "3rd" - ------------------------------------------------------------------------------- section tracking ------------------------------------------------------------------------------- @@ -7158,5 +6959,5 @@ with expansion: true =============================================================================== -123 test cases - 51 failed (695 assertions - 110 failed) +122 test cases - 51 failed (677 assertions - 110 failed) diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 58a1d151..406bda64 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,5 +1,5 @@ <testsuites> - <testsuite name="~_" errors="10" failures="100" tests="695" hostname="tbd" time="{duration}" timestamp="tbd"> + <testsuite name="~_" errors="10" failures="100" tests="677" hostname="tbd" time="{duration}" timestamp="tbd"> <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/> <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/> <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/> @@ -530,19 +530,6 @@ TrickyTests.cpp:<line number> <testcase classname="Scenario: Vector resizing affects size and capacity" name="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" time="{duration}"/> <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: we reserve more space/Then: The capacity is increased but the size remains the same" time="{duration}"/> <testcase classname="Scenario: This is a really long scenario name to see how the list command deals with wrapping" name="Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario/Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" time="{duration}"/> - <testcase classname="cmdline" name="process name" time="{duration}"/> - <testcase classname="cmdline" name="arg separated by spaces" time="{duration}"/> - <testcase classname="cmdline" name="arg separated by colon" time="{duration}"/> - <testcase classname="cmdline" name="arg separated by =" time="{duration}"/> - <testcase classname="cmdline" name="long opt" time="{duration}"/> - <testcase classname="cmdline" name="a number" time="{duration}"/> - <testcase classname="cmdline" name="not a number" time="{duration}"/> - <testcase classname="cmdline" name="two parsers" time="{duration}"/> - <testcase classname="cmdline" name="methods/in range" time="{duration}"/> - <testcase classname="cmdline" name="methods/out of range" time="{duration}"/> - <testcase classname="cmdline" name="flags/set" time="{duration}"/> - <testcase classname="cmdline" name="flags/not set" time="{duration}"/> - <testcase classname="cmdline" name="positional" time="{duration}"/> <testcase classname="section tracking" name="root" time="{duration}"/> <testcase classname="section tracking" name="test case with no sections" time="{duration}"/> <testcase classname="section tracking" name="test case with one section" time="{duration}"/> diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index efbb16d3..58fef781 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -6967,210 +6967,6 @@ there" </Section> <OverallResult success="true"/> </TestCase> - <TestCase name="cmdline"> - <Section name="process name"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.processName == "test" - </Original> - <Expanded> - "test" == "test" - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="arg separated by spaces"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.fileName == "filename.ext" - </Original> - <Expanded> - "filename.ext" == "filename.ext" - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="arg separated by colon"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.fileName == "filename.ext" - </Original> - <Expanded> - "filename.ext" == "filename.ext" - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="arg separated by ="> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.fileName == "filename.ext" - </Original> - <Expanded> - "filename.ext" == "filename.ext" - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="long opt"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.fileName == "%stdout" - </Original> - <Expanded> - "%stdout" == "%stdout" - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="a number"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.number == 42 - </Original> - <Expanded> - 42 == 42 - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="not a number"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - parseInto( cli, argv, config ) - </Original> - <Expanded> - parseInto( cli, argv, config ) - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.number == 0 - </Original> - <Expanded> - 0 == 0 - </Expanded> - </Expression> - <OverallResults successes="2" failures="0"/> - </Section> - <Section name="two parsers"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config1.number == 42 - </Original> - <Expanded> - 42 == 42 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - !unusedTokens.empty() - </Original> - <Expanded> - !false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config2.description == "some text" - </Original> - <Expanded> - "some text" == "some text" - </Expanded> - </Expression> - <OverallResults successes="3" failures="0"/> - </Section> - <Section name="methods"> - <OverallResults successes="0" failures="0"/> - </Section> - <Section name="methods"> - <Section name="in range"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.index == 3 - </Original> - <Expanded> - 3 == 3 - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="methods"> - <Section name="out of range"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - parseInto( cli, argv, config ) - </Original> - <Expanded> - parseInto( cli, argv, config ) - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="flags"> - <OverallResults successes="0" failures="0"/> - </Section> - <Section name="flags"> - <Section name="set"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.flag - </Original> - <Expanded> - true - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="flags"> - <Section name="not set"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.flag == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResults successes="1" failures="0"/> - </Section> - <OverallResults successes="1" failures="0"/> - </Section> - <Section name="positional"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.firstPos == "1st" - </Original> - <Expanded> - "1st" == "1st" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.secondPos == "2nd" - </Original> - <Expanded> - "2nd" == "2nd" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > - <Original> - config.unpositional == "3rd" - </Original> - <Expanded> - "3rd" == "3rd" - </Expanded> - </Expression> - <OverallResults successes="3" failures="0"/> - </Section> - <OverallResult success="true"/> - </TestCase> <TestCase name="section tracking"> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" > <Original> @@ -7418,7 +7214,7 @@ there" </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="585" failures="110"/> + <OverallResults successes="567" failures="110"/> </Group> - <OverallResults successes="585" failures="110"/> + <OverallResults successes="567" failures="110"/> </Catch> diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 88f00889..f2e9b41b 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 27 (master branch) - * Generated: 2014-03-06 08:06:07.489513 + * CATCH v1.0 build 28 (master branch) + * Generated: 2014-03-06 08:16:53.424629 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6580,7 +6580,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 27, "master" ); + Version libraryVersion( 1, 0, 28, "master" ); } // #included from: catch_message.hpp