mirror of
https://github.com/catchorg/Catch2.git
synced 2025-10-19 16:45:40 +02:00
merged conflicts
This commit is contained in:
@@ -830,6 +830,6 @@ with expansion:
|
||||
"first" == "second"
|
||||
|
||||
===============================================================================
|
||||
test cases: 168 | 124 passed | 42 failed | 2 failed as expected
|
||||
assertions: 920 | 824 passed | 78 failed | 18 failed as expected
|
||||
test cases: 169 | 125 passed | 42 failed | 2 failed as expected
|
||||
assertions: 921 | 825 passed | 78 failed | 18 failed as expected
|
||||
|
||||
|
@@ -3920,9 +3920,9 @@ MiscTests.cpp:<line number>
|
||||
|
||||
MiscTests.cpp:<line number>:
|
||||
PASSED:
|
||||
REQUIRE( encode( "[\x01]" ) == "[]" )
|
||||
REQUIRE( encode( "[\x01]" ) == "[]" )
|
||||
with expansion:
|
||||
"[]" == "[]"
|
||||
"[]" == "[]"
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
XmlEncode
|
||||
@@ -3933,9 +3933,9 @@ MiscTests.cpp:<line number>
|
||||
|
||||
MiscTests.cpp:<line number>:
|
||||
PASSED:
|
||||
REQUIRE( encode( "[\x7F]" ) == "[]" )
|
||||
REQUIRE( encode( "[\x7F]" ) == "[]" )
|
||||
with expansion:
|
||||
"[]" == "[]"
|
||||
"[]" == "[]"
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
long long
|
||||
@@ -3962,6 +3962,17 @@ PASSED:
|
||||
with message:
|
||||
oops!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
# A test name that starts with a #
|
||||
-------------------------------------------------------------------------------
|
||||
MiscTests.cpp:<line number>
|
||||
...............................................................................
|
||||
|
||||
MiscTests.cpp:<line number>:
|
||||
PASSED:
|
||||
with message:
|
||||
yay
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
Process can be configured on command line
|
||||
default - no arguments
|
||||
@@ -9104,6 +9115,6 @@ with expansion:
|
||||
1 > 0
|
||||
|
||||
===============================================================================
|
||||
test cases: 168 | 123 passed | 43 failed | 2 failed as expected
|
||||
assertions: 922 | 824 passed | 80 failed | 18 failed as expected
|
||||
test cases: 169 | 124 passed | 43 failed | 2 failed as expected
|
||||
assertions: 923 | 825 passed | 80 failed | 18 failed as expected
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.1" encoding="UTF-8"?>
|
||||
<testsuites>
|
||||
<testsuite name="CatchSelfTest" errors="13" failures="68" tests="923" hostname="tbd" time="{duration}" timestamp="tbd">
|
||||
<testsuite name="CatchSelfTest" errors="13" failures="68" tests="924" hostname="tbd" time="{duration}" timestamp="tbd">
|
||||
<testcase classname="global" name="toString(enum)" time="{duration}"/>
|
||||
<testcase classname="global" name="toString(enum w/operator<<)" time="{duration}"/>
|
||||
<testcase classname="global" name="toString(enum class)" time="{duration}"/>
|
||||
@@ -500,6 +501,7 @@ MiscTests.cpp:<line number>
|
||||
<testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/>
|
||||
<testcase classname="global" name="long long" time="{duration}"/>
|
||||
<testcase classname="global" name="This test 'should' fail but doesn't" time="{duration}"/>
|
||||
<testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
|
||||
<testcase classname="Process can be configured on command line" name="default - no arguments" time="{duration}"/>
|
||||
<testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/>
|
||||
<testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/>
|
||||
|
@@ -1,3 +1,4 @@
|
||||
<?xml version="1.1" encoding="UTF-8"?>
|
||||
<Catch name="CatchSelfTest">
|
||||
<Group name="CatchSelfTest">
|
||||
<TestCase name="toString(enum)">
|
||||
@@ -4051,10 +4052,10 @@
|
||||
<Section name="string with control char (1)">
|
||||
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
|
||||
<Original>
|
||||
encode( "[\x01]" ) == "[&#x1]"
|
||||
encode( "[\x01]" ) == "[&#x01;]"
|
||||
</Original>
|
||||
<Expanded>
|
||||
"[&#x1]" == "[&#x1]"
|
||||
"[&#x01;]" == "[&#x01;]"
|
||||
</Expanded>
|
||||
</Expression>
|
||||
<OverallResults successes="1" failures="0" expectedFailures="0"/>
|
||||
@@ -4062,10 +4063,10 @@
|
||||
<Section name="string with control char (x7F)">
|
||||
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
|
||||
<Original>
|
||||
encode( "[\x7F]" ) == "[&#x7F]"
|
||||
encode( "[\x7F]" ) == "[&#x7F;]"
|
||||
</Original>
|
||||
<Expanded>
|
||||
"[&#x7F]" == "[&#x7F]"
|
||||
"[&#x7F;]" == "[&#x7F;]"
|
||||
</Expanded>
|
||||
</Expression>
|
||||
<OverallResults successes="1" failures="0" expectedFailures="0"/>
|
||||
@@ -4088,6 +4089,9 @@
|
||||
<TestCase name="This test 'should' fail but doesn't">
|
||||
<OverallResult success="false"/>
|
||||
</TestCase>
|
||||
<TestCase name="# A test name that starts with a #">
|
||||
<OverallResult success="true"/>
|
||||
</TestCase>
|
||||
<TestCase name="Process can be configured on command line">
|
||||
<Section name="default - no arguments">
|
||||
<Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
|
||||
@@ -9566,7 +9570,7 @@ there"
|
||||
</Section>
|
||||
<OverallResult success="true"/>
|
||||
</TestCase>
|
||||
<OverallResults successes="824" failures="81" expectedFailures="18"/>
|
||||
<OverallResults successes="825" failures="81" expectedFailures="18"/>
|
||||
</Group>
|
||||
<OverallResults successes="824" failures="80" expectedFailures="18"/>
|
||||
<OverallResults successes="825" failures="80" expectedFailures="18"/>
|
||||
</Catch>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
#include "catch_test_spec_parser.hpp"
|
||||
#include "internal/catch_test_spec_parser.hpp"
|
||||
|
||||
#ifdef __clang__
|
||||
# pragma clang diagnostic ignored "-Wc++98-compat"
|
||||
|
@@ -406,27 +406,27 @@ TEST_CASE( "Tabs and newlines show in output", "[.][whitespace][failing]" ) {
|
||||
|
||||
|
||||
TEST_CASE( "toString on const wchar_t const pointer returns the string contents", "[toString]" ) {
|
||||
const wchar_t * const s = L"wide load";
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
const wchar_t * const s = L"wide load";
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
}
|
||||
|
||||
TEST_CASE( "toString on const wchar_t pointer returns the string contents", "[toString]" ) {
|
||||
const wchar_t * s = L"wide load";
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
const wchar_t * s = L"wide load";
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
}
|
||||
|
||||
TEST_CASE( "toString on wchar_t const pointer returns the string contents", "[toString]" ) {
|
||||
wchar_t * const s = const_cast<wchar_t* const>( L"wide load" );
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
wchar_t * const s = const_cast<wchar_t* const>( L"wide load" );
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
}
|
||||
|
||||
TEST_CASE( "toString on wchar_t returns the string contents", "[toString]" ) {
|
||||
wchar_t * s = const_cast<wchar_t*>( L"wide load" );
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
wchar_t * s = const_cast<wchar_t*>( L"wide load" );
|
||||
std::string result = Catch::toString( s );
|
||||
CHECK( result == "\"wide load\"" );
|
||||
}
|
||||
|
||||
inline std::string encode( std::string const& str, Catch::XmlEncode::ForWhat forWhat = Catch::XmlEncode::ForTextNodes ) {
|
||||
@@ -465,6 +465,10 @@ TEST_CASE( "XmlEncode" ) {
|
||||
}
|
||||
SECTION( "string with utf-8 characters (русский текст)" ) {
|
||||
REQUIRE( encode( "русский текст" ) == "русский текст" );
|
||||
REQUIRE( encode( "[\x01]" ) == "[]" );
|
||||
}
|
||||
SECTION( "string with control char (x7F)" ) {
|
||||
REQUIRE( encode( "[\x7F]" ) == "[]" );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -486,3 +490,7 @@ TEST_CASE( "This test 'should' fail but doesn't", "[.][failing][!shouldfail]" )
|
||||
{
|
||||
SUCCEED( "oops!" );
|
||||
}
|
||||
|
||||
TEST_CASE( "# A test name that starts with a #" ) {
|
||||
SUCCEED( "yay" );
|
||||
}
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_common.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_common.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_console_colour.hpp"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_console_colour.hpp"
|
||||
|
@@ -1,2 +1,2 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_debugger.h"
|
||||
#include "internal/catch_debugger.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_capture.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_capture.h"
|
||||
|
@@ -1,2 +1,2 @@
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_config.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_config.h"
|
||||
|
@@ -1,2 +1,2 @@
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_exception.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_exception.h"
|
||||
|
@@ -1 +1 @@
|
||||
#include "catch_interfaces_generators.h"
|
||||
#include "internal/catch_interfaces_generators.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_registry_hub.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_registry_hub.h"
|
||||
|
@@ -1,2 +1,2 @@
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_reporter.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_reporter.h"
|
||||
|
@@ -1 +1 @@
|
||||
#include "catch_interfaces_runner.h"
|
||||
#include "internal/catch_interfaces_runner.h"
|
||||
|
@@ -1,2 +1,2 @@
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_interfaces_testcase.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_interfaces_testcase.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_message.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_message.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_option.hpp"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_option.hpp"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_ptr.hpp"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_ptr.hpp"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_stream.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_stream.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_streambuf.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_streambuf.h"
|
||||
|
@@ -1,3 +1,3 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_test_spec.hpp"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_test_spec.hpp"
|
||||
|
@@ -1,4 +1,4 @@
|
||||
// This file is only here to verify (to the extent possible) the self sufficiency of the header
|
||||
#include "catch_suppress_warnings.h"
|
||||
#include "catch_xmlwriter.hpp"
|
||||
#include "catch_reenable_warnings.h"
|
||||
#include "internal/catch_suppress_warnings.h"
|
||||
#include "internal/catch_xmlwriter.hpp"
|
||||
#include "internal/catch_reenable_warnings.h"
|
||||
|
@@ -25,7 +25,7 @@ CATCH_REGISTER_TAG_ALIAS( "[@tricky]", "[tricky]~[.]" )
|
||||
template<size_t size>
|
||||
void parseIntoConfig( const char * (&argv)[size], Catch::ConfigData& config ) {
|
||||
Catch::Clara::CommandLine<Catch::ConfigData> parser = Catch::makeCommandLineParser();
|
||||
parser.parseInto( size, argv, config );
|
||||
parser.parseInto( Catch::Clara::argsToVector( size, argv ), config );
|
||||
}
|
||||
|
||||
template<size_t size>
|
||||
|
Reference in New Issue
Block a user