3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-19 16:45:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged conflicts

Browse Source
This commit is contained in:
Vladimir Zelenkin
2016-11-23 12:55:08 +03:00
parent 8f7a9e98a8 30cebd6177
commit 517e31799f
48 changed files with 539 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
projects/CMake/CMakeLists.txt
View File

@@ -7,31 +7,51 @@ get_filename_component(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
get_filename_component(CATCH_DIR "${CATCH_DIR}" PATH)
set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
if(USE_CPP11)
## We can't turn this on by default, since it breaks on travis
message(STATUS "Enabling C++11")
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
## We can't turn this on by default, since it breaks on travis
message(STATUS "Enabling C++11")
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
endif()
# define the sources of the self test
set(SOURCES
${SELF_TEST_DIR}/ApproxTests.cpp
${SELF_TEST_DIR}/BDDTests.cpp
${SELF_TEST_DIR}/ClassTests.cpp
${SELF_TEST_DIR}/ConditionTests.cpp
${SELF_TEST_DIR}/ExceptionTests.cpp
${SELF_TEST_DIR}/GeneratorTests.cpp
${SELF_TEST_DIR}/MessageTests.cpp
${SELF_TEST_DIR}/MiscTests.cpp
${SELF_TEST_DIR}/PartTrackerTests.cpp
${SELF_TEST_DIR}/TestMain.cpp
${SELF_TEST_DIR}/TrickyTests.cpp
${SELF_TEST_DIR}/VariadicMacrosTests.cpp
${SELF_TEST_DIR}/EnumToString.cpp
${SELF_TEST_DIR}/ToStringPair.cpp
${SELF_TEST_DIR}/ToStringVector.cpp
${SELF_TEST_DIR}/ToStringWhich.cpp
${SELF_TEST_DIR}/ToStringTuple.cpp
)
${SELF_TEST_DIR}/ApproxTests.cpp
${SELF_TEST_DIR}/BDDTests.cpp
${SELF_TEST_DIR}/ClassTests.cpp
${SELF_TEST_DIR}/ConditionTests.cpp
${SELF_TEST_DIR}/ExceptionTests.cpp
${SELF_TEST_DIR}/GeneratorTests.cpp
${SELF_TEST_DIR}/MessageTests.cpp
${SELF_TEST_DIR}/MiscTests.cpp
${SELF_TEST_DIR}/PartTrackerTests.cpp
${SELF_TEST_DIR}/TestMain.cpp
${SELF_TEST_DIR}/TrickyTests.cpp
${SELF_TEST_DIR}/VariadicMacrosTests.cpp
${SELF_TEST_DIR}/EnumToString.cpp
${SELF_TEST_DIR}/ToStringPair.cpp
${SELF_TEST_DIR}/ToStringVector.cpp
${SELF_TEST_DIR}/ToStringWhich.cpp
${SELF_TEST_DIR}/ToStringTuple.cpp
${SELF_TEST_DIR}/CmdLineTests.cpp
${SELF_TEST_DIR}/TagAliasTests.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_common.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_console_colour.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_debugger.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_capture.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_config.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_exception.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_generators.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_registry_hub.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_reporter.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_runner.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_interfaces_testcase.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_message.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_option.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_ptr.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_stream.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_streambuf.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_test_spec.cpp
${SELF_TEST_DIR}/SurrogateCpps/catch_xmlwriter.cpp
)
# configure the executable
include_directories(${CATCH_DIR}/include)

4
projects/SelfTest/Baselines/console.std.approved.txt
View File

@@ -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

23
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@@ -3920,9 +3920,9 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x01]" ) == "[&#x1]" )
REQUIRE( encode( "[\x01]" ) == "[&#x01;]" )
with expansion:
"[&#x1]" == "[&#x1]"
"[&#x01;]" == "[&#x01;]"
-------------------------------------------------------------------------------
XmlEncode
@@ -3933,9 +3933,9 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x7F]" ) == "[&#x7F]" )
REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" )
with expansion:
"[&#x7F]" == "[&#x7F]"
"[&#x7F;]" == "[&#x7F;]"
-------------------------------------------------------------------------------
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

4
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@@ -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&lt;&lt;)" 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}"/>

16
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@@ -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]" ) == "[&amp;#x1]"
encode( "[\x01]" ) == "[&amp;#x01;]"
</Original>
<Expanded>
"[&amp;#x1]" == "[&amp;#x1]"
"[&amp;#x01;]" == "[&amp;#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]" ) == "[&amp;#x7F]"
encode( "[\x7F]" ) == "[&amp;#x7F;]"
</Original>
<Expanded>
"[&amp;#x7F]" == "[&amp;#x7F]"
"[&amp;#x7F;]" == "[&amp;#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>

2
projects/SelfTest/CmdLineTests.cpp
View File

@@ -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"

32
projects/SelfTest/MiscTests.cpp
View File

@@ -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]" ) == "[&#x01;]" );
}
SECTION( "string with control char (x7F)" ) {
REQUIRE( encode( "[\x7F]" ) == "[&#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" );
}

4
projects/SelfTest/SurrogateCpps/catch_common.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
View File

@@ -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"

2
projects/SelfTest/SurrogateCpps/catch_debugger.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_exception.cpp
View File

@@ -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"

2
projects/SelfTest/SurrogateCpps/catch_interfaces_generators.cpp
View File

@@ -1 +1 @@
#include "catch_interfaces_generators.h"
#include "internal/catch_interfaces_generators.h"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_registry_hub.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
View File

@@ -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"

2
projects/SelfTest/SurrogateCpps/catch_interfaces_runner.cpp
View File

@@ -1 +1 @@
#include "catch_interfaces_runner.h"
#include "internal/catch_interfaces_runner.h"

4
projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_message.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_option.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_ptr.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_stream.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_streambuf.cpp
View File

@@ -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"

4
projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
View File

@@ -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"

6
projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
View File

@@ -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"

2
projects/SelfTest/TestMain.cpp
View File

@@ -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>