eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 14:09:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tags beginning with a non alpha-numeric character are now disallowed.

Browse source 
Added !throws special tag which denotes a test case to be skipped when run with -e
(the idea being that the test case is expected to throw an exception which is not caught within a XXX_THROWS assertion).
This commit is contained in:
Phil Nash 2014-04-15 18:44:37 +01:00
parent c5406a25bf
commit 20cad7cb1d
18 changed files with 312 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

41
include/internal/catch_test_case_info.hpp
View file

@ -15,6 +15,16 @@
namespace Catch {
inline bool isSpecialTag( std::string const& tag ) {
return tag == "." ||
tag == "hide" ||
tag == "!hide" ||
tag == "!throws";
}
inline bool isReservedTag( std::string const& tag ) {
return !isSpecialTag( tag ) && tag.size() > 0 && !isalnum( tag[0] );
}
TestCase makeTestCase( ITestCase* _testCase,
std::string const& _className,
std::string const& _name,
@ -25,6 +35,23 @@ namespace Catch {
bool isHidden( startsWith( _name, "./" ) ); // Legacy support
std::set<std::string> tags;
TagExtracter( tags ).parse( desc );
for( std::set<std::string>::const_iterator it = tags.begin(), itEnd = tags.end();
it != itEnd;
++it )
if( isReservedTag( *it ) ) {
{
Colour colourGuard( Colour::Red );
std::cerr
<< "Tag name [" << *it << "] not allowed.\n"
<< "Tag names starting with non alpha-numeric characters are reserved\n";
}
{
Colour colourGuard( Colour::FileName );
std::cerr << _lineInfo << std::endl;
}
exit(1);
}
if( tags.find( "hide" ) != tags.end() || tags.find( "." ) != tags.end() )
isHidden = true;
@ -47,11 +74,15 @@ namespace Catch {
description( _description ),
tags( _tags ),
lineInfo( _lineInfo ),
isHidden( _isHidden )
isHidden( _isHidden ),
throws( false )
{
std::ostringstream oss;
for( std::set<std::string>::const_iterator it = _tags.begin(), itEnd = _tags.end(); it != itEnd; ++it )
for( std::set<std::string>::const_iterator it = _tags.begin(), itEnd = _tags.end(); it != itEnd; ++it ) {
oss << "[" << *it << "]";
if( *it == "!throws" )
throws = true;
}
tagsAsString = oss.str();
}
@ -62,7 +93,8 @@ namespace Catch {
tags( other.tags ),
tagsAsString( other.tagsAsString ),
lineInfo( other.lineInfo ),
isHidden( other.isHidden )
isHidden( other.isHidden ),
throws( other.throws )
{}
TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
@ -85,6 +117,9 @@ namespace Catch {
bool TestCase::isHidden() const {
return TestCaseInfo::isHidden;
}
bool TestCase::throws() const {
return TestCaseInfo::throws;
}
bool TestCase::hasTag( std::string const& tag ) const {
return tags.find( toLower( tag ) ) != tags.end();