From 37e2ead3d27115d30e811fd1dba69748827b0362 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Wed, 14 Nov 2018 00:22:56 +0100 Subject: [PATCH] git subrepo pull packages/Catch2 subrepo: subdir: "packages/Catch2" merged: "489a41012" upstream: origin: "git@github.com:catchorg/Catch2.git" branch: "master" commit: "489a41012" git-subrepo: version: "0.4.0" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "5d6aba9" --- packages/Catch2/.gitrepo | 7 +- packages/Catch2/CMakeLists.txt | 2 +- packages/Catch2/README.md | 4 +- packages/Catch2/conanfile.py | 2 +- packages/Catch2/docs/Readme.md | 1 + packages/Catch2/docs/other-macros.md | 150 + packages/Catch2/docs/release-notes.md | 24 + packages/Catch2/docs/why-catch.md | 2 +- packages/Catch2/include/catch.hpp | 2 +- packages/Catch2/include/external/clara.hpp | 625 +-- .../Catch2/include/internal/catch_matchers.h | 4 - .../Catch2/include/internal/catch_session.cpp | 2 - .../Catch2/include/internal/catch_version.cpp | 2 +- .../reporters/catch_reporter_bases.cpp | 6 +- .../reporters/catch_reporter_bases.hpp | 4 +- .../reporters/catch_reporter_console.cpp | 2 - packages/Catch2/projects/CMakeLists.txt | 2 +- .../Baselines/compact.sw.approved.txt | 1 + .../Baselines/console.std.approved.txt | 19 +- .../Baselines/console.sw.approved.txt | 3349 ++++++----------- .../Baselines/console.swa4.approved.txt | 96 +- .../SelfTest/Baselines/junit.sw.approved.txt | 3 +- .../SelfTest/Baselines/xml.sw.approved.txt | 15 +- .../SelfTest/UsageTests/Matchers.tests.cpp | 4 + .../Catch2/single_include/catch2/catch.hpp | 723 ++-- packages/Catch2/test_package/conanfile.py | 2 +- packages/Catch2/third_party/clara.hpp | 25 +- 27 files changed, 2103 insertions(+), 2975 deletions(-) create mode 100644 packages/Catch2/docs/other-macros.md diff --git a/packages/Catch2/.gitrepo b/packages/Catch2/.gitrepo index 3905470c0..5581c16b6 100644 --- a/packages/Catch2/.gitrepo +++ b/packages/Catch2/.gitrepo @@ -6,6 +6,7 @@ [subrepo] remote = git@github.com:catchorg/Catch2.git branch = master - commit = 544c7d7cbf66be41b2e213fd0c71a8b4dcb5323b - parent = e70bcdc2df5064c81e04a5130467434a114cf4cd - cmdver = 0.3.1 + commit = 489a41012e396868954a3e9ee39de26fa432ab44 + parent = 26f7dc2131b2c0182ec46469ba009a59a2dcae01 + cmdver = 0.4.0 + method = merge diff --git a/packages/Catch2/CMakeLists.txt b/packages/Catch2/CMakeLists.txt index 09793f7b3..8cc1ca31d 100644 --- a/packages/Catch2/CMakeLists.txt +++ b/packages/Catch2/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT DEFINED PROJECT_NAME) set(NOT_SUBPROJECT ON) endif() -project(Catch2 LANGUAGES CXX VERSION 2.4.1) +project(Catch2 LANGUAGES CXX VERSION 2.4.2) # Provide path for scripts list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") diff --git a/packages/Catch2/README.md b/packages/Catch2/README.md index 73162bbf4..e84306c5c 100644 --- a/packages/Catch2/README.md +++ b/packages/Catch2/README.md @@ -5,11 +5,11 @@ [](https://travis-ci.org/catchorg/Catch2) [](https://ci.appveyor.com/project/catchorg/catch2) [](https://codecov.io/gh/catchorg/Catch2) -[](https://wandbox.org/permlink/E0msqwbW7U4PVbHn) +[](https://wandbox.org/permlink/rbkudthN4hBNJznk) [](https://discord.gg/4CWS9zD) -<a href="https://github.com/catchorg/Catch2/releases/download/v2.4.1/catch.hpp">The latest version of the single header can be downloaded directly using this link</a> +<a href="https://github.com/catchorg/Catch2/releases/download/v2.4.2/catch.hpp">The latest version of the single header can be downloaded directly using this link</a> ## Catch2 is released! diff --git a/packages/Catch2/conanfile.py b/packages/Catch2/conanfile.py index 19b2c65e6..b99f314d7 100644 --- a/packages/Catch2/conanfile.py +++ b/packages/Catch2/conanfile.py @@ -4,7 +4,7 @@ from conans import ConanFile, CMake class CatchConan(ConanFile): name = "Catch" - version = "2.4.1" + version = "2.4.2" description = "A modern, C++-native, header-only, framework for unit-tests, TDD and BDD" author = "philsquared" generators = "cmake" diff --git a/packages/Catch2/docs/Readme.md b/packages/Catch2/docs/Readme.md index 908755181..8a45c4a4c 100644 --- a/packages/Catch2/docs/Readme.md +++ b/packages/Catch2/docs/Readme.md @@ -13,6 +13,7 @@ Writing tests: * [Reporters](reporters.md#top) * [Event Listeners](event-listeners.md#top) * [Data Generators](generators.md#top) +* [Other macros](other-macros.md#top) Fine tuning: * [Supplying your own main()](own-main.md#top) diff --git a/packages/Catch2/docs/other-macros.md b/packages/Catch2/docs/other-macros.md new file mode 100644 index 000000000..6f5fac7b0 --- /dev/null +++ b/packages/Catch2/docs/other-macros.md @@ -0,0 +1,150 @@ +<a id="top"></a> +# Other macros + +This page serves as a reference for macros that are not documented +elsewhere. For now, these macros are separated into 2 rough categories, +"assertion related macros" and "test case related macros". + +## Assertion related macros + +* `CHECKED_IF` and `CHECKED_ELSE` + +`CHECKED_IF( expr )` is an `if` replacement, that also applies Catch2's +stringification machinery to the _expr_ and records the result. As with +`if`, the block after a `CHECKED_IF` is entered only if the expression +evaluates to `true`. `CHECKED_ELSE( expr )` work similarly, but the block +is entered only if the _expr_ evaluated to `false`. + +Example: +```cpp +int a = ...; +int b = ...; +CHECKED_IF( a == b ) { + // This block is entered when a == b +} CHECKED_ELSE ( a == b ) { + // This block is entered when a != b +} +``` + +* `CHECK_NOFAIL` + +`CHECK_NOFAIL( expr )` is a variant of `CHECK` that does not fail the test +case if _expr_ evaluates to `false`. This can be useful for checking some +assumption, that might be violated without the test neccessarily failing. + +Example output: +``` +main.cpp:6: +FAILED - but was ok: + CHECK_NOFAIL( 1 == 2 ) + +main.cpp:7: +PASSED: + CHECK( 2 == 2 ) +``` + +* `SUCCEED` + +`SUCCEED( msg )` is mostly equivalent with `INFO( msg ); REQUIRE( true );`. +In other words, `SUCCEED` is for cases where just reaching a certain line +means that the test has been a success. + +Example usage: +```cpp +TEST_CASE( "SUCCEED showcase" ) { + int I = 1; + SUCCEED( "I is " << I ); +} +``` + +* `STATIC_REQUIRE` + +`STATIC_REQUIRE( expr )` is a macro that can be used the same way as a +`static_assert`, but also registers the success with Catch2, so it is +reported as a success at runtime. The whole check can also be deferred +to the runtime, by defining `CATCH_CONFIG_RUNTIME_STATIC_REQUIRE` before +including the Catch2 header. + +Example: +```cpp +TEST_CASE("STATIC_REQUIRE showcase", "[traits]") { + STATIC_REQUIRE( std::is_void<void>::value ); + STATIC_REQUIRE_FALSE( std::is_void<int>::value ); +} +``` + +## Test case related macros + +* `METHOD_AS_TEST_CASE` + +`METHOD_AS_TEST_CASE( member-function-pointer, description )` lets you +register a member function of a class as a Catch2 test case. The class +will be separately instantiated for each method registered in this way. + +```cpp +class TestClass { + std::string s; + +public: + TestClass() + :s( "hello" ) + {} + + void testCase() { + REQUIRE( s == "hello" ); + } +}; + + +METHOD_AS_TEST_CASE( TestClass::testCase, "Use class's method as a test case", "[class]" ) +``` + +* `REGISTER_TEST_CASE` + +`REGISTER_TEST_CASE( function, description )` let's you register +a `function` as a test case. The function has to have `void()` signature, +the description can contain both name and tags. + +Example: +```cpp +REGISTER_TEST_CASE( someFunction, "ManuallyRegistered", "[tags]" ); +``` + +_Note that the registration still has to happen before Catch2's session +is initiated. This means that it either needs to be done in a global +constructor, or before Catch2's session is created in user's own main._ + + +* `ANON_TEST_CASE` + +`ANON_TEST_CASE` is a `TEST_CASE` replacement that will autogenerate +unique name. The advantage of this is that you do not have to think +of a name for the test case,`the disadvantage is that the name doesn't +neccessarily remain stable across different links, and thus it might be +hard to run directly. + +Example: +```cpp +ANON_TEST_CASE() { + SUCCEED("Hello from anonymous test case"); +} +``` + +* `DYNAMIC_SECTION` + +`DYNAMIC_SECTION` is a `SECTION` where the user can use `operator<<` to +create the final name for that section. This can be useful with e.g. +generators, or when creating a `SECTION` dynamically, within a loop. + +Example: +```cpp +TEST_CASE( "looped SECTION tests" ) { + int a = 1; + + for( int b = 0; b < 10; ++b ) { + DYNAMIC_SECTION( "b is currently: " << b ) { + CHECK( b > a ); + } + } +} +``` diff --git a/packages/Catch2/docs/release-notes.md b/packages/Catch2/docs/release-notes.md index f31f0e876..16f9cc5b2 100644 --- a/packages/Catch2/docs/release-notes.md +++ b/packages/Catch2/docs/release-notes.md @@ -2,6 +2,7 @@ # Release notes **Contents**<br> +[2.4.2](#242)<br> [2.4.1](#241)<br> [2.4.0](#240)<br> [2.3.0](#230)<br> @@ -17,6 +18,29 @@ [Even Older versions](#even-older-versions)<br> +## 2.4.2 + +### Improvements +* XmlReporter now also outputs the RNG seed that was used in a run (#1404) +* `Catch::Session::applyCommandLine` now also accepts `wchar_t` arguments. + * However, Catch2 still does not support unicode. +* Added `STATIC_REQUIRE` macro (#1356, #1362) +* Catch2's singleton's are now cleaned up even if tests are run (#1411) + * This is mostly useful as a FP prevention for users who define their own main. +* Specifying an invalid reporter via `-r` is now reported sooner (#1351, #1422) + + +### Fixes +* Stringification no longer assumes that `char` is signed (#1399, #1407) + * This caused a `Wtautological-compare` warning. +* SFINAE for `operator<<` no longer sees different overload set than the actual insertion (#1403) + + +### Contrib +* `catch_discover_tests` correctly adds tests with comma in name (#1327, #1409) +* Added a new customization point in how the tests are launched to `catch_discover_tests` + + ## 2.4.1 ### Improvements diff --git a/packages/Catch2/docs/why-catch.md b/packages/Catch2/docs/why-catch.md index 45f58a6ab..86cc55bc5 100644 --- a/packages/Catch2/docs/why-catch.md +++ b/packages/Catch2/docs/why-catch.md @@ -6,7 +6,7 @@ including (but not limited to), [Google Test](http://code.google.com/p/googletest/), [Boost.Test](http://www.boost.org/doc/libs/1_49_0/libs/test/doc/html/index.html), [CppUnit](http://sourceforge.net/apps/mediawiki/cppunit/index.php?title=Main_Page), -[Cute](http://r2.ifs.hsr.ch/cute), +[Cute](http://www.cute-test.com), [many, many more](http://en.wikipedia.org/wiki/List_of_unit_testing_frameworks#C.2B.2B). So what does Catch bring to the party that differentiates it from these? Apart from a Catchy name, of course. diff --git a/packages/Catch2/include/catch.hpp b/packages/Catch2/include/catch.hpp index f6786e8d2..84b9f4660 100644 --- a/packages/Catch2/include/catch.hpp +++ b/packages/Catch2/include/catch.hpp @@ -11,7 +11,7 @@ #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 4 -#define CATCH_VERSION_PATCH 1 +#define CATCH_VERSION_PATCH 2 #ifdef __clang__ # pragma clang system_header diff --git a/packages/Catch2/include/external/clara.hpp b/packages/Catch2/include/external/clara.hpp index 3a7f88363..056e0a315 100644 --- a/packages/Catch2/include/external/clara.hpp +++ b/packages/Catch2/include/external/clara.hpp @@ -5,7 +5,7 @@ // // See https://github.com/philsquared/Clara for more details -// Clara v1.1.4 +// Clara v1.1.5 #ifndef CATCH_CLARA_HPP_INCLUDED #define CATCH_CLARA_HPP_INCLUDED @@ -34,8 +34,8 @@ // // A single-header library for wrapping and laying out basic text, by Phil Nash // -// This work is licensed under the BSD 2-Clause license. -// See the accompanying LICENSE file, or the one at https://opensource.org/licenses/BSD-2-Clause +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // // This project is hosted at https://github.com/philsquared/textflowcpp @@ -52,317 +52,326 @@ #endif -namespace Catch { namespace clara { namespace TextFlow { - - inline auto isWhitespace( char c ) -> bool { - static std::string chars = " \t\n\r"; - return chars.find( c ) != std::string::npos; - } - inline auto isBreakableBefore( char c ) -> bool { - static std::string chars = "[({<|"; - return chars.find( c ) != std::string::npos; - } - inline auto isBreakableAfter( char c ) -> bool { - static std::string chars = "])}>.,:;*+-=&/\\"; - return chars.find( c ) != std::string::npos; - } - - class Columns; - - class Column { - std::vector<std::string> m_strings; - size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH; - size_t m_indent = 0; - size_t m_initialIndent = std::string::npos; - - public: - class iterator { - friend Column; - - Column const& m_column; - size_t m_stringIndex = 0; - size_t m_pos = 0; - - size_t m_len = 0; - size_t m_end = 0; - bool m_suffix = false; - - iterator( Column const& column, size_t stringIndex ) - : m_column( column ), - m_stringIndex( stringIndex ) - {} - - auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; } - - auto isBoundary( size_t at ) const -> bool { - assert( at > 0 ); - assert( at <= line().size() ); - - return at == line().size() || - ( isWhitespace( line()[at] ) && !isWhitespace( line()[at-1] ) ) || - isBreakableBefore( line()[at] ) || - isBreakableAfter( line()[at-1] ); - } - - void calcLength() { - assert( m_stringIndex < m_column.m_strings.size() ); - - m_suffix = false; - auto width = m_column.m_width-indent(); - m_end = m_pos; - while( m_end < line().size() && line()[m_end] != '\n' ) - ++m_end; - - if( m_end < m_pos + width ) { - m_len = m_end - m_pos; - } - else { - size_t len = width; - while (len > 0 && !isBoundary(m_pos + len)) - --len; - while (len > 0 && isWhitespace( line()[m_pos + len - 1] )) - --len; - - if (len > 0) { - m_len = len; - } else { - m_suffix = true; - m_len = width - 1; - } - } - } - - auto indent() const -> size_t { - auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos; - return initial == std::string::npos ? m_column.m_indent : initial; - } - - auto addIndentAndSuffix(std::string const &plain) const -> std::string { - return std::string( indent(), ' ' ) + (m_suffix ? plain + "-" : plain); - } - - public: - explicit iterator( Column const& column ) : m_column( column ) { - assert( m_column.m_width > m_column.m_indent ); - assert( m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent ); - calcLength(); - if( m_len == 0 ) - m_stringIndex++; // Empty string - } - - auto operator *() const -> std::string { - assert( m_stringIndex < m_column.m_strings.size() ); - assert( m_pos <= m_end ); - if( m_pos + m_column.m_width < m_end ) - return addIndentAndSuffix(line().substr(m_pos, m_len)); - else - return addIndentAndSuffix(line().substr(m_pos, m_end - m_pos)); - } - - auto operator ++() -> iterator& { - m_pos += m_len; - if( m_pos < line().size() && line()[m_pos] == '\n' ) - m_pos += 1; - else - while( m_pos < line().size() && isWhitespace( line()[m_pos] ) ) - ++m_pos; - - if( m_pos == line().size() ) { - m_pos = 0; - ++m_stringIndex; - } - if( m_stringIndex < m_column.m_strings.size() ) - calcLength(); - return *this; - } - auto operator ++(int) -> iterator { - iterator prev( *this ); - operator++(); - return prev; - } - - auto operator ==( iterator const& other ) const -> bool { - return - m_pos == other.m_pos && - m_stringIndex == other.m_stringIndex && - &m_column == &other.m_column; - } - auto operator !=( iterator const& other ) const -> bool { - return !operator==( other ); - } - }; - using const_iterator = iterator; - - explicit Column( std::string const& text ) { m_strings.push_back( text ); } - - auto width( size_t newWidth ) -> Column& { - assert( newWidth > 0 ); - m_width = newWidth; - return *this; - } - auto indent( size_t newIndent ) -> Column& { - m_indent = newIndent; - return *this; - } - auto initialIndent( size_t newIndent ) -> Column& { - m_initialIndent = newIndent; - return *this; - } - - auto width() const -> size_t { return m_width; } - auto begin() const -> iterator { return iterator( *this ); } - auto end() const -> iterator { return { *this, m_strings.size() }; } - - inline friend std::ostream& operator << ( std::ostream& os, Column const& col ) { - bool first = true; - for( auto line : col ) { - if( first ) - first = false; - else - os << "\n"; - os << line; - } - return os; - } - - auto operator + ( Column const& other ) -> Columns; - - auto toString() const -> std::string { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - }; - - class Spacer : public Column { - - public: - explicit Spacer( size_t spaceWidth ) : Column( "" ) { - width( spaceWidth ); - } - }; - - class Columns { - std::vector<Column> m_columns; - - public: - - class iterator { - friend Columns; - struct EndTag {}; - - std::vector<Column> const& m_columns; - std::vector<Column::iterator> m_iterators; - size_t m_activeIterators; - - iterator( Columns const& columns, EndTag ) - : m_columns( columns.m_columns ), - m_activeIterators( 0 ) - { - m_iterators.reserve( m_columns.size() ); - - for( auto const& col : m_columns ) - m_iterators.push_back( col.end() ); - } - - public: - explicit iterator( Columns const& columns ) - : m_columns( columns.m_columns ), - m_activeIterators( m_columns.size() ) - { - m_iterators.reserve( m_columns.size() ); - - for( auto const& col : m_columns ) - m_iterators.push_back( col.begin() ); - } - - auto operator ==( iterator const& other ) const -> bool { - return m_iterators == other.m_iterators; - } - auto operator !=( iterator const& other ) const -> bool { - return m_iterators != other.m_iterators; - } - auto operator *() const -> std::string { - std::string row, padding; - - for( size_t i = 0; i < m_columns.size(); ++i ) { - auto width = m_columns[i].width(); - if( m_iterators[i] != m_columns[i].end() ) { - std::string col = *m_iterators[i]; - row += padding + col; - if( col.size() < width ) - padding = std::string( width - col.size(), ' ' ); - else - padding = ""; - } - else { - padding += std::string( width, ' ' ); - } - } - return row; - } - auto operator ++() -> iterator& { - for( size_t i = 0; i < m_columns.size(); ++i ) { - if (m_iterators[i] != m_columns[i].end()) - ++m_iterators[i]; - } - return *this; - } - auto operator ++(int) -> iterator { - iterator prev( *this ); - operator++(); - return prev; - } - }; - using const_iterator = iterator; - - auto begin() const -> iterator { return iterator( *this ); } - auto end() const -> iterator { return { *this, iterator::EndTag() }; } - - auto operator += ( Column const& col ) -> Columns& { - m_columns.push_back( col ); - return *this; - } - auto operator + ( Column const& col ) -> Columns { - Columns combined = *this; - combined += col; - return combined; - } - - inline friend std::ostream& operator << ( std::ostream& os, Columns const& cols ) { - - bool first = true; - for( auto line : cols ) { - if( first ) - first = false; - else - os << "\n"; - os << line; - } - return os; - } - - auto toString() const -> std::string { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - }; - - inline auto Column::operator + ( Column const& other ) -> Columns { - Columns cols; - cols += *this; - cols += other; - return cols; - } -}}} // namespace Catch::clara::TextFlow - +namespace Catch { +namespace clara { +namespace TextFlow { + +inline auto isWhitespace(char c) -> bool { + static std::string chars = " \t\n\r"; + return chars.find(c) != std::string::npos; +} +inline auto isBreakableBefore(char c) -> bool { + static std::string chars = "[({<|"; + return chars.find(c) != std::string::npos; +} +inline auto isBreakableAfter(char c) -> bool { + static std::string chars = "])}>.,:;*+-=&/\\"; + return chars.find(c) != std::string::npos; +} + +class Columns; + +class Column { + std::vector<std::string> m_strings; + size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH; + size_t m_indent = 0; + size_t m_initialIndent = std::string::npos; + +public: + class iterator { + friend Column; + + Column const& m_column; + size_t m_stringIndex = 0; + size_t m_pos = 0; + + size_t m_len = 0; + size_t m_end = 0; + bool m_suffix = false; + + iterator(Column const& column, size_t stringIndex) + : m_column(column), + m_stringIndex(stringIndex) {} + + auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; } + + auto isBoundary(size_t at) const -> bool { + assert(at > 0); + assert(at <= line().size()); + + return at == line().size() || + (isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) || + isBreakableBefore(line()[at]) || + isBreakableAfter(line()[at - 1]); + } + + void calcLength() { + assert(m_stringIndex < m_column.m_strings.size()); + + m_suffix = false; + auto width = m_column.m_width - indent(); + m_end = m_pos; + while (m_end < line().size() && line()[m_end] != '\n') + ++m_end; + + if (m_end < m_pos + width) { + m_len = m_end - m_pos; + } else { + size_t len = width; + while (len > 0 && !isBoundary(m_pos + len)) + --len; + while (len > 0 && isWhitespace(line()[m_pos + len - 1])) + --len; + + if (len > 0) { + m_len = len; + } else { + m_suffix = true; + m_len = width - 1; + } + } + } + + auto indent() const -> size_t { + auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos; + return initial == std::string::npos ? m_column.m_indent : initial; + } + + auto addIndentAndSuffix(std::string const &plain) const -> std::string { + return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain); + } + + public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::forward_iterator_tag; + + explicit iterator(Column const& column) : m_column(column) { + assert(m_column.m_width > m_column.m_indent); + assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent); + calcLength(); + if (m_len == 0) + m_stringIndex++; // Empty string + } + + auto operator *() const -> std::string { + assert(m_stringIndex < m_column.m_strings.size()); + assert(m_pos <= m_end); + return addIndentAndSuffix(line().substr(m_pos, m_len)); + } + + auto operator ++() -> iterator& { + m_pos += m_len; + if (m_pos < line().size() && line()[m_pos] == '\n') + m_pos += 1; + else + while (m_pos < line().size() && isWhitespace(line()[m_pos])) + ++m_pos; + + if (m_pos == line().size()) { + m_pos = 0; + ++m_stringIndex; + } + if (m_stringIndex < m_column.m_strings.size()) + calcLength(); + return *this; + } + auto operator ++(int) -> iterator { + iterator prev(*this); + operator++(); + return prev; + } + + auto operator ==(iterator const& other) const -> bool { + return + m_pos == other.m_pos && + m_stringIndex == other.m_stringIndex && + &m_column == &other.m_column; + } + auto operator !=(iterator const& other) const -> bool { + return !operator==(other); + } + }; + using const_iterator = iterator; + + explicit Column(std::string const& text) { m_strings.push_back(text); } + + auto width(size_t newWidth) -> Column& { + assert(newWidth > 0); + m_width = newWidth; + return *this; + } + auto indent(size_t newIndent) -> Column& { + m_indent = newIndent; + return *this; + } + auto initialIndent(size_t newIndent) -> Column& { + m_initialIndent = newIndent; + return *this; + } + + auto width() const -> size_t { return m_width; } + auto begin() const -> iterator { return iterator(*this); } + auto end() const -> iterator { return { *this, m_strings.size() }; } + + inline friend std::ostream& operator << (std::ostream& os, Column const& col) { + bool first = true; + for (auto line : col) { + if (first) + first = false; + else + os << "\n"; + os << line; + } + return os; + } + + auto operator + (Column const& other)->Columns; + + auto toString() const -> std::string { + std::ostringstream oss; + oss << *this; + return oss.str(); + } +}; + +class Spacer : public Column { + +public: + explicit Spacer(size_t spaceWidth) : Column("") { + width(spaceWidth); + } +}; + +class Columns { + std::vector<Column> m_columns; + +public: + + class iterator { + friend Columns; + struct EndTag {}; + + std::vector<Column> const& m_columns; + std::vector<Column::iterator> m_iterators; + size_t m_activeIterators; + + iterator(Columns const& columns, EndTag) + : m_columns(columns.m_columns), + m_activeIterators(0) { + m_iterators.reserve(m_columns.size()); + + for (auto const& col : m_columns) + m_iterators.push_back(col.end()); + } + + public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::forward_iterator_tag; + + explicit iterator(Columns const& columns) + : m_columns(columns.m_columns), + m_activeIterators(m_columns.size()) { + m_iterators.reserve(m_columns.size()); + + for (auto const& col : m_columns) + m_iterators.push_back(col.begin()); + } + + auto operator ==(iterator const& other) const -> bool { + return m_iterators == other.m_iterators; + } + auto operator !=(iterator const& other) const -> bool { + return m_iterators != other.m_iterators; + } + auto operator *() const -> std::string { + std::string row, padding; + + for (size_t i = 0; i < m_columns.size(); ++i) { + auto width = m_columns[i].width(); + if (m_iterators[i] != m_columns[i].end()) { + std::string col = *m_iterators[i]; + row += padding + col; + if (col.size() < width) + padding = std::string(width - col.size(), ' '); + else + padding = ""; + } else { + padding += std::string(width, ' '); + } + } + return row; + } + auto operator ++() -> iterator& { + for (size_t i = 0; i < m_columns.size(); ++i) { + if (m_iterators[i] != m_columns[i].end()) + ++m_iterators[i]; + } + return *this; + } + auto operator ++(int) -> iterator { + iterator prev(*this); + operator++(); + return prev; + } + }; + using const_iterator = iterator; + + auto begin() const -> iterator { return iterator(*this); } + auto end() const -> iterator { return { *this, iterator::EndTag() }; } + + auto operator += (Column const& col) -> Columns& { + m_columns.push_back(col); + return *this; + } + auto operator + (Column const& col) -> Columns { + Columns combined = *this; + combined += col; + return combined; + } + + inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) { + + bool first = true; + for (auto line : cols) { + if (first) + first = false; + else + os << "\n"; + os << line; + } + return os; + } + + auto toString() const -> std::string { + std::ostringstream oss; + oss << *this; + return oss.str(); + } +}; + +inline auto Column::operator + (Column const& other) -> Columns { + Columns cols; + cols += *this; + cols += other; + return cols; +} +} + +} +} #endif // CATCH_CLARA_TEXTFLOW_HPP_INCLUDED // ----------- end of #include from clara_textflow.hpp ----------- // ........... back in clara.hpp +#include <string> #include <memory> #include <set> #include <algorithm> diff --git a/packages/Catch2/include/internal/catch_matchers.h b/packages/Catch2/include/internal/catch_matchers.h index 29692fc05..aebd4c239 100644 --- a/packages/Catch2/include/internal/catch_matchers.h +++ b/packages/Catch2/include/internal/catch_matchers.h @@ -43,10 +43,6 @@ namespace Matchers { struct MatcherMethod { virtual bool match( ObjectT const& arg ) const = 0; }; - template<typename PtrT> - struct MatcherMethod<PtrT*> { - virtual bool match( PtrT* arg ) const = 0; - }; #ifdef __clang__ # pragma clang diagnostic pop diff --git a/packages/Catch2/include/internal/catch_session.cpp b/packages/Catch2/include/internal/catch_session.cpp index 21877c991..0920521c0 100644 --- a/packages/Catch2/include/internal/catch_session.cpp +++ b/packages/Catch2/include/internal/catch_session.cpp @@ -54,8 +54,6 @@ namespace Catch { Catch::Totals runTests(std::shared_ptr<Config> const& config) { - // FixMe: Add listeners in order first, then add reporters. - auto reporter = makeReporter(config); RunContext context(config, std::move(reporter)); diff --git a/packages/Catch2/include/internal/catch_version.cpp b/packages/Catch2/include/internal/catch_version.cpp index a57553c0d..690d4f7b7 100644 --- a/packages/Catch2/include/internal/catch_version.cpp +++ b/packages/Catch2/include/internal/catch_version.cpp @@ -37,7 +37,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 2, 4, 1, "", 0 ); + static Version version( 2, 4, 2, "", 0 ); return version; } diff --git a/packages/Catch2/include/reporters/catch_reporter_bases.cpp b/packages/Catch2/include/reporters/catch_reporter_bases.cpp index 4dd4f95dc..fa441ee54 100644 --- a/packages/Catch2/include/reporters/catch_reporter_bases.cpp +++ b/packages/Catch2/include/reporters/catch_reporter_bases.cpp @@ -30,7 +30,7 @@ namespace Catch { // + 1 for null terminator const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; char buffer[maxDoubleSize]; - + // Save previous errno, to prevent sprintf from overwriting it ErrnoGuard guard; #ifdef _MSC_VER @@ -45,6 +45,10 @@ namespace Catch { TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config) :StreamingReporterBase(_config) {} + std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() { + return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High }; + } + void TestEventListenerBase::assertionStarting(AssertionInfo const &) {} bool TestEventListenerBase::assertionEnded(AssertionStats const &) { diff --git a/packages/Catch2/include/reporters/catch_reporter_bases.hpp b/packages/Catch2/include/reporters/catch_reporter_bases.hpp index ae1618fe4..4a27db681 100644 --- a/packages/Catch2/include/reporters/catch_reporter_bases.hpp +++ b/packages/Catch2/include/reporters/catch_reporter_bases.hpp @@ -217,7 +217,7 @@ namespace Catch { node->children.push_back(m_rootSection); m_testCases.push_back(node); m_rootSection.reset(); - + assert(m_deepestSection); m_deepestSection->stdOut = testCaseStats.stdOut; m_deepestSection->stdErr = testCaseStats.stdErr; @@ -266,6 +266,8 @@ namespace Catch { struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> { TestEventListenerBase( ReporterConfig const& _config ); + static std::set<Verbosity> getSupportedVerbosities(); + void assertionStarting(AssertionInfo const&) override; bool assertionEnded(AssertionStats const&) override; }; diff --git a/packages/Catch2/include/reporters/catch_reporter_console.cpp b/packages/Catch2/include/reporters/catch_reporter_console.cpp index 54b62cd80..500677b9c 100644 --- a/packages/Catch2/include/reporters/catch_reporter_console.cpp +++ b/packages/Catch2/include/reporters/catch_reporter_console.cpp @@ -111,8 +111,6 @@ public: void print() const { printSourceInfo(); if (stats.totals.assertions.total() > 0) { - if (result.isOk()) - stream << '\n'; printResultType(); printOriginalExpression(); printReconstructedExpression(); diff --git a/packages/Catch2/projects/CMakeLists.txt b/packages/Catch2/projects/CMakeLists.txt index 8e2e4b13e..ac10793bd 100644 --- a/packages/Catch2/projects/CMakeLists.txt +++ b/packages/Catch2/projects/CMakeLists.txt @@ -303,7 +303,7 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) endif() if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) STRING(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # override default warning level - target_compile_options( SelfTest PRIVATE /w44265 /w44061 /w44062 ) + target_compile_options( SelfTest PRIVATE /w44265 /w44061 /w44062 /w45038 ) if (CATCH_ENABLE_WERROR) target_compile_options( SelfTest PRIVATE /WX) endif() diff --git a/packages/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt index 2b1b917a8..41b637128 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/compact.sw.approved.txt @@ -679,6 +679,7 @@ Condition.tests.cpp:<line number>: passed: cpc != 0 for: 0x<hex digits> != 0 Condition.tests.cpp:<line number>: passed: returnsNull() == 0 for: {null string} == 0 Condition.tests.cpp:<line number>: passed: returnsConstNull() == 0 for: {null string} == 0 Condition.tests.cpp:<line number>: passed: 0 != p for: 0 != 0x<hex digits> +Matchers.tests.cpp:<line number>: passed: "foo", Predicate<const char*>([] (const char* const&) { return true; }) for: "foo" matches undescribed predicate CmdLine.tests.cpp:<line number>: passed: result for: {?} CmdLine.tests.cpp:<line number>: passed: config.processName == "" for: "" == "" CmdLine.tests.cpp:<line number>: passed: result for: {?} diff --git a/packages/Catch2/projects/SelfTest/Baselines/console.std.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/console.std.approved.txt index 7d3a4db4f..50632eb97 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/console.std.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/console.std.approved.txt @@ -392,8 +392,7 @@ Message.tests.cpp:<line number>: FAILED: explicitly with message: This is a failure -Message.tests.cpp:<line number>: -warning: +Message.tests.cpp:<line number>: warning: This message appears in the output ------------------------------------------------------------------------------- @@ -402,8 +401,7 @@ INFO and WARN do not abort tests Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -warning: +Message.tests.cpp:<line number>: warning: this is a warning ------------------------------------------------------------------------------- @@ -528,8 +526,7 @@ Nice descriptive name Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -warning: +Misc.tests.cpp:<line number>: warning: This one ran ------------------------------------------------------------------------------- @@ -909,8 +906,7 @@ Where the LHS is not a simple value Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -warning: +Tricky.tests.cpp:<line number>: warning: Uncomment the code in this test to check that it gives a sensible compiler error @@ -920,8 +916,7 @@ Where there is more to the expression after the RHS Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -warning: +Tricky.tests.cpp:<line number>: warning: Uncomment the code in this test to check that it gives a sensible compiler error @@ -1098,6 +1093,6 @@ due to unexpected exception with message: Why would you throw a std::string? =============================================================================== -test cases: 215 | 162 passed | 49 failed | 4 failed as expected -assertions: 1233 | 1104 passed | 108 failed | 21 failed as expected +test cases: 216 | 163 passed | 49 failed | 4 failed as expected +assertions: 1234 | 1105 passed | 108 failed | 21 failed as expected diff --git a/packages/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt index 3085960ed..4aae20124 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/console.sw.approved.txt @@ -11,8 +11,7 @@ Randomness seeded to: 1 Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: yay @@ -23,14 +22,12 @@ with message: Decomposition.tests.cpp:<line number> ............................................................................... -Decomposition.tests.cpp:<line number>: -PASSED: +Decomposition.tests.cpp:<line number>: PASSED: REQUIRE( fptr == 0 ) with expansion: 0 == 0 -Decomposition.tests.cpp:<line number>: -PASSED: +Decomposition.tests.cpp:<line number>: PASSED: REQUIRE( fptr == 0l ) with expansion: 0 == 0 @@ -41,14 +38,12 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( y.v == 0 ) with expansion: 0 == 0 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( 0 == y.v ) with expansion: 0 == 0 @@ -59,38 +54,32 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 == t2 ) with expansion: {?} == {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 != t2 ) with expansion: {?} != {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 < t2 ) with expansion: {?} < {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 > t2 ) with expansion: {?} > {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 <= t2 ) with expansion: {?} <= {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 >= t2 ) with expansion: {?} >= {?} @@ -101,8 +90,7 @@ with expansion: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- #1238 @@ -110,8 +98,7 @@ PASSED: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( std::memcmp(uarr, "123", sizeof(uarr)) == 0 ) with expansion: 0 == 0 @@ -119,8 +106,7 @@ with messages: uarr := "123" sarr := "456" -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( std::memcmp(sarr, "456", sizeof(sarr)) == 0 ) with expansion: 0 == 0 @@ -134,8 +120,7 @@ with messages: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- #1403 @@ -143,8 +128,7 @@ PASSED: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( h1 == h2 ) with expansion: [1403 helper] == [1403 helper] @@ -181,8 +165,7 @@ due to unexpected exception with messages: Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( thisThrows() ) with message: answer := 42 @@ -193,8 +176,7 @@ with message: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( 42 == f ) with expansion: 42 == {?} @@ -205,38 +187,31 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( a == t ) with expansion: 3 == 3 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: CHECK( a == t ) with expansion: 3 == 3 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( throws_int(true) ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: CHECK_THROWS_AS( throws_int(true), int ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( throws_int(false) ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") ) with expansion: "aaa" ends with: "aaa" -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( templated_tests<int>(3) ) with expansion: true @@ -252,8 +227,7 @@ Misc.tests.cpp:<line number>: FAILED: with expansion: 1 == 0 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( errno == 1 ) with expansion: 1 == 1 @@ -264,8 +238,7 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( x == 4 ) with expansion: {?} == 4 @@ -279,8 +252,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -291,8 +263,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -303,8 +274,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -315,8 +285,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -327,8 +296,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -378,46 +346,38 @@ Condition.tests.cpp:<line number>: FAILED: Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( false == false ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( true == true ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( !false ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( false ) with expansion: !false -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( !falseValue ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( falseValue ) with expansion: !false -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( !(1 == 2) ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( 1 == 2 ) ------------------------------------------------------------------------------- @@ -427,14 +387,12 @@ PASSED: Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( is_true<true>::value == true ) with expansion: true == true -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true == is_true<true>::value ) with expansion: true == true @@ -446,14 +404,12 @@ with expansion: Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( is_true<false>::value == false ) with expansion: false == false -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( false == is_true<false>::value ) with expansion: false == false @@ -465,8 +421,7 @@ with expansion: Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( !is_true<false>::value ) with expansion: true @@ -478,8 +433,7 @@ with expansion: Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( !!is_true<true>::value ) with expansion: true @@ -491,14 +445,12 @@ with expansion: Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( is_true<true>::value ) with expansion: true -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( is_true<false>::value ) with expansion: !false @@ -509,8 +461,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 101 @@ -521,8 +472,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 102 @@ -533,8 +483,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 103 @@ -545,8 +494,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 104 @@ -557,8 +505,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 105 @@ -569,8 +516,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 106 @@ -581,8 +527,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 107 @@ -593,8 +538,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 108 @@ -605,8 +549,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 109 @@ -617,8 +560,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 1 < 110 @@ -629,8 +571,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 101 @@ -641,8 +582,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 102 @@ -653,8 +593,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 103 @@ -665,8 +604,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 104 @@ -677,8 +615,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 105 @@ -689,8 +626,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 106 @@ -701,8 +637,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 107 @@ -713,8 +648,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 108 @@ -725,8 +659,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 109 @@ -737,8 +670,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 2 < 110 @@ -749,8 +681,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 101 @@ -761,8 +692,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 102 @@ -773,8 +703,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 103 @@ -785,8 +714,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 104 @@ -797,8 +725,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 105 @@ -809,8 +736,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 106 @@ -821,8 +747,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 107 @@ -833,8 +758,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 108 @@ -845,8 +769,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 109 @@ -857,8 +780,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 3 < 110 @@ -869,8 +791,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 101 @@ -881,8 +802,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 102 @@ -893,8 +813,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 103 @@ -905,8 +824,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 104 @@ -917,8 +835,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 105 @@ -929,8 +846,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 106 @@ -941,8 +857,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 107 @@ -953,8 +868,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 108 @@ -965,8 +879,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 109 @@ -977,8 +890,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 4 < 110 @@ -989,8 +901,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 101 @@ -1001,8 +912,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 102 @@ -1013,8 +923,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 103 @@ -1025,8 +934,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 104 @@ -1037,8 +945,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 105 @@ -1049,8 +956,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 106 @@ -1061,8 +967,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 107 @@ -1073,8 +978,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 108 @@ -1085,8 +989,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 109 @@ -1097,8 +1000,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 5 < 110 @@ -1109,8 +1011,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 101 @@ -1121,8 +1022,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 102 @@ -1133,8 +1033,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 103 @@ -1145,8 +1044,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 104 @@ -1157,8 +1055,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 105 @@ -1169,8 +1066,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 106 @@ -1181,8 +1077,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 107 @@ -1193,8 +1088,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 108 @@ -1205,8 +1099,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 109 @@ -1217,8 +1110,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 6 < 110 @@ -1229,8 +1121,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 101 @@ -1241,8 +1132,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 102 @@ -1253,8 +1143,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 103 @@ -1265,8 +1154,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 104 @@ -1277,8 +1165,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 105 @@ -1289,8 +1176,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 106 @@ -1301,8 +1187,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 107 @@ -1313,8 +1198,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 108 @@ -1325,8 +1209,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 109 @@ -1337,8 +1220,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 7 < 110 @@ -1349,8 +1231,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 101 @@ -1361,8 +1242,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 102 @@ -1373,8 +1253,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 103 @@ -1385,8 +1264,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 104 @@ -1397,8 +1275,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 105 @@ -1409,8 +1286,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 106 @@ -1421,8 +1297,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 107 @@ -1433,8 +1308,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 108 @@ -1445,8 +1319,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 109 @@ -1457,8 +1330,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 8 < 110 @@ -1469,8 +1341,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 101 @@ -1481,8 +1352,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 102 @@ -1493,8 +1363,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 103 @@ -1505,8 +1374,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 104 @@ -1517,8 +1385,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 105 @@ -1529,8 +1396,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 106 @@ -1541,8 +1407,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 107 @@ -1553,8 +1418,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 108 @@ -1565,8 +1429,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 109 @@ -1577,8 +1440,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 9 < 110 @@ -1589,8 +1451,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 101 @@ -1601,8 +1462,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 102 @@ -1613,8 +1473,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 103 @@ -1625,8 +1484,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 104 @@ -1637,8 +1495,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 105 @@ -1649,8 +1506,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 106 @@ -1661,8 +1517,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 107 @@ -1673,8 +1528,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 108 @@ -1685,8 +1539,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 109 @@ -1697,8 +1550,7 @@ with expansion: Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: CHECK( x < y ) with expansion: 10 < 110 @@ -1720,8 +1572,7 @@ A METHOD_AS_TEST_CASE based test run that succeeds Class.tests.cpp:<line number> ............................................................................... -Class.tests.cpp:<line number>: -PASSED: +Class.tests.cpp:<line number>: PASSED: REQUIRE( s == "hello" ) with expansion: "hello" == "hello" @@ -1743,8 +1594,7 @@ A TEST_CASE_METHOD based test run that succeeds Class.tests.cpp:<line number> ............................................................................... -Class.tests.cpp:<line number>: -PASSED: +Class.tests.cpp:<line number>: PASSED: REQUIRE( m_a == 1 ) with expansion: 1 == 1 @@ -1755,38 +1605,32 @@ A comparison that uses literals instead of the normal constructor Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == 1.23_a ) with expansion: 1.23 == Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != 1.22_a ) with expansion: 1.23 != Approx( 1.22 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( -d == -1.23_a ) with expansion: -1.23 == Approx( -1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == 1.2_a .epsilon(.1) ) with expansion: 1.23 == Approx( 1.2 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != 1.2_a .epsilon(.001) ) with expansion: 1.23 != Approx( 1.2 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == 1_a .epsilon(.3) ) with expansion: 1.23 == Approx( 1.0 ) @@ -1799,8 +1643,7 @@ A couple of nested sections followed by a failure Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: that's not flying - that's failing in style @@ -1836,38 +1679,32 @@ Absolute margin Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 104.0 != Approx(100.0) ) with expansion: 104.0 != Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 104.0 == Approx(100.0).margin(5) ) with expansion: 104.0 == Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 104.0 == Approx(100.0).margin(4) ) with expansion: 104.0 == Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 104.0 != Approx(100.0).margin(3) ) with expansion: 104.0 != Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 100.3 != Approx(100.0) ) with expansion: 100.3 != Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 100.3 == Approx(100.0).margin(0.5) ) with expansion: 100.3 == Approx( 100.0 ) @@ -1887,14 +1724,12 @@ An expression with side-effects should only be evaluated once Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( i++ == 7 ) with expansion: 7 == 7 -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( i++ == 8 ) with expansion: 8 == 8 @@ -1905,8 +1740,7 @@ An unchecked exception reports the line of the last assertion Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: CHECK( 1 == 1 ) Exception.tests.cpp:<line number>: FAILED: @@ -1920,8 +1754,7 @@ Anonymous test case 1 VariadicMacros.tests.cpp:<line number> ............................................................................... -VariadicMacros.tests.cpp:<line number>: -PASSED: +VariadicMacros.tests.cpp:<line number>: PASSED: with message: anonymous test case @@ -1931,32 +1764,25 @@ Approx setters validate their arguments Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( Approx(0).margin(0) ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( Approx(0).margin(1234656) ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( Approx(0).margin(-2), std::domain_error ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( Approx(0).epsilon(0) ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( Approx(0).epsilon(1) ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( Approx(0).epsilon(-0.001), std::domain_error ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( Approx(0).epsilon(1.0001), std::domain_error ) ------------------------------------------------------------------------------- @@ -1965,32 +1791,27 @@ Approx with exactly-representable margin Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: CHECK( 0.25f == Approx(0.0f).margin(0.25f) ) with expansion: 0.25f == Approx( 0.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: CHECK( 0.0f == Approx(0.25f).margin(0.25f) ) with expansion: 0.0f == Approx( 0.25 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: CHECK( 0.5f == Approx(0.25f).margin(0.25f) ) with expansion: 0.5f == Approx( 0.25 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: CHECK( 245.0f == Approx(245.25f).margin(0.25f) ) with expansion: 245.0f == Approx( 245.25 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: CHECK( 245.5f == Approx(245.25f).margin(0.25f) ) with expansion: 245.5f == Approx( 245.25 ) @@ -2001,14 +1822,12 @@ Approximate PI Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) ) with expansion: 3.1428571429 == Approx( 3.141 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) ) with expansion: 3.1428571429 != Approx( 3.141 ) @@ -2019,14 +1838,12 @@ Approximate comparisons with different epsilons Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != Approx( 1.231 ) ) with expansion: 1.23 != Approx( 1.231 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) ) with expansion: 1.23 == Approx( 1.231 ) @@ -2037,14 +1854,12 @@ Approximate comparisons with floats Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 1.23f == Approx( 1.23f ) ) with expansion: 1.23f == Approx( 1.2300000191 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 0.0f == Approx( 0.0f ) ) with expansion: 0.0f == Approx( 0.0 ) @@ -2055,14 +1870,12 @@ Approximate comparisons with ints Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 1 == Approx( 1 ) ) with expansion: 1 == Approx( 1.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 0 == Approx( 0 ) ) with expansion: 0 == Approx( 0.0 ) @@ -2073,32 +1886,27 @@ Approximate comparisons with mixed numeric types Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 1.0f == Approx( 1 ) ) with expansion: 1.0f == Approx( 1.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 0 == Approx( dZero) ) with expansion: 0 == Approx( 0.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 0 == Approx( dSmall ).margin( 0.001 ) ) with expansion: 0 == Approx( 0.00001 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 1.234f == Approx( dMedium ) ) with expansion: 1.234f == Approx( 1.234 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( dMedium == Approx( 1.234f ) ) with expansion: 1.234 == Approx( 1.2339999676 ) @@ -2110,14 +1918,12 @@ Arbitrary predicate matcher Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1, Predicate<int>(alwaysTrue, "always true") ) with expansion: 1 matches predicate: "always true" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1, !Predicate<int>(alwaysFalse, "always false") ) with expansion: 1 not matches predicate: "always false" @@ -2129,14 +1935,12 @@ Arbitrary predicate matcher Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( "Hello olleH", Predicate<std::string>( [] (std::string const& str) -> bool { return str.front() == str.back(); }, "First and last character should be equal") ) with expansion: "Hello olleH" matches predicate: "First and last character should be equal" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( "This wouldn't pass", !Predicate<std::string>( [] (std::string const& str) -> bool { return str.front() == str.back(); } ) ) with expansion: "This wouldn't pass" not matches undescribed predicate @@ -2147,8 +1951,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2158,8 +1961,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2170,8 +1972,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2180,8 +1981,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2191,8 +1991,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2203,8 +2002,7 @@ Assertions then sections Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) ------------------------------------------------------------------------------- @@ -2213,20 +2011,17 @@ Assorted miscellaneous tests Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( INFINITY == Approx(INFINITY) ) with expansion: inff == Approx( inf ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( NAN != Approx(NAN) ) with expansion: nanf != Approx( nan ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( NAN == Approx(NAN) ) with expansion: !(nanf == Approx( nan )) @@ -2237,14 +2032,12 @@ Bitfields can be captured (#1027) Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( y.v == 0 ) with expansion: 0 == 0 -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( 0 == y.v ) with expansion: 0 == 0 @@ -2256,8 +2049,7 @@ Capture and info messages ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( true ) with message: i := 2 @@ -2269,8 +2061,7 @@ Capture and info messages ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( true ) with message: 3 @@ -2282,26 +2073,22 @@ Character pretty printing ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( tab == '\t' ) with expansion: '\t' == '\t' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( newline == '\n' ) with expansion: '\n' == '\n' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( carr_return == '\r' ) with expansion: '\r' == '\r' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( form_feed == '\f' ) with expansion: '\f' == '\f' @@ -2313,32 +2100,27 @@ Character pretty printing ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( space == ' ' ) with expansion: ' ' == ' ' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == chars[i] ) with expansion: 'a' == 'a' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == chars[i] ) with expansion: 'z' == 'z' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == chars[i] ) with expansion: 'A' == 'A' -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == chars[i] ) with expansion: 'Z' == 'Z' @@ -2350,32 +2132,27 @@ Character pretty printing ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: CHECK( null_terminator == '\0' ) with expansion: 0 == 0 -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == i ) with expansion: 2 == 2 -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == i ) with expansion: 3 == 3 -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == i ) with expansion: 4 == 4 -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( c == i ) with expansion: 5 == 5 @@ -2386,64 +2163,52 @@ Commas in various macros are allowed Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} ) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK_THROWS( std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} ) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} ) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK_NOTHROW( std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} ) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( std::vector<int>{1, 2} == std::vector<int>{1, 2} ) with expansion: { 1, 2 } == { 1, 2 } -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK( std::vector<int>{1, 2} == std::vector<int>{1, 2} ) with expansion: { 1, 2 } == { 1, 2 } -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( std::vector<int>{1, 2} == std::vector<int>{1, 2, 3} ) with expansion: !({ 1, 2 } == { 1, 2, 3 }) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK_FALSE( std::vector<int>{1, 2} == std::vector<int>{1, 2, 3} ) with expansion: !({ 1, 2 } == { 1, 2, 3 }) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK_NOFAIL( std::vector<int>{1, 2} == std::vector<int>{1, 2} ) with expansion: { 1, 2 } == { 1, 2 } -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECKED_IF( std::vector<int>{1, 2} == std::vector<int>{1, 2} ) with expansion: { 1, 2 } == { 1, 2 } -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( true ) -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECKED_ELSE( std::vector<int>{1, 2} == std::vector<int>{1, 2} ) with expansion: { 1, 2 } == { 1, 2 } @@ -2454,14 +2219,12 @@ Comparing function pointers Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( a ) with expansion: 0x<hex digits> -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( a == &foo ) with expansion: 0x<hex digits> == 0x<hex digits> @@ -2472,74 +2235,62 @@ Comparison with explicitly convertible types Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td == Approx(10.0) ) with expansion: StrongDoubleTypedef(10) == Approx( 10.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(10.0) == td ) with expansion: Approx( 10.0 ) == StrongDoubleTypedef(10) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td != Approx(11.0) ) with expansion: StrongDoubleTypedef(10) != Approx( 11.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(11.0) != td ) with expansion: Approx( 11.0 ) != StrongDoubleTypedef(10) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td <= Approx(10.0) ) with expansion: StrongDoubleTypedef(10) <= Approx( 10.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td <= Approx(11.0) ) with expansion: StrongDoubleTypedef(10) <= Approx( 11.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(10.0) <= td ) with expansion: Approx( 10.0 ) <= StrongDoubleTypedef(10) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(9.0) <= td ) with expansion: Approx( 9.0 ) <= StrongDoubleTypedef(10) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td >= Approx(9.0) ) with expansion: StrongDoubleTypedef(10) >= Approx( 9.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( td >= Approx(td) ) with expansion: StrongDoubleTypedef(10) >= Approx( 10.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(td) >= td ) with expansion: Approx( 10.0 ) >= StrongDoubleTypedef(10) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx(11.0) >= td ) with expansion: Approx( 11.0 ) >= StrongDoubleTypedef(10) @@ -2550,8 +2301,7 @@ Comparisons between ints where one side is computed Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( 54 == 6*9 ) with expansion: 54 == 54 @@ -2563,38 +2313,32 @@ behaviour Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( ( -1 > 2u ) ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( -1 > 2u ) with expansion: -1 > 2 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( ( 2u < -1 ) ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( 2u < -1 ) with expansion: 2 < -1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( ( minInt > 2u ) ) with expansion: true -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: CHECK( minInt > 2u ) with expansion: -2147483648 > 2 @@ -2605,80 +2349,67 @@ Comparisons with int literals don't warn when mixing signed/ unsigned Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( i == 1 ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( ui == 2 ) with expansion: 2 == 2 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( l == 3 ) with expansion: 3 == 3 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( ul == 4 ) with expansion: 4 == 4 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( c == 5 ) with expansion: 5 == 5 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( uc == 6 ) with expansion: 6 == 6 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 1 == i ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 2 == ui ) with expansion: 2 == 2 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 3 == l ) with expansion: 3 == 3 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 4 == ul ) with expansion: 4 == 4 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 5 == c ) with expansion: 5 == 5 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 6 == uc ) with expansion: 6 == 6 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( (std::numeric_limits<uint32_t>::max)() > ul ) with expansion: 4294967295 (0x<hex digits>) > 4 @@ -2738,14 +2469,12 @@ Default scale is invisible to comparison Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 101.000001 != Approx(100).epsilon(0.01) ) with expansion: 101.000001 != Approx( 100.0 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( std::pow(10, -5) != Approx(std::pow(10, -7)) ) with expansion: 0.00001 != Approx( 0.0000001 ) @@ -2773,8 +2502,7 @@ Epsilon only applies to Approx's value Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( 101.01 != Approx(100).epsilon(0.01) ) with expansion: 101.01 != Approx( 100.0 ) @@ -2856,44 +2584,37 @@ Equality checks that should succeed Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven == 7 ) with expansion: 7 == 7 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one == Approx( 9.1f ) ) with expansion: 9.1f == Approx( 9.1000003815 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.double_pi == Approx( 3.1415926535 ) ) with expansion: 3.1415926535 == Approx( 3.1415926535 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello == "hello" ) with expansion: "hello" == "hello" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( "hello" == data.str_hello ) with expansion: "hello" == "hello" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello.size() == 5 ) with expansion: 5 == 5 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( x == Approx( 1.3 ) ) with expansion: 1.3 == Approx( 1.3 ) @@ -2904,15 +2625,13 @@ Equals Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Equals("this string contains 'abc' as a substring") ) with expansion: "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Equals("this string contains 'ABC' as a substring", Catch::CaseSensitive::No) ) with expansion: "this string contains 'abc' as a substring" equals: "this string contains @@ -2942,22 +2661,19 @@ Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(WhatException{}) == "This exception has overriden what() method" ) with expansion: "This exception has overriden what() method" == "This exception has overriden what() method" -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(OperatorException{}) == "OperatorException" ) with expansion: "OperatorException" == "OperatorException" -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(StringMakerException{}) == "StringMakerException" ) with expansion: "StringMakerException" @@ -3019,14 +2735,12 @@ Exception matchers that succeed Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THROWS_MATCHES( throws(1), SpecialException, ExceptionMatcher{1} ) with expansion: SpecialException::what special exception has value of 1 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_MATCHES( throws(2), SpecialException, ExceptionMatcher{2} ) with expansion: SpecialException::what special exception has value of 2 @@ -3038,8 +2752,7 @@ Exception messages can be tested for Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), "expected exception" ) with expansion: "expected exception" equals: "expected exception" @@ -3051,8 +2764,7 @@ Exception messages can be tested for Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No ) ) with expansion: "expected exception" equals: "expected exception" (case insensitive) @@ -3064,26 +2776,22 @@ Exception messages can be tested for Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), StartsWith( "expected" ) ) with expansion: "expected exception" starts with: "expected" -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), EndsWith( "exception" ) ) with expansion: "expected exception" ends with: "exception" -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), Contains( "except" ) ) with expansion: "expected exception" contains: "except" -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), Contains( "exCept", Catch::CaseSensitive::No ) ) with expansion: "expected exception" contains: "except" (case insensitive) @@ -3136,8 +2844,7 @@ Message.tests.cpp:<line number>: FAILED: explicitly with message: This is a failure -Message.tests.cpp:<line number>: -warning: +Message.tests.cpp:<line number>: warning: This message appears in the output ------------------------------------------------------------------------------- @@ -3146,32 +2853,27 @@ Factorials are computed Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( Factorial(0) == 1 ) with expansion: 1 == 1 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( Factorial(1) == 1 ) with expansion: 1 == 1 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( Factorial(2) == 2 ) with expansion: 2 == 2 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( Factorial(3) == 6 ) with expansion: 6 == 6 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( Factorial(10) == 3628800 ) with expansion: 3628800 (0x<hex digits>) == 3628800 (0x<hex digits>) @@ -3183,56 +2885,47 @@ Floating point matchers: double Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1., WithinAbs(1., 0) ) with expansion: 1.0 is within 0.0 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0., WithinAbs(1., 1) ) with expansion: 0.0 is within 1.0 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0., !WithinAbs(1., 0.99) ) with expansion: 0.0 not is within 0.99 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0., !WithinAbs(1., 0.99) ) with expansion: 0.0 not is within 0.99 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !WithinAbs(NAN, 0) ) with expansion: nanf not is within 0.0 of nan -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 11., !WithinAbs(10., 0.5) ) with expansion: 11.0 not is within 0.5 of 10.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 10., !WithinAbs(11., 0.5) ) with expansion: 10.0 not is within 0.5 of 11.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -10., WithinAbs(-10., 0.5) ) with expansion: -10.0 is within 0.5 of -10.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -10., WithinAbs(-9.6, 0.5) ) with expansion: -10.0 is within 0.5 of -9.6 @@ -3244,44 +2937,37 @@ Floating point matchers: double Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1., WithinULP(1., 0) ) with expansion: 1.0 is within 0 ULPs of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1., 2.), WithinULP(1., 1) ) with expansion: 1.0 is within 1 ULPs of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1., 0.), WithinULP(1., 1) ) with expansion: 1.0 is within 1 ULPs of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1., 2.), !WithinULP(1., 0) ) with expansion: 1.0 not is within 0 ULPs of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1., WithinULP(1., 0) ) with expansion: 1.0 is within 0 ULPs of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -0., WithinULP(0., 0) ) with expansion: -0.0 is within 0 ULPs of 0.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !WithinULP(NAN, 123) ) with expansion: nanf not is within 123 ULPs of nanf @@ -3293,20 +2979,17 @@ Floating point matchers: double Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1., WithinAbs(1., 0.5) || WithinULP(2., 1) ) with expansion: 1.0 ( is within 0.5 of 1.0 or is within 1 ULPs of 2.0 ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1., WithinAbs(2., 0.5) || WithinULP(1., 0) ) with expansion: 1.0 ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0 ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) ) with expansion: nanf not ( is within 100.0 of nan or is within 123 ULPs of nanf ) @@ -3318,20 +3001,16 @@ Floating point matchers: double Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( WithinAbs(1., 0.) ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( WithinAbs(1., -1.), std::domain_error ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( WithinULP(1., 0) ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( WithinULP(1., -1), std::domain_error ) ------------------------------------------------------------------------------- @@ -3341,62 +3020,52 @@ Floating point matchers: float Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1.f, WithinAbs(1.f, 0) ) with expansion: 1.0f is within 0.0 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0.f, WithinAbs(1.f, 1) ) with expansion: 0.0f is within 1.0 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0.f, !WithinAbs(1.f, 0.99f) ) with expansion: 0.0f not is within 0.9900000095 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0.f, !WithinAbs(1.f, 0.99f) ) with expansion: 0.0f not is within 0.9900000095 of 1.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 0.f, WithinAbs(-0.f, 0) ) with expansion: 0.0f is within 0.0 of -0.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !WithinAbs(NAN, 0) ) with expansion: nanf not is within 0.0 of nan -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 11.f, !WithinAbs(10.f, 0.5f) ) with expansion: 11.0f not is within 0.5 of 10.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 10.f, !WithinAbs(11.f, 0.5f) ) with expansion: 10.0f not is within 0.5 of 11.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -10.f, WithinAbs(-10.f, 0.5f) ) with expansion: -10.0f is within 0.5 of -10.0 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -10.f, WithinAbs(-9.6f, 0.5f) ) with expansion: -10.0f is within 0.5 of -9.6000003815 @@ -3408,44 +3077,37 @@ Floating point matchers: float Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1.f, WithinULP(1.f, 0) ) with expansion: 1.0f is within 0 ULPs of 1.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1.f, 2.f), WithinULP(1.f, 1) ) with expansion: 1.0f is within 1 ULPs of 1.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1.f, 0.f), WithinULP(1.f, 1) ) with expansion: 1.0f is within 1 ULPs of 1.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( nextafter(1.f, 2.f), !WithinULP(1.f, 0) ) with expansion: 1.0f not is within 0 ULPs of 1.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1.f, WithinULP(1.f, 0) ) with expansion: 1.0f is within 0 ULPs of 1.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( -0.f, WithinULP(0.f, 0) ) with expansion: -0.0f is within 0 ULPs of 0.0f -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !WithinULP(NAN, 123) ) with expansion: nanf not is within 123 ULPs of nanf @@ -3457,20 +3119,17 @@ Floating point matchers: float Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1.f, WithinAbs(1.f, 0.5) || WithinULP(1.f, 1) ) with expansion: 1.0f ( is within 0.5 of 1.0 or is within 1 ULPs of 1.0f ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( 1.f, WithinAbs(2.f, 0.5) || WithinULP(1.f, 0) ) with expansion: 1.0f ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0f ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) ) with expansion: nanf not ( is within 100.0 of nan or is within 123 ULPs of nanf ) @@ -3482,20 +3141,16 @@ Floating point matchers: float Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( WithinAbs(1.f, 0.f) ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( WithinAbs(1.f, -1.f), std::domain_error ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( WithinULP(1.f, 0) ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( WithinULP(1.f, -1), std::domain_error ) ------------------------------------------------------------------------------- @@ -3505,8 +3160,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 8 @@ -3518,8 +3172,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 9 @@ -3531,8 +3184,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 10 @@ -3544,8 +3196,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 2 @@ -3557,8 +3208,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 3.141 @@ -3570,8 +3220,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "a" j := 1.379 @@ -3583,8 +3232,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 8 @@ -3596,8 +3244,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 9 @@ -3609,8 +3256,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 10 @@ -3622,8 +3268,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 2 @@ -3635,8 +3280,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 3.141 @@ -3648,8 +3292,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "b" j := 1.379 @@ -3661,8 +3304,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 8 @@ -3674,8 +3316,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 9 @@ -3687,8 +3328,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 10 @@ -3700,8 +3340,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 2 @@ -3713,8 +3352,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 3.141 @@ -3726,8 +3364,7 @@ Generators Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: with messages: i := "c" j := 1.379 @@ -3739,20 +3376,17 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen.size() == 2 ) with expansion: 2 == 2 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[0] == 1 ) with expansion: 1 == 1 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[1] == 2 ) with expansion: 2 == 2 @@ -3764,32 +3398,27 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen.size() == 4 ) with expansion: 4 == 4 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[0] == 3 ) with expansion: 3 == 3 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[1] == 1 ) with expansion: 1 == 1 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[2] == 4 ) with expansion: 4 == 4 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[3] == 1 ) with expansion: 1 == 1 @@ -3801,32 +3430,27 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen.size() == 4 ) with expansion: 4 == 4 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[0] == 1 ) with expansion: 1 == 1 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[1] == 2 ) with expansion: 2 == 2 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[2] == 9 ) with expansion: 9 == 9 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[3] == 7 ) with expansion: 7 == 7 @@ -3838,20 +3462,17 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen.size() == 2 ) with expansion: 2 == 2 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[0] == 3 ) with expansion: 3 == 3 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[1] == 1 ) with expansion: 1 == 1 @@ -3863,20 +3484,17 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen.size() == 2 ) with expansion: 2 == 2 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[0] == 3 ) with expansion: 3 == 3 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( gen[1] == 1 ) with expansion: 1 == 1 @@ -3888,32 +3506,27 @@ Generators impl GeneratorsImpl.tests.cpp:<line number> ............................................................................... -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( base->size() == 4 ) with expansion: 4 == 4 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: REQUIRE( typed ) with expansion: 0x<hex digits> -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( typed->size() == 4 ) with expansion: 4 == 4 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( (*typed)[0] == 7 ) with expansion: 7 == 7 -GeneratorsImpl.tests.cpp:<line number>: -PASSED: +GeneratorsImpl.tests.cpp:<line number>: PASSED: CHECK( (*typed)[3] == 11 ) with expansion: 11 == 11 @@ -3924,26 +3537,22 @@ Greater-than inequalities with different epsilons Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d >= Approx( 1.22 ) ) with expansion: 1.23 >= Approx( 1.22 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d >= Approx( 1.23 ) ) with expansion: 1.23 >= Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( d >= Approx( 1.24 ) ) with expansion: !(1.23 >= Approx( 1.24 )) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d >= Approx( 1.24 ).epsilon(0.1) ) with expansion: 1.23 >= Approx( 1.24 ) @@ -3954,8 +3563,7 @@ INFO and WARN do not abort tests Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -warning: +Message.tests.cpp:<line number>: warning: this is a message this is a warning @@ -3982,8 +3590,7 @@ INFO gets logged on failure, even if captured before successful assertions Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: CHECK( a == 2 ) with expansion: 2 == 2 @@ -4007,8 +3614,7 @@ with messages: this message should be logged and this, but later -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: CHECK( a == 2 ) with expansion: 2 == 2 @@ -4024,8 +3630,7 @@ INFO is reset for each loop Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 0 < 10 @@ -4033,8 +3638,7 @@ with messages: current counter 0 i := 0 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 1 < 10 @@ -4042,8 +3646,7 @@ with messages: current counter 1 i := 1 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 2 < 10 @@ -4051,8 +3654,7 @@ with messages: current counter 2 i := 2 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 3 < 10 @@ -4060,8 +3662,7 @@ with messages: current counter 3 i := 3 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 4 < 10 @@ -4069,8 +3670,7 @@ with messages: current counter 4 i := 4 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 5 < 10 @@ -4078,8 +3678,7 @@ with messages: current counter 5 i := 5 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 6 < 10 @@ -4087,8 +3686,7 @@ with messages: current counter 6 i := 6 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 7 < 10 @@ -4096,8 +3694,7 @@ with messages: current counter 7 i := 7 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 8 < 10 @@ -4105,8 +3702,7 @@ with messages: current counter 8 i := 8 -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: REQUIRE( i < 10 ) with expansion: 9 < 10 @@ -4159,68 +3755,57 @@ Inequality checks that should succeed Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven != 6 ) with expansion: 7 != 6 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven != 8 ) with expansion: 7 != 8 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.11f ) ) with expansion: 9.1f != Approx( 9.1099996567 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.0f ) ) with expansion: 9.1f != Approx( 9.0 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one != Approx( 1 ) ) with expansion: 9.1f != Approx( 1.0 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one != Approx( 0 ) ) with expansion: 9.1f != Approx( 0.0 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.double_pi != Approx( 3.1415 ) ) with expansion: 3.1415926535 != Approx( 3.1415 ) -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello != "goodbye" ) with expansion: "hello" != "goodbye" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello != "hell" ) with expansion: "hello" != "hell" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello != "hello1" ) with expansion: "hello" != "hello1" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello.size() != 6 ) with expansion: 5 != 6 @@ -4231,26 +3816,22 @@ Less-than inequalities with different epsilons Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d <= Approx( 1.24 ) ) with expansion: 1.23 <= Approx( 1.24 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d <= Approx( 1.23 ) ) with expansion: 1.23 <= Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( d <= Approx( 1.22 ) ) with expansion: !(1.23 <= Approx( 1.22 )) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d <= Approx( 1.22 ).epsilon(0.1) ) with expansion: 1.23 <= Approx( 1.22 ) @@ -4261,8 +3842,7 @@ ManuallyRegistered Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: was called @@ -4272,8 +3852,7 @@ Matchers can be (AllOf) composed with the && operator Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Contains("string") && Contains("abc") && Contains("substring") && Contains("contains") ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" and @@ -4285,15 +3864,13 @@ Matchers can be (AnyOf) composed with the || operator Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Contains("string") || Contains("different") || Contains("random") ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" ) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching2(), Contains("string") || Contains("different") || Contains("random") ) with expansion: "some completely different text that contains one common word" ( contains: @@ -4305,8 +3882,7 @@ Matchers can be composed with both && and || Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), (Contains("string") || Contains("different")) && Contains("substring") ) with expansion: "this string contains 'abc' as a substring" ( ( contains: "string" or @@ -4330,8 +3906,7 @@ Matchers can be negated (Not) with the ! operator Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), !Contains("different") ) with expansion: "this string contains 'abc' as a substring" not contains: "different" @@ -4353,8 +3928,7 @@ Mismatching exception messages failing the test Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_WITH( thisThrows(), "expected exception" ) with expansion: "expected exception" equals: "expected exception" @@ -4370,8 +3944,7 @@ Nice descriptive name Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -warning: +Misc.tests.cpp:<line number>: warning: This one ran @@ -4393,20 +3966,17 @@ Objects that evaluated in boolean contexts can be checked Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK( True ) with expansion: {?} -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK( !False ) with expansion: true -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK_FALSE( False ) with expansion: !{?} @@ -4417,13 +3987,11 @@ Optionally static assertions Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: with message: std::is_void<void>::value -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: with message: !(std::is_void<int>::value) @@ -4534,104 +4102,87 @@ Ordering comparison checks that should succeed Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven < 8 ) with expansion: 7 < 8 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven > 6 ) with expansion: 7 > 6 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven > 0 ) with expansion: 7 > 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven > -1 ) with expansion: 7 > -1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven >= 7 ) with expansion: 7 >= 7 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven >= 6 ) with expansion: 7 >= 6 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven <= 7 ) with expansion: 7 <= 7 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.int_seven <= 8 ) with expansion: 7 <= 8 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one > 9 ) with expansion: 9.1f > 9 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one < 10 ) with expansion: 9.1f < 10 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.float_nine_point_one < 9.2 ) with expansion: 9.1f < 9.2 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello <= "hello" ) with expansion: "hello" <= "hello" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello >= "hello" ) with expansion: "hello" >= "hello" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello < "hellp" ) with expansion: "hello" < "hellp" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello < "zebra" ) with expansion: "hello" < "zebra" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello > "hellm" ) with expansion: "hello" > "hellm" -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( data.str_hello > "a" ) with expansion: "hello" > "a" @@ -4665,20 +4216,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -4690,20 +4238,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches(tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -4715,20 +4260,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -4740,20 +4282,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true @@ -4765,20 +4304,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true @@ -4790,26 +4326,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false @@ -4821,38 +4353,32 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( parseTestSpec( "*a" ).matches( tcA ) == true ) with expansion: true == true @@ -4864,38 +4390,32 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( parseTestSpec( "a*" ).matches( tcA ) == true ) with expansion: true == true @@ -4907,38 +4427,32 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true ) with expansion: true == true @@ -4950,20 +4464,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -4975,20 +4486,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -5000,20 +4508,17 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false @@ -5025,32 +4530,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5062,32 +4562,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5099,26 +4594,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false @@ -5130,26 +4621,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true @@ -5161,26 +4648,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true @@ -5192,26 +4675,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true @@ -5223,32 +4702,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5260,26 +4734,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true @@ -5291,26 +4761,22 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false @@ -5322,32 +4788,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5359,32 +4820,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5396,32 +4852,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5433,32 +4884,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5470,32 +4916,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5507,32 +4948,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5544,32 +4980,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5581,32 +5012,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5618,32 +5044,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == false ) with expansion: false == false @@ -5655,32 +5076,27 @@ Parse test names and tags CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.hasFilters() == true ) with expansion: true == true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcA ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcB ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcC ) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( spec.matches( tcD ) == true ) with expansion: true == true @@ -5691,54 +5107,57 @@ Pointers can be compared to null Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( p == 0 ) with expansion: 0 == 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( p == pNULL ) with expansion: 0 == 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( p != 0 ) with expansion: 0x<hex digits> != 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( cp != 0 ) with expansion: 0x<hex digits> != 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( cpc != 0 ) with expansion: 0x<hex digits> != 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( returnsNull() == 0 ) with expansion: {null string} == 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( returnsConstNull() == 0 ) with expansion: {null string} == 0 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( 0 != p ) with expansion: 0 != 0x<hex digits> +------------------------------------------------------------------------------- +Predicate matcher can accept const char* +------------------------------------------------------------------------------- +Matchers.tests.cpp:<line number> +............................................................................... + +Matchers.tests.cpp:<line number>: PASSED: + REQUIRE_THAT( "foo", Predicate<const char*>([] (const char* const&) { return true; }) ) +with expansion: + "foo" matches undescribed predicate + ------------------------------------------------------------------------------- Process can be configured on command line empty args don't cause a crash @@ -5746,14 +5165,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( result ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.processName == "" ) with expansion: "" == "" @@ -5765,44 +5182,37 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( result ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.processName == "test" ) with expansion: "test" == "test" -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.shouldDebugBreak == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.abortAfter == -1 ) with expansion: -1 == -1 -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.noThrow == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.reporterName == "console" ) with expansion: "console" == "console" -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK_FALSE( cfg.hasTestFilters() ) with expansion: !false @@ -5815,26 +5225,22 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( result ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.hasTestFilters() ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("notIncluded")) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) ) with expansion: true @@ -5847,26 +5253,22 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( result ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.hasTestFilters() ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) ) with expansion: true @@ -5879,26 +5281,22 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( result ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.hasTestFilters() ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("test1")) == false ) with expansion: false == false -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) ) with expansion: true @@ -5911,14 +5309,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-r", "console"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.reporterName == "console" ) with expansion: "console" == "console" @@ -5931,14 +5327,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-r", "xml"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.reporterName == "xml" ) with expansion: "xml" == "xml" @@ -5951,14 +5345,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--reporter", "junit"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.reporterName == "junit" ) with expansion: "junit" == "junit" @@ -5971,8 +5363,7 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE_FALSE( cli.parse({ "test", "-r", "xml", "-r", "junit" }) ) with expansion: !{?} @@ -5985,14 +5376,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( !result ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE_THAT( result.errorMessage(), Contains("Unrecognized reporter") ) with expansion: "Unrecognized reporter, 'unsupported'. Check available with --list-reporters" @@ -6006,14 +5395,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-b"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.shouldDebugBreak == true ) with expansion: true == true @@ -6026,14 +5413,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--break"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.shouldDebugBreak ) with expansion: true @@ -6046,14 +5431,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-a"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.abortAfter == 1 ) with expansion: 1 == 1 @@ -6066,14 +5449,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-x", "2"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.abortAfter == 2 ) with expansion: 2 == 2 @@ -6086,14 +5467,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( !result ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE_THAT( result.errorMessage(), Contains("convert") && Contains("oops") ) with expansion: "Unable to convert 'oops' to destination type" ( contains: "convert" and @@ -6107,14 +5486,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-e"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.noThrow ) with expansion: true @@ -6127,14 +5504,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--nothrow"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.noThrow ) with expansion: true @@ -6147,14 +5522,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-o", "filename.ext"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.outputFilename == "filename.ext" ) with expansion: "filename.ext" == "filename.ext" @@ -6167,14 +5540,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--out", "filename.ext"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.outputFilename == "filename.ext" ) with expansion: "filename.ext" == "filename.ext" @@ -6187,26 +5558,22 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "-abe"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.abortAfter == 1 ) with expansion: 1 == 1 -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.shouldDebugBreak ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( config.noThrow == true ) with expansion: true == true @@ -6219,14 +5586,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.useColour == UseColour::Auto ) with expansion: 0 == 0 @@ -6239,14 +5604,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--use-colour", "auto"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.useColour == UseColour::Auto ) with expansion: 0 == 0 @@ -6259,14 +5622,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--use-colour", "yes"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.useColour == UseColour::Yes ) with expansion: 1 == 1 @@ -6279,14 +5640,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( cli.parse({"test", "--use-colour", "no"}) ) with expansion: {?} -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: REQUIRE( config.useColour == UseColour::No ) with expansion: 2 == 2 @@ -6299,14 +5658,12 @@ Process can be configured on command line CmdLine.tests.cpp:<line number> ............................................................................... -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK( !result ) with expansion: true -CmdLine.tests.cpp:<line number>: -PASSED: +CmdLine.tests.cpp:<line number>: PASSED: CHECK_THAT( result.errorMessage(), Contains( "colour mode must be one of" ) ) with expansion: "colour mode must be one of: auto, yes or no. 'wrong' not recognised" @@ -6353,8 +5710,7 @@ Regression test #1 Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( actual, !UnorderedEquals(expected) ) with expansion: { 'a', 'b' } not UnorderedEquals: { 'c', 'b' } @@ -6365,8 +5721,7 @@ SUCCEED counts as a test pass Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: with message: this is a success @@ -6376,8 +5731,7 @@ SUCCEED does not require an argument Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -PASSED: +Message.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or @@ -6387,8 +5741,7 @@ Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( before == 0 ) with expansion: 0 == 0 @@ -6403,8 +5756,7 @@ Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( after > before ) with expansion: 1 > 0 @@ -6419,8 +5771,7 @@ Scenario: Do that thing with the thing BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( itDoesThis() ) with expansion: true @@ -6436,8 +5787,7 @@ Scenario: Do that thing with the thing BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( itDoesThat() ) with expansion: true @@ -6455,8 +5805,7 @@ Scenario: This is a really long scenario name to see how the list command deals BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: with message: boo! @@ -6467,8 +5816,7 @@ Scenario: Vector resizing affects size and capacity BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 0 ) with expansion: 0 == 0 @@ -6482,14 +5830,12 @@ Scenario: Vector resizing affects size and capacity BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 10 ) with expansion: 10 == 10 -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 10 ) with expansion: 10 >= 10 @@ -6505,14 +5851,12 @@ Scenario: Vector resizing affects size and capacity BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 10 ) with expansion: 10 >= 10 @@ -6524,8 +5868,7 @@ Scenario: Vector resizing affects size and capacity BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 0 ) with expansion: 0 == 0 @@ -6539,14 +5882,12 @@ Scenario: Vector resizing affects size and capacity BDD.tests.cpp:<line number> ............................................................................... -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 10 ) with expansion: 10 >= 10 -BDD.tests.cpp:<line number>: -PASSED: +BDD.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 0 ) with expansion: 0 == 0 @@ -6569,56 +5910,47 @@ Some simple comparisons between doubles Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == Approx( 1.23 ) ) with expansion: 1.23 == Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != Approx( 1.22 ) ) with expansion: 1.23 != Approx( 1.22 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != Approx( 1.24 ) ) with expansion: 1.23 != Approx( 1.24 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == 1.23_a ) with expansion: 1.23 == Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != 1.22_a ) with expansion: 1.23 != Approx( 1.22 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx( d ) != 1.22 ) with expansion: Approx( 1.23 ) != 1.22 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( Approx( d ) != 1.24 ) with expansion: Approx( 1.23 ) != 1.24 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( INFINITY == Approx(INFINITY) ) with expansion: inff == Approx( inf ) @@ -6669,8 +6001,7 @@ Static arrays are convertible to string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify(singular) == "{ 1 }" ) with expansion: "{ 1 }" == "{ 1 }" @@ -6682,8 +6013,7 @@ Static arrays are convertible to string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify(arr) == "{ 3, 2, 1 }" ) with expansion: "{ 3, 2, 1 }" == "{ 3, 2, 1 }" @@ -6695,8 +6025,7 @@ Static arrays are convertible to string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify(arr) == R"({ { "1:1", "1:2", "1:3" }, { "2:1", "2:2" } })" ) with expansion: "{ { "1:1", "1:2", "1:3" }, { "2:1", "2:2" } }" @@ -6709,53 +6038,45 @@ String matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( testStringForMatching(), Contains("string") ) with expansion: "this string contains 'abc' as a substring" contains: "string" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( testStringForMatching(), Contains("string", Catch::CaseSensitive::No) ) with expansion: "this string contains 'abc' as a substring" contains: "string" (case insensitive) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Contains("abc") ) with expansion: "this string contains 'abc' as a substring" contains: "abc" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), Contains("aBC", Catch::CaseSensitive::No) ) with expansion: - "this string contains 'abc' as a substring" contains: "abc" (case insensitive) + "this string contains 'abc' as a substring" contains: "abc" (case insensitive) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), StartsWith("this") ) with expansion: "this string contains 'abc' as a substring" starts with: "this" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), StartsWith("THIS", Catch::CaseSensitive::No) ) with expansion: "this string contains 'abc' as a substring" starts with: "this" (case insensitive) -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), EndsWith("substring") ) with expansion: "this string contains 'abc' as a substring" ends with: "substring" -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( testStringForMatching(), EndsWith(" SuBsTrInG", Catch::CaseSensitive::No) ) with expansion: "this string contains 'abc' as a substring" ends with: " substring" (case @@ -6768,20 +6089,17 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( empty.empty() ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( empty.size() == 0 ) with expansion: 0 == 0 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( std::strcmp( empty.c_str(), "" ) == 0 ) with expansion: 0 == 0 @@ -6793,26 +6111,22 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( s.empty() == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( s.size() == 5 ) with expansion: 5 == 5 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isSubstring( s ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( std::strcmp( rawChars, "hello" ) == 0 ) with expansion: 0 == 0 @@ -6825,20 +6139,17 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( s ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( s.c_str() == rawChars ) with expansion: "hello" == "hello" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( s ) == false ) with expansion: false == false @@ -6850,30 +6161,25 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( original == "original" ) -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isSubstring( original ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( original ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isSubstring( original ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( original ) ) with expansion: true @@ -6886,26 +6192,22 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss.empty() == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss.size() == 5 ) with expansion: 5 == 5 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( std::strcmp( ss.c_str(), "hello" ) == 0 ) with expansion: 0 == 0 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss == "hello" ) with expansion: hello == "hello" @@ -6918,44 +6220,37 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isSubstring( ss ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( ss ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( rawChars == s.currentData() ) with expansion: "hello world!" == "hello world!" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss.c_str() != rawChars ) with expansion: "hello" != "hello world!" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isSubstring( ss ) == false ) with expansion: false == false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( isOwned( ss ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss.currentData() != s.currentData() ) with expansion: "hello" != "hello world!" @@ -6968,14 +6263,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ss.size() == 6 ) with expansion: 6 == 6 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( std::strcmp( ss.c_str(), "world!" ) == 0 ) with expansion: 0 == 0 @@ -6988,8 +6281,7 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( s.c_str() == s2.c_str() ) with expansion: "hello world!" == "hello world!" @@ -7002,8 +6294,7 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( s.c_str() != ss.c_str() ) with expansion: "hello world!" != "hello" @@ -7015,14 +6306,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( StringRef("hello") == StringRef("hello") ) with expansion: hello == hello -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( StringRef("hello") != StringRef("cello") ) with expansion: hello != cello @@ -7035,14 +6324,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr == "a standard string" ) with expansion: a standard string == "a standard string" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr.size() == stdStr.size() ) with expansion: 17 == 17 @@ -7055,14 +6342,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr == "a standard string" ) with expansion: a standard string == "a standard string" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr.size() == stdStr.size() ) with expansion: 17 == 17 @@ -7075,14 +6360,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr == "a standard string" ) with expansion: a standard string == "a standard string" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( sr.size() == stdStr.size() ) with expansion: 17 == 17 @@ -7095,14 +6378,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr == "a stringref" ) with expansion: "a stringref" == "a stringref" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr.size() == sr.size() ) with expansion: 11 == 11 @@ -7115,14 +6396,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr == "a stringref" ) with expansion: "a stringref" == "a stringref" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr.size() == sr.size() ) with expansion: 11 == 11 @@ -7135,14 +6414,12 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr == "a stringref" ) with expansion: "a stringref" == "a stringref" -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( stdStr.size() == sr.size() ) with expansion: 11 == 11 @@ -7154,20 +6431,17 @@ StringRef String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( ascii.numberOfCharacters() == ascii.size() ) with expansion: 39 == 39 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( simpleu8.numberOfCharacters() == 30 ) with expansion: 30 == 30 -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: REQUIRE( emojis.numberOfCharacters() == 9 ) with expansion: 9 == 9 @@ -7178,26 +6452,22 @@ Stringifying std::chrono::duration helpers ToStringChrono.tests.cpp:<line number> ............................................................................... -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( minute == seconds ) with expansion: 1 m == 60 s -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( hour != seconds ) with expansion: 1 h != 60 s -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( micro != milli ) with expansion: 1 us != 1 ms -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( nano != micro ) with expansion: 1 ns != 1 us @@ -7208,14 +6478,12 @@ Stringifying std::chrono::duration with weird ratios ToStringChrono.tests.cpp:<line number> ............................................................................... -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( half_minute != femto_second ) with expansion: 1 [30/1]s != 1 fs -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( pico_second != atto_second ) with expansion: 1 ps != 1 as @@ -7226,8 +6494,7 @@ Stringifying std::chrono::time_point<system_clock> ToStringChrono.tests.cpp:<line number> ............................................................................... -ToStringChrono.tests.cpp:<line number>: -PASSED: +ToStringChrono.tests.cpp:<line number>: PASSED: REQUIRE( now != later ) with expansion: {iso8601-timestamp} @@ -7259,32 +6526,28 @@ Tag alias can be registered against tag patterns TagAlias.tests.cpp:<line number> ............................................................................... -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THAT( what, Contains( "[@zzz]" ) ) with expansion: "error: tag alias, '[@zzz]' already registered. First seen at: file:2 Redefined at: file:10" contains: "[@zzz]" -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THAT( what, Contains( "file" ) ) with expansion: "error: tag alias, '[@zzz]' already registered. First seen at: file:2 Redefined at: file:10" contains: "file" -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THAT( what, Contains( "2" ) ) with expansion: "error: tag alias, '[@zzz]' already registered. First seen at: file:2 Redefined at: file:10" contains: "2" -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THAT( what, Contains( "10" ) ) with expansion: "error: tag alias, '[@zzz]' already registered. @@ -7298,20 +6561,16 @@ Tag alias can be registered against tag patterns TagAlias.tests.cpp:<line number> ............................................................................... -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THROWS( registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) ) -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THROWS( registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) ) -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THROWS( registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) ) -TagAlias.tests.cpp:<line number>: -PASSED: +TagAlias.tests.cpp:<line number>: PASSED: CHECK_THROWS( registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) ) ------------------------------------------------------------------------------- @@ -7320,8 +6579,7 @@ Test case with one argument VariadicMacros.tests.cpp:<line number> ............................................................................... -VariadicMacros.tests.cpp:<line number>: -PASSED: +VariadicMacros.tests.cpp:<line number>: PASSED: with message: no assertions @@ -7331,8 +6589,7 @@ Test enum bit values Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( 0x<hex digits> == bit30and31 ) with expansion: 3221225472 (0x<hex digits>) == 3221225472 @@ -7343,8 +6600,7 @@ The NO_FAIL macro reports a failure but does not fail the test Message.tests.cpp:<line number> ............................................................................... -Message.tests.cpp:<line number>: -FAILED - but was ok: +Message.tests.cpp:<line number>: FAILED - but was ok: CHECK_NOFAIL( 1 == 2 ) @@ -7356,8 +6612,7 @@ This test 'should' fail but doesn't Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: oops! @@ -7377,14 +6632,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7396,26 +6649,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isSuccessfullyCompleted() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() ) with expansion: true @@ -7426,14 +6675,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7445,32 +6692,27 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isSuccessfullyCompleted() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() == false ) with expansion: false == false @@ -7483,32 +6725,27 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() ) with expansion: true @@ -7519,14 +6756,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7538,32 +6773,27 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isSuccessfullyCompleted() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() == false ) with expansion: false == false @@ -7576,38 +6806,32 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() ) with expansion: true @@ -7618,14 +6842,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7637,14 +6859,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false @@ -7657,26 +6877,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() == false ) with expansion: false == false @@ -7690,26 +6906,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isSuccessfullyCompleted() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isSuccessfullyCompleted() ) with expansion: true @@ -7720,14 +6932,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7739,14 +6949,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false @@ -7759,26 +6967,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() == false ) with expansion: false == false @@ -7792,50 +6996,42 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( ctx.completedCycle() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isSuccessfullyCompleted() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isSuccessfullyCompleted() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase3.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1c.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2c.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase3.isSuccessfullyCompleted() ) with expansion: true @@ -7846,14 +7042,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7865,38 +7059,32 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() ) with expansion: true @@ -7907,14 +7095,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -7926,26 +7112,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.index() == 0 ) with expansion: 0 == 0 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false @@ -7958,14 +7140,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isSuccessfullyCompleted() == false ) with expansion: false == false @@ -7979,50 +7159,42 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.index() == 1 ) with expansion: 1 == 1 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isComplete() ) with expansion: true @@ -8033,14 +7205,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -8052,26 +7222,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.index() == 0 ) with expansion: 0 == 0 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false @@ -8084,26 +7250,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false @@ -8117,56 +7279,47 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.index() == 1 ) with expansion: 1 == 1 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isComplete() ) with expansion: true @@ -8177,14 +7330,12 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isOpen() ) with expansion: true @@ -8196,26 +7347,22 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.index() == 0 ) with expansion: 0 == 0 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false @@ -8228,32 +7375,27 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2.isSuccessfullyCompleted() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase.isComplete() == false ) with expansion: false == false @@ -8267,104 +7409,87 @@ Tracker PartTracker.tests.cpp:<line number> ............................................................................... -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.index() == 0 ) with expansion: 0 == 0 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2b.isOpen() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1b.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1b.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase2.isComplete() == false ) with expansion: false == false -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase3.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1c.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1c.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1c.index() == 1 ) with expansion: 1 == 1 -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2c.isOpen() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s2c.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( g1c.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( s1c.isComplete() ) with expansion: true -PartTracker.tests.cpp:<line number>: -PASSED: +PartTracker.tests.cpp:<line number>: PASSED: REQUIRE( testCase3.isComplete() ) with expansion: true @@ -8385,50 +7510,42 @@ Use a custom approx Approx.tests.cpp:<line number> ............................................................................... -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == approx( 1.23 ) ) with expansion: 1.23 == Approx( 1.23 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == approx( 1.22 ) ) with expansion: 1.23 == Approx( 1.22 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d == approx( 1.24 ) ) with expansion: 1.23 == Approx( 1.24 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( d != approx( 1.25 ) ) with expansion: 1.23 != Approx( 1.25 ) -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( approx( d ) == 1.22 ) with expansion: Approx( 1.23 ) == 1.22 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( approx( d ) == 1.24 ) with expansion: Approx( 1.23 ) == 1.24 -Approx.tests.cpp:<line number>: -PASSED: +Approx.tests.cpp:<line number>: PASSED: REQUIRE( approx( d ) != 1.25 ) with expansion: Approx( 1.23 ) != 1.25 @@ -8440,8 +7557,7 @@ Variadic macros VariadicMacros.tests.cpp:<line number> ............................................................................... -VariadicMacros.tests.cpp:<line number>: -PASSED: +VariadicMacros.tests.cpp:<line number>: PASSED: with message: no assertions @@ -8452,14 +7568,12 @@ Vector matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, VectorContains(1) ) with expansion: { 1, 2, 3 } Contains: 1 -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, VectorContains(2) ) with expansion: { 1, 2, 3 } Contains: 2 @@ -8471,26 +7585,22 @@ Vector matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, Contains(v2) ) with expansion: { 1, 2, 3 } Contains: { 1, 2 } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, Contains(v2) ) with expansion: { 1, 2, 3 } Contains: { 1, 2, 3 } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, Contains(empty) ) with expansion: { 1, 2, 3 } Contains: { } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( empty, Contains(empty) ) with expansion: { } Contains: { } @@ -8502,8 +7612,7 @@ Vector matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, VectorContains(1) && VectorContains(2) ) with expansion: { 1, 2, 3 } ( Contains: 1 and Contains: 2 ) @@ -8515,20 +7624,17 @@ Vector matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, Equals(v) ) with expansion: { 1, 2, 3 } Equals: { 1, 2, 3 } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( empty, Equals(empty) ) with expansion: { } Equals: { } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, Equals(v2) ) with expansion: { 1, 2, 3 } Equals: { 1, 2, 3 } @@ -8540,26 +7646,22 @@ Vector matchers Matchers.tests.cpp:<line number> ............................................................................... -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( v, UnorderedEquals(v) ) with expansion: { 1, 2, 3 } UnorderedEquals: { 1, 2, 3 } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: CHECK_THAT( empty, UnorderedEquals(empty) ) with expansion: { } UnorderedEquals: { } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( permuted, UnorderedEquals(v) ) with expansion: { 1, 3, 2 } UnorderedEquals: { 1, 2, 3 } -Matchers.tests.cpp:<line number>: -PASSED: +Matchers.tests.cpp:<line number>: PASSED: REQUIRE_THAT( permuted, UnorderedEquals(v) ) with expansion: { 2, 3, 1 } UnorderedEquals: { 1, 2, 3 } @@ -8658,16 +7760,13 @@ When checked exceptions are thrown they can be expected or unexpected Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS_AS( thisThrows(), std::domain_error ) -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( thisDoesntThrow() ) -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( thisThrows() ) ------------------------------------------------------------------------------- @@ -8740,8 +7839,7 @@ Where the LHS is not a simple value Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -warning: +Tricky.tests.cpp:<line number>: warning: Uncomment the code in this test to check that it gives a sensible compiler error @@ -8754,8 +7852,7 @@ Where there is more to the expression after the RHS Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -warning: +Tricky.tests.cpp:<line number>: warning: Uncomment the code in this test to check that it gives a sensible compiler error @@ -8768,8 +7865,7 @@ X/level/0/a Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- X/level/0/b @@ -8777,8 +7873,7 @@ X/level/0/b Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- X/level/1/a @@ -8786,8 +7881,7 @@ X/level/1/a Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- X/level/1/b @@ -8795,8 +7889,7 @@ X/level/1/b Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- XmlEncode @@ -8805,8 +7898,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "normal string" ) == "normal string" ) with expansion: "normal string" == "normal string" @@ -8818,8 +7910,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "" ) == "" ) with expansion: "" == "" @@ -8831,8 +7922,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "smith & jones" ) == "smith & jones" ) with expansion: "smith & jones" == "smith & jones" @@ -8844,8 +7934,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "smith < jones" ) == "smith < jones" ) with expansion: "smith < jones" == "smith < jones" @@ -8857,14 +7946,12 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "smith > jones" ) == "smith > jones" ) with expansion: "smith > jones" == "smith > jones" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "smith ]]> jones" ) == "smith ]]> jones" ) with expansion: "smith ]]> jones" @@ -8878,16 +7965,14 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( stringWithQuotes ) == stringWithQuotes ) with expansion: "don't "quote" me on that" == "don't "quote" me on that" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't "quote" me on that" ) with expansion: "don't "quote" me on that" @@ -8901,8 +7986,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "[\x01]" ) == "[\\x01]" ) with expansion: "[\x01]" == "[\x01]" @@ -8914,8 +7998,7 @@ XmlEncode Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" ) with expansion: "[\x7F]" == "[\x7F]" @@ -8927,56 +8010,47 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode(u8"Here be 👾") == u8"Here be 👾" ) with expansion: "Here be 👾" == "Here be 👾" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode(u8"šš") == u8"šš" ) with expansion: "šš" == "šš" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xDF\xBF") == "\xDF\xBF" ) with expansion: "߿" == "߿" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE0\xA0\x80") == "\xE0\xA0\x80" ) with expansion: "ࠀ" == "ࠀ" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xED\x9F\xBF") == "\xED\x9F\xBF" ) with expansion: "" == "" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xEE\x80\x80") == "\xEE\x80\x80" ) with expansion: "" == "" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xEF\xBF\xBF") == "\xEF\xBF\xBF" ) with expansion: "" == "" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0\x90\x80\x80") == "\xF0\x90\x80\x80" ) with expansion: "𐀀" == "𐀀" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF4\x8F\xBF\xBF") == "\xF4\x8F\xBF\xBF" ) with expansion: "" == "" @@ -8989,26 +8063,22 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("Here \xFF be 👾") == u8"Here \\xFF be 👾" ) with expansion: "Here \xFF be 👾" == "Here \xFF be 👾" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xFF") == "\\xFF" ) with expansion: "\xFF" == "\xFF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xC5\xC5\xA0") == u8"\\xC5Š" ) with expansion: "\xC5Š" == "\xC5Š" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF4\x90\x80\x80") == u8"\\xF4\\x90\\x80\\x80" ) with expansion: "\xF4\x90\x80\x80" == "\xF4\x90\x80\x80" @@ -9021,32 +8091,27 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xC0\x80") == u8"\\xC0\\x80" ) with expansion: "\xC0\x80" == "\xC0\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0\x80\x80\x80") == u8"\\xF0\\x80\\x80\\x80" ) with expansion: "\xF0\x80\x80\x80" == "\xF0\x80\x80\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xC1\xBF") == u8"\\xC1\\xBF" ) with expansion: "\xC1\xBF" == "\xC1\xBF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE0\x9F\xBF") == u8"\\xE0\\x9F\\xBF" ) with expansion: "\xE0\x9F\xBF" == "\xE0\x9F\xBF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0\x8F\xBF\xBF") == u8"\\xF0\\x8F\\xBF\\xBF" ) with expansion: "\xF0\x8F\xBF\xBF" == "\xF0\x8F\xBF\xBF" @@ -9059,26 +8124,22 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xED\xA0\x80") == "\xED\xA0\x80" ) with expansion: "���" == "���" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xED\xAF\xBF") == "\xED\xAF\xBF" ) with expansion: "���" == "���" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xED\xB0\x80") == "\xED\xB0\x80" ) with expansion: "���" == "���" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xED\xBF\xBF") == "\xED\xBF\xBF" ) with expansion: "���" == "���" @@ -9091,44 +8152,37 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\x80") == u8"\\x80" ) with expansion: "\x80" == "\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\x81") == u8"\\x81" ) with expansion: "\x81" == "\x81" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xBC") == u8"\\xBC" ) with expansion: "\xBC" == "\xBC" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xBF") == u8"\\xBF" ) with expansion: "\xBF" == "\xBF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF5\x80\x80\x80") == u8"\\xF5\\x80\\x80\\x80" ) with expansion: "\xF5\x80\x80\x80" == "\xF5\x80\x80\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF6\x80\x80\x80") == u8"\\xF6\\x80\\x80\\x80" ) with expansion: "\xF6\x80\x80\x80" == "\xF6\x80\x80\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF7\x80\x80\x80") == u8"\\xF7\\x80\\x80\\x80" ) with expansion: "\xF7\x80\x80\x80" == "\xF7\x80\x80\x80" @@ -9141,80 +8195,67 @@ XmlEncode: UTF-8 Xml.tests.cpp:<line number> ............................................................................... -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xDE") == u8"\\xDE" ) with expansion: "\xDE" == "\xDE" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xDF") == u8"\\xDF" ) with expansion: "\xDF" == "\xDF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE0") == u8"\\xE0" ) with expansion: "\xE0" == "\xE0" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xEF") == u8"\\xEF" ) with expansion: "\xEF" == "\xEF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0") == u8"\\xF0" ) with expansion: "\xF0" == "\xF0" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF4") == u8"\\xF4" ) with expansion: "\xF4" == "\xF4" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE0\x80") == u8"\\xE0\\x80" ) with expansion: "\xE0\x80" == "\xE0\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE0\xBF") == u8"\\xE0\\xBF" ) with expansion: "\xE0\xBF" == "\xE0\xBF" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xE1\x80") == u8"\\xE1\\x80" ) with expansion: "\xE1\x80" == "\xE1\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0\x80") == u8"\\xF0\\x80" ) with expansion: "\xF0\x80" == "\xF0\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF4\x80") == u8"\\xF4\\x80" ) with expansion: "\xF4\x80" == "\xF4\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF0\x80\x80") == u8"\\xF0\\x80\\x80" ) with expansion: "\xF0\x80\x80" == "\xF0\x80\x80" -Xml.tests.cpp:<line number>: -PASSED: +Xml.tests.cpp:<line number>: PASSED: CHECK( encode("\xF4\x80\x80") == u8"\\xF4\\x80\\x80" ) with expansion: "\xF4\x80\x80" == "\xF4\x80\x80" @@ -9225,20 +8266,17 @@ array<int, N> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( empty ) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( oneValue ) == "{ 42 }" ) with expansion: "{ 42 }" == "{ 42 }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( twoValues ) == "{ 42, 250 }" ) with expansion: "{ 42, 250 }" == "{ 42, 250 }" @@ -9249,8 +8287,7 @@ atomic if Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( x == 0 ) with expansion: 0 == 0 @@ -9261,8 +8298,7 @@ boolean member Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( obj.prop != 0 ) with expansion: 0x<hex digits> != 0 @@ -9273,14 +8309,12 @@ checkedElse Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECKED_ELSE( flag ) with expansion: true -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( testCheckedElse( true ) ) with expansion: true @@ -9307,14 +8341,12 @@ checkedIf Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECKED_IF( flag ) with expansion: true -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( testCheckedIf( true ) ) with expansion: true @@ -9341,26 +8373,22 @@ comparisons between const int variables Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( unsigned_char_var == 1 ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( unsigned_short_var == 1 ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( unsigned_int_var == 1 ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( unsigned_long_var == 1 ) with expansion: 1 == 1 @@ -9371,26 +8399,22 @@ comparisons between int variables Condition.tests.cpp:<line number> ............................................................................... -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( long_var == unsigned_char_var ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( long_var == unsigned_short_var ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( long_var == unsigned_int_var ) with expansion: 1 == 1 -Condition.tests.cpp:<line number>: -PASSED: +Condition.tests.cpp:<line number>: PASSED: REQUIRE( long_var == unsigned_long_var ) with expansion: 1 == 1 @@ -9403,8 +8427,7 @@ even more nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- even more nested SECTION tests @@ -9414,8 +8437,7 @@ even more nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- even more nested SECTION tests @@ -9424,8 +8446,7 @@ even more nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- first tag @@ -9471,8 +8492,7 @@ long long Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( l == std::numeric_limits<long long>::max() ) with expansion: 9223372036854775807 (0x<hex digits>) @@ -9510,8 +8530,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 2 > 1 @@ -9523,8 +8542,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 3 > 1 @@ -9536,8 +8554,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 4 > 1 @@ -9549,8 +8566,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 5 > 1 @@ -9562,8 +8578,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 6 > 1 @@ -9575,8 +8590,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 7 > 1 @@ -9588,8 +8602,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 8 > 1 @@ -9601,8 +8614,7 @@ looped SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( b > a ) with expansion: 9 > 1 @@ -9627,8 +8639,7 @@ with expansion: with message: Testing if fib[1] (1) is even -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: 0 == 0 @@ -9649,8 +8660,7 @@ with expansion: with message: Testing if fib[4] (5) is even -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: 0 == 0 @@ -9692,8 +8702,7 @@ more nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a != b ) with expansion: 1 != 2 @@ -9706,8 +8715,7 @@ more nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a < b ) with expansion: 1 < 2 @@ -9719,14 +8727,12 @@ nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a != b ) with expansion: 1 != 2 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( b != a ) with expansion: 2 != 1 @@ -9739,8 +8745,7 @@ nested SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a != b ) with expansion: 1 != 2 @@ -9751,8 +8756,7 @@ non streamable - with conv. op Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( s == "7" ) with expansion: "7" == "7" @@ -9763,8 +8767,7 @@ non-copyable objects Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: CHECK( ti == typeid(int) ) with expansion: {?} == {?} @@ -9775,8 +8778,7 @@ not allowed Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- null strings @@ -9784,14 +8786,12 @@ null strings Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( makeString( false ) != static_cast<char*>(0) ) with expansion: "valid string" != {null string} -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( makeString( true ) == static_cast<char*>(0) ) with expansion: {null string} == {null string} @@ -9802,8 +8802,7 @@ null_ptr Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( ptr.get() == 0 ) with expansion: 0 == 0 @@ -9814,8 +8813,7 @@ pair<pair<int,const char *,pair<std::string,int> > -> toString ToStringPair.tests.cpp:<line number> ............................................................................... -ToStringPair.tests.cpp:<line number>: -PASSED: +ToStringPair.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" ) with expansion: "{ { 42, "Arthur" }, { "Ford", 24 } }" @@ -9828,8 +8826,7 @@ pointer to class Tricky.tests.cpp:<line number> ............................................................................... -Tricky.tests.cpp:<line number>: -PASSED: +Tricky.tests.cpp:<line number>: PASSED: REQUIRE( p == 0 ) with expansion: 0 == 0 @@ -9841,14 +8838,12 @@ random SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a != b ) with expansion: 1 != 2 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( b != a ) with expansion: 2 != 1 @@ -9860,8 +8855,7 @@ random SECTION tests Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( a != b ) with expansion: 1 != 2 @@ -9873,14 +8867,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( letters, "b", "z" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == "azcdefcg" ) with expansion: "azcdefcg" == "azcdefcg" @@ -9892,14 +8884,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( letters, "c", "z" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == "abzdefzg" ) with expansion: "abzdefzg" == "abzdefzg" @@ -9911,14 +8901,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( letters, "a", "z" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == "zbcdefcg" ) with expansion: "zbcdefcg" == "zbcdefcg" @@ -9930,14 +8918,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( letters, "g", "z" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == "abcdefcz" ) with expansion: "abcdefcz" == "abcdefcz" @@ -9949,14 +8935,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( letters, letters, "replaced" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == "replaced" ) with expansion: "replaced" == "replaced" @@ -9968,14 +8952,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK_FALSE( Catch::replaceInPlace( letters, "x", "z" ) ) with expansion: !false -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( letters == letters ) with expansion: "abcdefcg" == "abcdefcg" @@ -9987,14 +8969,12 @@ replaceInPlace String.tests.cpp:<line number> ............................................................................... -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( Catch::replaceInPlace( s, "'", "|'" ) ) with expansion: true -String.tests.cpp:<line number>: -PASSED: +String.tests.cpp:<line number>: PASSED: CHECK( s == "didn|'t" ) with expansion: "didn|'t" == "didn|'t" @@ -10038,8 +9018,7 @@ std::map is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( emptyMap ) == "{ }" ) with expansion: "{ }" == "{ }" @@ -10051,8 +9030,7 @@ std::map is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( map ) == "{ { \"one\", 1 } }" ) with expansion: "{ { "one", 1 } }" == "{ { "one", 1 } }" @@ -10064,8 +9042,7 @@ std::map is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( map ) == "{ { \"abc\", 1 }, { \"def\", 2 }, { \"ghi\", 3 } }" ) with expansion: "{ { "abc", 1 }, { "def", 2 }, { "ghi", 3 } }" @@ -10078,8 +9055,7 @@ std::pair<int,const std::string> -> toString ToStringPair.tests.cpp:<line number> ............................................................................... -ToStringPair.tests.cpp:<line number>: -PASSED: +ToStringPair.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(value) == "{ 34, \"xyzzy\" }" ) with expansion: "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }" @@ -10090,8 +9066,7 @@ std::pair<int,std::string> -> toString ToStringPair.tests.cpp:<line number> ............................................................................... -ToStringPair.tests.cpp:<line number>: -PASSED: +ToStringPair.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( value ) == "{ 34, \"xyzzy\" }" ) with expansion: "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }" @@ -10103,8 +9078,7 @@ std::set is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( emptySet ) == "{ }" ) with expansion: "{ }" == "{ }" @@ -10116,8 +9090,7 @@ std::set is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( set ) == "{ \"one\" }" ) with expansion: "{ "one" }" == "{ "one" }" @@ -10129,8 +9102,7 @@ std::set is convertible string ToStringGeneral.tests.cpp:<line number> ............................................................................... -ToStringGeneral.tests.cpp:<line number>: -PASSED: +ToStringGeneral.tests.cpp:<line number>: PASSED: REQUIRE( Catch::Detail::stringify( set ) == "{ \"abc\", \"def\", \"ghi\" }" ) with expansion: "{ "abc", "def", "ghi" }" @@ -10143,8 +9115,7 @@ std::vector<std::pair<std::string,int> > -> toString ToStringPair.tests.cpp:<line number> ............................................................................... -ToStringPair.tests.cpp:<line number>: -PASSED: +ToStringPair.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( pr ) == "{ { \"green\", 55 } }" ) with expansion: "{ { "green", 55 } }" @@ -10168,30 +9139,26 @@ stringify ranges ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(streamable_range{}) == "op<<(streamable_range)" ) with expansion: "op<<(streamable_range)" == "op<<(streamable_range)" -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(stringmaker_range{}) == "stringmaker(streamable_range)" ) with expansion: "stringmaker(streamable_range)" == "stringmaker(streamable_range)" -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(just_range{}) == "{ 1, 2, 3, 4 }" ) with expansion: "{ 1, 2, 3, 4 }" == "{ 1, 2, 3, 4 }" -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(disabled_range{}) == "{ !!! }" ) with expansion: "{ !!! }" == "{ !!! }" @@ -10202,8 +9169,7 @@ stringify( has_maker ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( item ) == "StringMaker<has_maker>" ) with expansion: "StringMaker<has_maker>" @@ -10216,8 +9182,7 @@ stringify( has_maker_and_operator ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( item ) == "StringMaker<has_maker_and_operator>" ) with expansion: "StringMaker<has_maker_and_operator>" @@ -10230,8 +9195,7 @@ stringify( has_neither ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(item) == "{ !!! }" ) with expansion: "{ !!! }" == "{ !!! }" @@ -10242,8 +9206,7 @@ stringify( has_operator ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( item ) == "operator<<( has_operator )" ) with expansion: "operator<<( has_operator )" @@ -10256,8 +9219,7 @@ stringify( has_template_operator ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( item ) == "operator<<( has_template_operator )" ) with expansion: "operator<<( has_template_operator )" @@ -10270,8 +9232,7 @@ stringify( vectors<has_maker> ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker> }" ) with expansion: "{ StringMaker<has_maker> }" @@ -10284,8 +9245,7 @@ stringify( vectors<has_maker_and_operator> ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker_and_operator> }" ) with expansion: "{ StringMaker<has_maker_and_operator> }" @@ -10298,8 +9258,7 @@ stringify( vectors<has_operator> ) ToStringWhich.tests.cpp:<line number> ............................................................................... -ToStringWhich.tests.cpp:<line number>: -PASSED: +ToStringWhich.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify( v ) == "{ operator<<( has_operator ) }" ) with expansion: "{ operator<<( has_operator ) }" @@ -10312,8 +9271,7 @@ strlen3 Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: REQUIRE( data.str.size() == data.len ) with expansion: 3 == 3 @@ -10324,8 +9282,7 @@ strlen3 Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: REQUIRE( data.str.size() == data.len ) with expansion: 3 == 3 @@ -10336,8 +9293,7 @@ strlen3 Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: REQUIRE( data.str.size() == data.len ) with expansion: 5 == 5 @@ -10348,8 +9304,7 @@ strlen3 Generators.tests.cpp:<line number> ............................................................................... -Generators.tests.cpp:<line number>: -PASSED: +Generators.tests.cpp:<line number>: PASSED: REQUIRE( data.str.size() == data.len ) with expansion: 4 == 4 @@ -10370,8 +9325,7 @@ toString on const wchar_t const pointer returns the string contents Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( result == "\"wide load\"" ) with expansion: ""wide load"" == ""wide load"" @@ -10382,8 +9336,7 @@ toString on const wchar_t pointer returns the string contents Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( result == "\"wide load\"" ) with expansion: ""wide load"" == ""wide load"" @@ -10394,8 +9347,7 @@ toString on wchar_t const pointer returns the string contents Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( result == "\"wide load\"" ) with expansion: ""wide load"" == ""wide load"" @@ -10406,8 +9358,7 @@ toString on wchar_t returns the string contents Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: CHECK( result == "\"wide load\"" ) with expansion: ""wide load"" == ""wide load"" @@ -10418,20 +9369,17 @@ toString(enum class w/operator<<) EnumToString.tests.cpp:<line number> ............................................................................... -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e0) == "E2/V0" ) with expansion: "E2/V0" == "E2/V0" -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e1) == "E2/V1" ) with expansion: "E2/V1" == "E2/V1" -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e3) == "Unknown enum value 10" ) with expansion: "Unknown enum value 10" @@ -10444,14 +9392,12 @@ toString(enum class) EnumToString.tests.cpp:<line number> ............................................................................... -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e0) == "0" ) with expansion: "0" == "0" -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e1) == "1" ) with expansion: "1" == "1" @@ -10462,14 +9408,12 @@ toString(enum w/operator<<) EnumToString.tests.cpp:<line number> ............................................................................... -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e0) == "E2{0}" ) with expansion: "E2{0}" == "E2{0}" -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e1) == "E2{1}" ) with expansion: "E2{1}" == "E2{1}" @@ -10480,14 +9424,12 @@ toString(enum) EnumToString.tests.cpp:<line number> ............................................................................... -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e0) == "0" ) with expansion: "0" == "0" -EnumToString.tests.cpp:<line number>: -PASSED: +EnumToString.tests.cpp:<line number>: PASSED: CHECK( ::Catch::Detail::stringify(e1) == "1" ) with expansion: "1" == "1" @@ -10498,14 +9440,12 @@ tuple<> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ }" == ::Catch::Detail::stringify(type{}) ) with expansion: "{ }" == "{ }" -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ }" == ::Catch::Detail::stringify(value) ) with expansion: "{ }" == "{ }" @@ -10516,14 +9456,12 @@ tuple<float,int> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "1.2f" == ::Catch::Detail::stringify(float(1.2)) ) with expansion: "1.2f" == "1.2f" -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) ) with expansion: "{ 1.2f, 0 }" == "{ 1.2f, 0 }" @@ -10534,8 +9472,7 @@ tuple<int> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ 0 }" == ::Catch::Detail::stringify(type{0}) ) with expansion: "{ 0 }" == "{ 0 }" @@ -10546,8 +9483,7 @@ tuple<0,int,const char *> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) ) with expansion: "{ 0, 42, "Catch me" }" @@ -10560,8 +9496,7 @@ tuple<string,string> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) ) with expansion: "{ "hello", "world" }" @@ -10574,8 +9509,7 @@ tuple<tuple<int>,tuple<>,float> ToStringTuple.tests.cpp:<line number> ............................................................................... -ToStringTuple.tests.cpp:<line number>: -PASSED: +ToStringTuple.tests.cpp:<line number>: PASSED: CHECK( "{ { 42 }, { }, 1.2f }" == ::Catch::Detail::stringify(value) ) with expansion: "{ { 42 }, { }, 1.2f }" @@ -10588,14 +9522,12 @@ vec<vec<string,alloc>> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(v) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(v) == "{ { \"hello\" }, { \"world\" } }" ) with expansion: "{ { "hello" }, { "world" } }" @@ -10608,20 +9540,17 @@ vector<bool> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(bools) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(bools) == "{ true }" ) with expansion: "{ true }" == "{ true }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(bools) == "{ true, false }" ) with expansion: "{ true, false }" == "{ true, false }" @@ -10632,20 +9561,17 @@ vector<int,allocator> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42 }" ) with expansion: "{ 42 }" == "{ 42 }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42, 250 }" ) with expansion: "{ 42, 250 }" == "{ 42, 250 }" @@ -10656,20 +9582,17 @@ vector<int> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42 }" ) with expansion: "{ 42 }" == "{ 42 }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ 42, 250 }" ) with expansion: "{ 42, 250 }" == "{ 42, 250 }" @@ -10680,20 +9603,17 @@ vector<string> -> toString ToStringVector.tests.cpp:<line number> ............................................................................... -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ }" ) with expansion: "{ }" == "{ }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\" }" ) with expansion: "{ "hello" }" == "{ "hello" }" -ToStringVector.tests.cpp:<line number>: -PASSED: +ToStringVector.tests.cpp:<line number>: PASSED: REQUIRE( ::Catch::Detail::stringify(vv) == "{ \"hello\", \"world\" }" ) with expansion: "{ "hello", "world" }" @@ -10706,14 +9626,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10725,14 +9643,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 10 ) with expansion: 10 == 10 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 10 ) with expansion: 10 >= 10 @@ -10743,14 +9659,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10762,14 +9676,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 0 ) with expansion: 0 == 0 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10782,8 +9694,7 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() == 0 ) with expansion: 0 == 0 @@ -10794,14 +9705,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10813,14 +9722,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 10 ) with expansion: 10 >= 10 @@ -10831,14 +9738,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10850,14 +9755,12 @@ vectors can be sized and resized Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.size() == 5 ) with expansion: 5 == 5 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( v.capacity() >= 5 ) with expansion: 5 >= 5 @@ -10865,14 +9768,13 @@ with expansion: ------------------------------------------------------------------------------- xmlentitycheck embedded xml: <test>it should be possible to embed xml characters, such as <, - " or &, or even whole <xml>documents</xml> within an attribute</test> + " or &, or even whole <xml>documents</xml> within an attribute </test> ------------------------------------------------------------------------------- Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- xmlentitycheck @@ -10881,10 +9783,9 @@ xmlentitycheck Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: =============================================================================== -test cases: 215 | 149 passed | 62 failed | 4 failed as expected -assertions: 1247 | 1104 passed | 122 failed | 21 failed as expected +test cases: 216 | 150 passed | 62 failed | 4 failed as expected +assertions: 1248 | 1105 passed | 122 failed | 21 failed as expected diff --git a/packages/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt index c4e06a0ec..36ca1bde5 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/console.swa4.approved.txt @@ -11,8 +11,7 @@ Randomness seeded to: 1 Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: yay @@ -23,14 +22,12 @@ with message: Decomposition.tests.cpp:<line number> ............................................................................... -Decomposition.tests.cpp:<line number>: -PASSED: +Decomposition.tests.cpp:<line number>: PASSED: REQUIRE( fptr == 0 ) with expansion: 0 == 0 -Decomposition.tests.cpp:<line number>: -PASSED: +Decomposition.tests.cpp:<line number>: PASSED: REQUIRE( fptr == 0l ) with expansion: 0 == 0 @@ -41,14 +38,12 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( y.v == 0 ) with expansion: 0 == 0 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( 0 == y.v ) with expansion: 0 == 0 @@ -59,38 +54,32 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 == t2 ) with expansion: {?} == {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 != t2 ) with expansion: {?} != {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 < t2 ) with expansion: {?} < {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 > t2 ) with expansion: {?} > {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 <= t2 ) with expansion: {?} <= {?} -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( t1 >= t2 ) with expansion: {?} >= {?} @@ -101,8 +90,7 @@ with expansion: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- #1238 @@ -110,8 +98,7 @@ PASSED: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( std::memcmp(uarr, "123", sizeof(uarr)) == 0 ) with expansion: 0 == 0 @@ -119,8 +106,7 @@ with messages: uarr := "123" sarr := "456" -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( std::memcmp(sarr, "456", sizeof(sarr)) == 0 ) with expansion: 0 == 0 @@ -134,8 +120,7 @@ with messages: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- #1403 @@ -143,8 +128,7 @@ PASSED: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( h1 == h2 ) with expansion: [1403 helper] == [1403 helper] @@ -181,8 +165,7 @@ due to unexpected exception with messages: Exception.tests.cpp:<line number> ............................................................................... -Exception.tests.cpp:<line number>: -PASSED: +Exception.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( thisThrows() ) with message: answer := 42 @@ -193,8 +176,7 @@ with message: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( 42 == f ) with expansion: 42 == {?} @@ -205,38 +187,31 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( a == t ) with expansion: 3 == 3 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: CHECK( a == t ) with expansion: 3 == 3 -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_THROWS( throws_int(true) ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: CHECK_THROWS_AS( throws_int(true), int ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_NOTHROW( throws_int(false) ) -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") ) with expansion: "aaa" ends with: "aaa" -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( templated_tests<int>(3) ) with expansion: true @@ -252,8 +227,7 @@ Misc.tests.cpp:<line number>: FAILED: with expansion: 1 == 0 -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: REQUIRE( errno == 1 ) with expansion: 1 == 1 @@ -264,8 +238,7 @@ with expansion: Compilation.tests.cpp:<line number> ............................................................................... -Compilation.tests.cpp:<line number>: -PASSED: +Compilation.tests.cpp:<line number>: PASSED: REQUIRE( x == 4 ) with expansion: {?} == 4 @@ -279,8 +252,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -291,8 +263,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -303,8 +274,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -315,8 +285,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK @@ -327,8 +296,7 @@ with message: Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: -PASSED: +Misc.tests.cpp:<line number>: PASSED: with message: Everything is OK diff --git a/packages/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt index 0b726c8d5..b62c62aae 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <testsuitesloose text artifact > - <testsuite name="<exe-name>" errors="17" failures="106" tests="1248" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> + <testsuite name="<exe-name>" errors="17" failures="106" tests="1249" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/> <testcase classname="<exe-name>.global" name="#1027" time="{duration}"/> @@ -480,6 +480,7 @@ Message.tests.cpp:<line number> <testcase classname="<exe-name>.global" name="Parse test names and tags/empty quoted name" time="{duration}"/> <testcase classname="<exe-name>.global" name="Parse test names and tags/quoted string followed by tag exclusion" time="{duration}"/> <testcase classname="<exe-name>.global" name="Pointers can be compared to null" time="{duration}"/> + <testcase classname="<exe-name>.global" name="Predicate matcher can accept const char*" time="{duration}"/> <testcase classname="<exe-name>.global" name="Process can be configured on command line/empty args don't cause a crash" time="{duration}"/> <testcase classname="<exe-name>.global" name="Process can be configured on command line/default - no arguments" time="{duration}"/> <testcase classname="<exe-name>.global" name="Process can be configured on command line/test lists/Specify one test case using" time="{duration}"/> diff --git a/packages/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt b/packages/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt index f573f5852..00ea5f76d 100644 --- a/packages/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/packages/Catch2/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -5964,6 +5964,17 @@ </Expression> <OverallResult success="true"/> </TestCase> + <TestCase name="Predicate matcher can accept const char*" tags="[compilation][matchers]" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" > + <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/UsageTests/Matchers.tests.cpp" > + <Original> + "foo", Predicate<const char*>([] (const char* const&) { return true; }) + </Original> + <Expanded> + "foo" matches undescribed predicate + </Expanded> + </Expression> + <OverallResult success="true"/> + </TestCase> <TestCase name="Process can be configured on command line" tags="[command-line][config]" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" > <Section name="empty args don't cause a crash" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" > <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" > @@ -11358,7 +11369,7 @@ loose text artifact </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="1104" failures="123" expectedFailures="21"/> + <OverallResults successes="1105" failures="123" expectedFailures="21"/> </Group> - <OverallResults successes="1104" failures="122" expectedFailures="21"/> + <OverallResults successes="1105" failures="122" expectedFailures="21"/> </Catch> diff --git a/packages/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp b/packages/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp index e09dad14e..f07481d46 100644 --- a/packages/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp +++ b/packages/Catch2/projects/SelfTest/UsageTests/Matchers.tests.cpp @@ -432,6 +432,10 @@ namespace { namespace MatchersTests { CHECK_THAT(actual, !UnorderedEquals(expected)); } + TEST_CASE("Predicate matcher can accept const char*", "[matchers][compilation]") { + REQUIRE_THAT("foo", Predicate<const char*>([] (const char* const&) { return true; })); + } + } } // namespace MatchersTests #endif // CATCH_CONFIG_DISABLE_MATCHERS diff --git a/packages/Catch2/single_include/catch2/catch.hpp b/packages/Catch2/single_include/catch2/catch.hpp index 4191607a7..b324e56aa 100644 --- a/packages/Catch2/single_include/catch2/catch.hpp +++ b/packages/Catch2/single_include/catch2/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v2.4.1 - * Generated: 2018-09-28 15:50:15.645795 + * Catch v2.4.2 + * Generated: 2018-10-26 21:12:29.223927 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2018 Two Blue Cubes Ltd. All rights reserved. @@ -15,7 +15,7 @@ #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 4 -#define CATCH_VERSION_PATCH 1 +#define CATCH_VERSION_PATCH 2 #ifdef __clang__ # pragma clang system_header @@ -356,6 +356,10 @@ namespace Catch { #include <string> #include <cstdint> +// We need a dummy global operator<< so we can bring it into Catch namespace later +struct Catch_global_namespace_dummy {}; +std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); + namespace Catch { struct CaseSensitive { enum Choice { @@ -397,6 +401,11 @@ namespace Catch { std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); + // Bring in operator<< from global namespace into Catch namespace + // This is necessary because the overload of operator<< above makes + // lookup stop at namespace Catch + using ::operator<<; + // Use this in variadic streaming macros to allow // >> +StreamEndStop // as well as @@ -850,14 +859,7 @@ inline id performOptionalSelector( id obj, SEL sel ) { #pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless #endif -// We need a dummy global operator<< so we can bring it into Catch namespace later -struct Catch_global_namespace_dummy {}; -std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); - namespace Catch { - // Bring in operator<< from global namespace into Catch namespace - using ::operator<<; - namespace Detail { extern const std::string unprintableString; @@ -5121,6 +5123,7 @@ namespace Catch { struct LeakDetector { LeakDetector(); + ~LeakDetector(); }; } @@ -5772,7 +5775,7 @@ namespace Catch { // // See https://github.com/philsquared/Clara for more details -// Clara v1.1.4 +// Clara v1.1.5 #ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH @@ -5798,8 +5801,8 @@ namespace Catch { // // A single-header library for wrapping and laying out basic text, by Phil Nash // -// This work is licensed under the BSD 2-Clause license. -// See the accompanying LICENSE file, or the one at https://opensource.org/licenses/BSD-2-Clause +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // // This project is hosted at https://github.com/philsquared/textflowcpp @@ -5813,314 +5816,324 @@ namespace Catch { #define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80 #endif -namespace Catch { namespace clara { namespace TextFlow { - - inline auto isWhitespace( char c ) -> bool { - static std::string chars = " \t\n\r"; - return chars.find( c ) != std::string::npos; - } - inline auto isBreakableBefore( char c ) -> bool { - static std::string chars = "[({<|"; - return chars.find( c ) != std::string::npos; - } - inline auto isBreakableAfter( char c ) -> bool { - static std::string chars = "])}>.,:;*+-=&/\\"; - return chars.find( c ) != std::string::npos; - } - - class Columns; - - class Column { - std::vector<std::string> m_strings; - size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH; - size_t m_indent = 0; - size_t m_initialIndent = std::string::npos; - - public: - class iterator { - friend Column; - - Column const& m_column; - size_t m_stringIndex = 0; - size_t m_pos = 0; - - size_t m_len = 0; - size_t m_end = 0; - bool m_suffix = false; - - iterator( Column const& column, size_t stringIndex ) - : m_column( column ), - m_stringIndex( stringIndex ) - {} - - auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; } - - auto isBoundary( size_t at ) const -> bool { - assert( at > 0 ); - assert( at <= line().size() ); - - return at == line().size() || - ( isWhitespace( line()[at] ) && !isWhitespace( line()[at-1] ) ) || - isBreakableBefore( line()[at] ) || - isBreakableAfter( line()[at-1] ); - } - - void calcLength() { - assert( m_stringIndex < m_column.m_strings.size() ); - - m_suffix = false; - auto width = m_column.m_width-indent(); - m_end = m_pos; - while( m_end < line().size() && line()[m_end] != '\n' ) - ++m_end; - - if( m_end < m_pos + width ) { - m_len = m_end - m_pos; - } - else { - size_t len = width; - while (len > 0 && !isBoundary(m_pos + len)) - --len; - while (len > 0 && isWhitespace( line()[m_pos + len - 1] )) - --len; - - if (len > 0) { - m_len = len; - } else { - m_suffix = true; - m_len = width - 1; - } - } - } - - auto indent() const -> size_t { - auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos; - return initial == std::string::npos ? m_column.m_indent : initial; - } - - auto addIndentAndSuffix(std::string const &plain) const -> std::string { - return std::string( indent(), ' ' ) + (m_suffix ? plain + "-" : plain); - } - - public: - explicit iterator( Column const& column ) : m_column( column ) { - assert( m_column.m_width > m_column.m_indent ); - assert( m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent ); - calcLength(); - if( m_len == 0 ) - m_stringIndex++; // Empty string - } - - auto operator *() const -> std::string { - assert( m_stringIndex < m_column.m_strings.size() ); - assert( m_pos <= m_end ); - if( m_pos + m_column.m_width < m_end ) - return addIndentAndSuffix(line().substr(m_pos, m_len)); - else - return addIndentAndSuffix(line().substr(m_pos, m_end - m_pos)); - } - - auto operator ++() -> iterator& { - m_pos += m_len; - if( m_pos < line().size() && line()[m_pos] == '\n' ) - m_pos += 1; - else - while( m_pos < line().size() && isWhitespace( line()[m_pos] ) ) - ++m_pos; - - if( m_pos == line().size() ) { - m_pos = 0; - ++m_stringIndex; - } - if( m_stringIndex < m_column.m_strings.size() ) - calcLength(); - return *this; - } - auto operator ++(int) -> iterator { - iterator prev( *this ); - operator++(); - return prev; - } - - auto operator ==( iterator const& other ) const -> bool { - return - m_pos == other.m_pos && - m_stringIndex == other.m_stringIndex && - &m_column == &other.m_column; - } - auto operator !=( iterator const& other ) const -> bool { - return !operator==( other ); - } - }; - using const_iterator = iterator; - - explicit Column( std::string const& text ) { m_strings.push_back( text ); } - - auto width( size_t newWidth ) -> Column& { - assert( newWidth > 0 ); - m_width = newWidth; - return *this; - } - auto indent( size_t newIndent ) -> Column& { - m_indent = newIndent; - return *this; - } - auto initialIndent( size_t newIndent ) -> Column& { - m_initialIndent = newIndent; - return *this; - } - - auto width() const -> size_t { return m_width; } - auto begin() const -> iterator { return iterator( *this ); } - auto end() const -> iterator { return { *this, m_strings.size() }; } - - inline friend std::ostream& operator << ( std::ostream& os, Column const& col ) { - bool first = true; - for( auto line : col ) { - if( first ) - first = false; - else - os << "\n"; - os << line; - } - return os; - } - - auto operator + ( Column const& other ) -> Columns; - - auto toString() const -> std::string { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - }; - - class Spacer : public Column { - - public: - explicit Spacer( size_t spaceWidth ) : Column( "" ) { - width( spaceWidth ); - } - }; - - class Columns { - std::vector<Column> m_columns; - - public: - - class iterator { - friend Columns; - struct EndTag {}; - - std::vector<Column> const& m_columns; - std::vector<Column::iterator> m_iterators; - size_t m_activeIterators; - - iterator( Columns const& columns, EndTag ) - : m_columns( columns.m_columns ), - m_activeIterators( 0 ) - { - m_iterators.reserve( m_columns.size() ); +namespace Catch { +namespace clara { +namespace TextFlow { - for( auto const& col : m_columns ) - m_iterators.push_back( col.end() ); - } +inline auto isWhitespace(char c) -> bool { + static std::string chars = " \t\n\r"; + return chars.find(c) != std::string::npos; +} +inline auto isBreakableBefore(char c) -> bool { + static std::string chars = "[({<|"; + return chars.find(c) != std::string::npos; +} +inline auto isBreakableAfter(char c) -> bool { + static std::string chars = "])}>.,:;*+-=&/\\"; + return chars.find(c) != std::string::npos; +} - public: - explicit iterator( Columns const& columns ) - : m_columns( columns.m_columns ), - m_activeIterators( m_columns.size() ) - { - m_iterators.reserve( m_columns.size() ); +class Columns; - for( auto const& col : m_columns ) - m_iterators.push_back( col.begin() ); - } +class Column { + std::vector<std::string> m_strings; + size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH; + size_t m_indent = 0; + size_t m_initialIndent = std::string::npos; - auto operator ==( iterator const& other ) const -> bool { - return m_iterators == other.m_iterators; - } - auto operator !=( iterator const& other ) const -> bool { - return m_iterators != other.m_iterators; - } - auto operator *() const -> std::string { - std::string row, padding; +public: + class iterator { + friend Column; + + Column const& m_column; + size_t m_stringIndex = 0; + size_t m_pos = 0; + + size_t m_len = 0; + size_t m_end = 0; + bool m_suffix = false; + + iterator(Column const& column, size_t stringIndex) + : m_column(column), + m_stringIndex(stringIndex) {} + + auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; } + + auto isBoundary(size_t at) const -> bool { + assert(at > 0); + assert(at <= line().size()); + + return at == line().size() || + (isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) || + isBreakableBefore(line()[at]) || + isBreakableAfter(line()[at - 1]); + } + + void calcLength() { + assert(m_stringIndex < m_column.m_strings.size()); + + m_suffix = false; + auto width = m_column.m_width - indent(); + m_end = m_pos; + while (m_end < line().size() && line()[m_end] != '\n') + ++m_end; + + if (m_end < m_pos + width) { + m_len = m_end - m_pos; + } else { + size_t len = width; + while (len > 0 && !isBoundary(m_pos + len)) + --len; + while (len > 0 && isWhitespace(line()[m_pos + len - 1])) + --len; + + if (len > 0) { + m_len = len; + } else { + m_suffix = true; + m_len = width - 1; + } + } + } + + auto indent() const -> size_t { + auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos; + return initial == std::string::npos ? m_column.m_indent : initial; + } + + auto addIndentAndSuffix(std::string const &plain) const -> std::string { + return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain); + } + + public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::forward_iterator_tag; + + explicit iterator(Column const& column) : m_column(column) { + assert(m_column.m_width > m_column.m_indent); + assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent); + calcLength(); + if (m_len == 0) + m_stringIndex++; // Empty string + } + + auto operator *() const -> std::string { + assert(m_stringIndex < m_column.m_strings.size()); + assert(m_pos <= m_end); + return addIndentAndSuffix(line().substr(m_pos, m_len)); + } + + auto operator ++() -> iterator& { + m_pos += m_len; + if (m_pos < line().size() && line()[m_pos] == '\n') + m_pos += 1; + else + while (m_pos < line().size() && isWhitespace(line()[m_pos])) + ++m_pos; + + if (m_pos == line().size()) { + m_pos = 0; + ++m_stringIndex; + } + if (m_stringIndex < m_column.m_strings.size()) + calcLength(); + return *this; + } + auto operator ++(int) -> iterator { + iterator prev(*this); + operator++(); + return prev; + } + + auto operator ==(iterator const& other) const -> bool { + return + m_pos == other.m_pos && + m_stringIndex == other.m_stringIndex && + &m_column == &other.m_column; + } + auto operator !=(iterator const& other) const -> bool { + return !operator==(other); + } + }; + using const_iterator = iterator; + + explicit Column(std::string const& text) { m_strings.push_back(text); } + + auto width(size_t newWidth) -> Column& { + assert(newWidth > 0); + m_width = newWidth; + return *this; + } + auto indent(size_t newIndent) -> Column& { + m_indent = newIndent; + return *this; + } + auto initialIndent(size_t newIndent) -> Column& { + m_initialIndent = newIndent; + return *this; + } + + auto width() const -> size_t { return m_width; } + auto begin() const -> iterator { return iterator(*this); } + auto end() const -> iterator { return { *this, m_strings.size() }; } + + inline friend std::ostream& operator << (std::ostream& os, Column const& col) { + bool first = true; + for (auto line : col) { + if (first) + first = false; + else + os << "\n"; + os << line; + } + return os; + } + + auto operator + (Column const& other)->Columns; + + auto toString() const -> std::string { + std::ostringstream oss; + oss << *this; + return oss.str(); + } +}; - for( size_t i = 0; i < m_columns.size(); ++i ) { - auto width = m_columns[i].width(); - if( m_iterators[i] != m_columns[i].end() ) { - std::string col = *m_iterators[i]; - row += padding + col; - if( col.size() < width ) - padding = std::string( width - col.size(), ' ' ); - else - padding = ""; - } - else { - padding += std::string( width, ' ' ); - } - } - return row; - } - auto operator ++() -> iterator& { - for( size_t i = 0; i < m_columns.size(); ++i ) { - if (m_iterators[i] != m_columns[i].end()) - ++m_iterators[i]; - } - return *this; - } - auto operator ++(int) -> iterator { - iterator prev( *this ); - operator++(); - return prev; - } - }; - using const_iterator = iterator; +class Spacer : public Column { - auto begin() const -> iterator { return iterator( *this ); } - auto end() const -> iterator { return { *this, iterator::EndTag() }; } +public: + explicit Spacer(size_t spaceWidth) : Column("") { + width(spaceWidth); + } +}; - auto operator += ( Column const& col ) -> Columns& { - m_columns.push_back( col ); - return *this; - } - auto operator + ( Column const& col ) -> Columns { - Columns combined = *this; - combined += col; - return combined; - } +class Columns { + std::vector<Column> m_columns; - inline friend std::ostream& operator << ( std::ostream& os, Columns const& cols ) { +public: - bool first = true; - for( auto line : cols ) { - if( first ) - first = false; - else - os << "\n"; - os << line; - } - return os; - } + class iterator { + friend Columns; + struct EndTag {}; + + std::vector<Column> const& m_columns; + std::vector<Column::iterator> m_iterators; + size_t m_activeIterators; + + iterator(Columns const& columns, EndTag) + : m_columns(columns.m_columns), + m_activeIterators(0) { + m_iterators.reserve(m_columns.size()); + + for (auto const& col : m_columns) + m_iterators.push_back(col.end()); + } + + public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::forward_iterator_tag; + + explicit iterator(Columns const& columns) + : m_columns(columns.m_columns), + m_activeIterators(m_columns.size()) { + m_iterators.reserve(m_columns.size()); + + for (auto const& col : m_columns) + m_iterators.push_back(col.begin()); + } + + auto operator ==(iterator const& other) const -> bool { + return m_iterators == other.m_iterators; + } + auto operator !=(iterator const& other) const -> bool { + return m_iterators != other.m_iterators; + } + auto operator *() const -> std::string { + std::string row, padding; + + for (size_t i = 0; i < m_columns.size(); ++i) { + auto width = m_columns[i].width(); + if (m_iterators[i] != m_columns[i].end()) { + std::string col = *m_iterators[i]; + row += padding + col; + if (col.size() < width) + padding = std::string(width - col.size(), ' '); + else + padding = ""; + } else { + padding += std::string(width, ' '); + } + } + return row; + } + auto operator ++() -> iterator& { + for (size_t i = 0; i < m_columns.size(); ++i) { + if (m_iterators[i] != m_columns[i].end()) + ++m_iterators[i]; + } + return *this; + } + auto operator ++(int) -> iterator { + iterator prev(*this); + operator++(); + return prev; + } + }; + using const_iterator = iterator; + + auto begin() const -> iterator { return iterator(*this); } + auto end() const -> iterator { return { *this, iterator::EndTag() }; } + + auto operator += (Column const& col) -> Columns& { + m_columns.push_back(col); + return *this; + } + auto operator + (Column const& col) -> Columns { + Columns combined = *this; + combined += col; + return combined; + } + + inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) { + + bool first = true; + for (auto line : cols) { + if (first) + first = false; + else + os << "\n"; + os << line; + } + return os; + } + + auto toString() const -> std::string { + std::ostringstream oss; + oss << *this; + return oss.str(); + } +}; - auto toString() const -> std::string { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - }; +inline auto Column::operator + (Column const& other) -> Columns { + Columns cols; + cols += *this; + cols += other; + return cols; +} +} - inline auto Column::operator + ( Column const& other ) -> Columns { - Columns cols; - cols += *this; - cols += other; - return cols; - } -}}} // namespace Catch::clara::TextFlow +} +} // ----------- end of #include from clara_textflow.hpp ----------- // ........... back in clara.hpp +#include <string> #include <memory> #include <set> #include <algorithm> @@ -7119,6 +7132,18 @@ namespace Catch { return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" ); return ParserResult::ok( ParseResultType::Matched ); }; + auto const setReporter = [&]( std::string const& reporter ) { + IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); + + auto lcReporter = toLower( reporter ); + auto result = factories.find( lcReporter ); + + if( factories.end() != result ) + config.reporterName = lcReporter; + else + return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" ); + return ParserResult::ok( ParseResultType::Matched ); + }; auto cli = ExeName( config.processName ) @@ -7144,7 +7169,7 @@ namespace Catch { | Opt( config.outputFilename, "filename" ) ["-o"]["--out"] ( "output filename" ) - | Opt( config.reporterName, "name" ) + | Opt( setReporter, "name" ) ["-r"]["--reporter"] ( "reporter to use (defaults to console)" ) | Opt( config.name, "name" ) @@ -8292,6 +8317,10 @@ namespace Catch { Catch::LeakDetector::LeakDetector() {} #endif + +Catch::LeakDetector::~LeakDetector() { + Catch::cleanUp(); +} // end catch_leak_detector.cpp // start catch_list.cpp @@ -8315,7 +8344,7 @@ namespace Catch { std::size_t listTags( Config const& config ); - std::size_t listReporters( Config const& /*config*/ ); + std::size_t listReporters(); Option<std::size_t> list( Config const& config ); @@ -8433,7 +8462,7 @@ namespace Catch { return tagCounts.size(); } - std::size_t listReporters( Config const& /*config*/ ) { + std::size_t listReporters() { Catch::cout() << "Available reporters:\n"; IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); std::size_t maxNameLen = 0; @@ -8464,7 +8493,7 @@ namespace Catch { if( config.listTags() ) listedCount = listedCount.valueOr(0) + listTags( config ); if( config.listReporters() ) - listedCount = listedCount.valueOr(0) + listReporters( config ); + listedCount = listedCount.valueOr(0) + listReporters(); return listedCount; } @@ -9930,13 +9959,22 @@ namespace Catch { void libIdentify(); int applyCommandLine( int argc, char const * const * argv ); + #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE) + int applyCommandLine( int argc, wchar_t const * const * argv ); + #endif void useConfigData( ConfigData const& configData ); - int run( int argc, char* argv[] ); - #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE) - int run( int argc, wchar_t* const argv[] ); - #endif + template<typename CharT> + int run(int argc, CharT const * const argv[]) { + if (m_startupExceptions) + return 1; + int returnCode = applyCommandLine(argc, argv); + if (returnCode == 0) + returnCode = run(); + return returnCode; + } + int run(); clara::Parser const& cli() const; @@ -10148,22 +10186,8 @@ namespace Catch { return 0; } - void Session::useConfigData( ConfigData const& configData ) { - m_configData = configData; - m_config.reset(); - } - - int Session::run( int argc, char* argv[] ) { - if( m_startupExceptions ) - return 1; - int returnCode = applyCommandLine( argc, argv ); - if( returnCode == 0 ) - returnCode = run(); - return returnCode; - } - #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE) - int Session::run( int argc, wchar_t* const argv[] ) { + int Session::applyCommandLine( int argc, wchar_t const * const * argv ) { char **utf8Argv = new char *[ argc ]; @@ -10175,7 +10199,7 @@ namespace Catch { WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL ); } - int returnCode = run( argc, utf8Argv ); + int returnCode = applyCommandLine( argc, utf8Argv ); for ( int i = 0; i < argc; ++i ) delete [] utf8Argv[ i ]; @@ -10185,6 +10209,12 @@ namespace Catch { return returnCode; } #endif + + void Session::useConfigData( ConfigData const& configData ) { + m_configData = configData; + m_config.reset(); + } + int Session::run() { if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) { Catch::cout() << "...waiting for enter/ return before starting" << std::endl; @@ -11686,7 +11716,7 @@ std::string StringMaker<bool>::convert(bool b) { return b ? "true" : "false"; } -std::string StringMaker<char>::convert(char value) { +std::string StringMaker<signed char>::convert(signed char value) { if (value == '\r') { return "'\\r'"; } else if (value == '\f') { @@ -11703,8 +11733,8 @@ std::string StringMaker<char>::convert(char value) { return chstr; } } -std::string StringMaker<signed char>::convert(signed char c) { - return ::Catch::Detail::stringify(static_cast<char>(c)); +std::string StringMaker<char>::convert(char c) { + return ::Catch::Detail::stringify(static_cast<signed char>(c)); } std::string StringMaker<unsigned char>::convert(unsigned char c) { return ::Catch::Detail::stringify(static_cast<char>(c)); @@ -11836,7 +11866,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 2, 4, 1, "", 0 ); + static Version version( 2, 4, 2, "", 0 ); return version; } @@ -13517,6 +13547,9 @@ namespace Catch { m_xml.startElement( "Catch" ); if( !m_config->name().empty() ) m_xml.writeAttribute( "name", m_config->name() ); + if( m_config->rngSeed() != 0 ) + m_xml.scopedElement( "Randomness" ) + .writeAttribute( "seed", m_config->rngSeed() ); } void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) { @@ -13792,6 +13825,14 @@ int main (int argc, char * const argv[]) { #define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE() +#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE) +#define CATCH_STATIC_REQUIRE( ... ) static_assert( __VA_ARGS__ , #__VA_ARGS__ ); CATCH_SUCCEED( #__VA_ARGS__ ) +#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ ) +#else +#define CATCH_STATIC_REQUIRE( ... ) CATCH_REQUIRE( __VA_ARGS__ ) +#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ ) +#endif + // "BDD-style" convenience wrappers #define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ ) #define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) @@ -13851,6 +13892,14 @@ int main (int argc, char * const argv[]) { #define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) #define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE() +#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE) +#define STATIC_REQUIRE( ... ) static_assert( __VA_ARGS__, #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ ) +#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" ) +#else +#define STATIC_REQUIRE( ... ) REQUIRE( __VA_ARGS__ ) +#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ ) +#endif + #endif #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) @@ -13931,6 +13980,9 @@ using Catch::Detail::Approx; #define CATCH_THEN( desc ) #define CATCH_AND_THEN( desc ) +#define CATCH_STATIC_REQUIRE( ... ) (void)(0) +#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0) + // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required #else @@ -13980,6 +14032,9 @@ using Catch::Detail::Approx; #define SUCCEED( ... ) (void)(0) #define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) +#define STATIC_REQUIRE( ... ) (void)(0) +#define STATIC_REQUIRE_FALSE( ... ) (void)(0) + #endif #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature ) diff --git a/packages/Catch2/test_package/conanfile.py b/packages/Catch2/test_package/conanfile.py index e8d50f9a8..e63b2ce59 100644 --- a/packages/Catch2/test_package/conanfile.py +++ b/packages/Catch2/test_package/conanfile.py @@ -10,7 +10,7 @@ class CatchConanTest(ConanFile): settings = "os", "compiler", "arch", "build_type" username = getenv("CONAN_USERNAME", "philsquared") channel = getenv("CONAN_CHANNEL", "testing") - requires = "Catch/2.4.1@%s/%s" % (username, channel) + requires = "Catch/2.4.2@%s/%s" % (username, channel) def build(self): cmake = CMake(self) diff --git a/packages/Catch2/third_party/clara.hpp b/packages/Catch2/third_party/clara.hpp index 43568cee2..6be5a98b1 100644 --- a/packages/Catch2/third_party/clara.hpp +++ b/packages/Catch2/third_party/clara.hpp @@ -5,7 +5,7 @@ // // See https://github.com/philsquared/Clara for more details -// Clara v1.1.4 +// Clara v1.1.5 #ifndef CLARA_HPP_INCLUDED #define CLARA_HPP_INCLUDED @@ -34,8 +34,8 @@ // // A single-header library for wrapping and laying out basic text, by Phil Nash // -// This work is licensed under the BSD 2-Clause license. -// See the accompanying LICENSE file, or the one at https://opensource.org/licenses/BSD-2-Clause +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // // This project is hosted at https://github.com/philsquared/textflowcpp @@ -142,6 +142,12 @@ namespace clara { namespace TextFlow { } public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type*; + using reference = value_type&; + using iterator_category = std::forward_iterator_tag; + explicit iterator( Column const& column ) : m_column( column ) { assert( m_column.m_width > m_column.m_indent ); assert( m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent ); @@ -153,10 +159,7 @@ namespace clara { namespace TextFlow { auto operator *() const -> std::string { assert( m_stringIndex < m_column.m_strings.size() ); assert( m_pos <= m_end ); - if( m_pos + m_column.m_width < m_end ) - return addIndentAndSuffix(line().substr(m_pos, m_len)); - else - return addIndentAndSuffix(line().substr(m_pos, m_end - m_pos)); + return addIndentAndSuffix(line().substr(m_pos, m_len)); } auto operator ++() -> iterator& { @@ -266,6 +269,12 @@ namespace clara { namespace TextFlow { } public: + using difference_type = std::ptrdiff_t; + using value_type = std::string; + using pointer = value_type*; + using reference = value_type&; + using iterator_category = std::forward_iterator_tag; + explicit iterator( Columns const& columns ) : m_columns( columns.m_columns ), m_activeIterators( m_columns.size() ) @@ -355,7 +364,7 @@ namespace clara { namespace TextFlow { cols += other; return cols; } -}} // namespace clara::TextFlow +}} #endif // CLARA_TEXTFLOW_HPP_INCLUDED -- GitLab