From fd879f7e774e8a6f676c24b9c3201e8d7f5d12d7 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 6 Mar 2014 08:17:24 +0000 Subject: [PATCH] Build 28 - new version of Clara - removed command line tests --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- .../Baselines/console.std.approved.txt | 2 +- .../Baselines/console.sw.approved.txt | 201 +---------------- .../SelfTest/Baselines/junit.sw.approved.txt | 15 +- .../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 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 27 (master branch)* +*v1.0 build 28 (master branch)* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](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: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.processName == "test" ) -with expansion: - "test" == "test" - -------------------------------------------------------------------------------- -cmdline - arg separated by spaces -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - arg separated by colon -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - arg separated by = -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.fileName == "filename.ext" ) -with expansion: - "filename.ext" == "filename.ext" - -------------------------------------------------------------------------------- -cmdline - long opt -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.fileName == "%stdout" ) -with expansion: - "%stdout" == "%stdout" - -------------------------------------------------------------------------------- -cmdline - a number -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config.number == 42 ) -with expansion: - 42 == 42 - -------------------------------------------------------------------------------- -cmdline - not a number -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK_THROWS( parseInto( cli, argv, config ) ) - -CmdLineTests.cpp:: -PASSED: - CHECK( config.number == 0 ) -with expansion: - 0 == 0 - -------------------------------------------------------------------------------- -cmdline - two parsers -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - CHECK( config1.number == 42 ) -with expansion: - 42 == 42 - -CmdLineTests.cpp:: -PASSED: - REQUIRE_FALSE( unusedTokens.empty() ) -with expansion: - !false - -CmdLineTests.cpp:: -PASSED: - CHECK( config2.description == "some text" ) -with expansion: - "some text" == "some text" - -------------------------------------------------------------------------------- -cmdline - methods - in range -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - REQUIRE( config.index == 3 ) -with expansion: - 3 == 3 - -------------------------------------------------------------------------------- -cmdline - methods - out of range -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - REQUIRE_THROWS( parseInto( cli, argv, config ) ) - -------------------------------------------------------------------------------- -cmdline - flags - set -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - REQUIRE( config.flag ) -with expansion: - true - -------------------------------------------------------------------------------- -cmdline - flags - not set -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - REQUIRE( config.flag == false ) -with expansion: - false == false - -------------------------------------------------------------------------------- -cmdline - positional -------------------------------------------------------------------------------- -CmdLineTests.cpp: -............................................................................... - -CmdLineTests.cpp:: -PASSED: - REQUIRE( config.firstPos == "1st" ) -with expansion: - "1st" == "1st" - -CmdLineTests.cpp:: -PASSED: - REQUIRE( config.secondPos == "2nd" ) -with expansion: - "2nd" == "2nd" - -CmdLineTests.cpp:: -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 @@ - + @@ -530,19 +530,6 @@ TrickyTests.cpp: - - - - - - - - - - - - - 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" - -
- - - config.processName == "test" - - - "test" == "test" - - - -
-
- - - config.fileName == "filename.ext" - - - "filename.ext" == "filename.ext" - - - -
-
- - - config.fileName == "filename.ext" - - - "filename.ext" == "filename.ext" - - - -
-
- - - config.fileName == "filename.ext" - - - "filename.ext" == "filename.ext" - - - -
-
- - - config.fileName == "%stdout" - - - "%stdout" == "%stdout" - - - -
-
- - - config.number == 42 - - - 42 == 42 - - - -
-
- - - parseInto( cli, argv, config ) - - - parseInto( cli, argv, config ) - - - - - config.number == 0 - - - 0 == 0 - - - -
-
- - - config1.number == 42 - - - 42 == 42 - - - - - !unusedTokens.empty() - - - !false - - - - - config2.description == "some text" - - - "some text" == "some text" - - - -
-
- -
-
-
- - - config.index == 3 - - - 3 == 3 - - - -
- -
-
-
- - - parseInto( cli, argv, config ) - - - parseInto( cli, argv, config ) - - - -
- -
-
- -
-
-
- - - config.flag - - - true - - - -
- -
-
-
- - - config.flag == false - - - false == false - - - -
- -
-
- - - config.firstPos == "1st" - - - "1st" == "1st" - - - - - config.secondPos == "2nd" - - - "2nd" == "2nd" - - - - - config.unpositional == "3rd" - - - "3rd" == "3rd" - - - -
- - @@ -7418,7 +7214,7 @@ there" - + - + 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