mirror of https://github.com/catchorg/Catch2.git
Merge pull request #1752 from amitherman95/amitherman-1737
Escape characters bug patch(v2.9.2)
This commit is contained in:
commit
da0062f7c1
|
@ -28,7 +28,12 @@ namespace Catch {
|
||||||
return m_testSpec;
|
return m_testSpec;
|
||||||
}
|
}
|
||||||
void TestSpecParser::visitChar( char c ) {
|
void TestSpecParser::visitChar( char c ) {
|
||||||
if( c == ',' ) {
|
if( (m_mode != EscapedName) && (c == '\\') ) {
|
||||||
|
escape();
|
||||||
|
m_substring += c;
|
||||||
|
m_patternName += c;
|
||||||
|
return;
|
||||||
|
}else if((m_mode != EscapedName) && (c == ',') ) {
|
||||||
endMode();
|
endMode();
|
||||||
addFilter();
|
addFilter();
|
||||||
return;
|
return;
|
||||||
|
@ -72,9 +77,6 @@ namespace Catch {
|
||||||
case '"':
|
case '"':
|
||||||
startNewMode( QuotedName );
|
startNewMode( QuotedName );
|
||||||
return false;
|
return false;
|
||||||
case '\\':
|
|
||||||
escape();
|
|
||||||
return true;
|
|
||||||
default:
|
default:
|
||||||
startNewMode( Name );
|
startNewMode( Name );
|
||||||
return false;
|
return false;
|
||||||
|
@ -107,13 +109,15 @@ namespace Catch {
|
||||||
case Tag:
|
case Tag:
|
||||||
return addPattern<TestSpec::TagPattern>();
|
return addPattern<TestSpec::TagPattern>();
|
||||||
case EscapedName:
|
case EscapedName:
|
||||||
return startNewMode( Name );
|
revertBackToLastMode();
|
||||||
|
return;
|
||||||
case None:
|
case None:
|
||||||
default:
|
default:
|
||||||
return startNewMode( None );
|
return startNewMode( None );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void TestSpecParser::escape() {
|
void TestSpecParser::escape() {
|
||||||
|
saveLastMode();
|
||||||
m_mode = EscapedName;
|
m_mode = EscapedName;
|
||||||
m_escapeChars.push_back( m_pos );
|
m_escapeChars.push_back( m_pos );
|
||||||
}
|
}
|
||||||
|
@ -141,6 +145,14 @@ namespace Catch {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TestSpecParser::saveLastMode() {
|
||||||
|
lastMode = m_mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestSpecParser::revertBackToLastMode() {
|
||||||
|
m_mode = lastMode;
|
||||||
|
}
|
||||||
|
|
||||||
TestSpec parseTestSpec( std::string const& arg ) {
|
TestSpec parseTestSpec( std::string const& arg ) {
|
||||||
return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
|
return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@ namespace Catch {
|
||||||
class TestSpecParser {
|
class TestSpecParser {
|
||||||
enum Mode{ None, Name, QuotedName, Tag, EscapedName };
|
enum Mode{ None, Name, QuotedName, Tag, EscapedName };
|
||||||
Mode m_mode = None;
|
Mode m_mode = None;
|
||||||
|
Mode lastMode = None;
|
||||||
bool m_exclusion = false;
|
bool m_exclusion = false;
|
||||||
std::size_t m_pos = 0;
|
std::size_t m_pos = 0;
|
||||||
std::string m_arg;
|
std::string m_arg;
|
||||||
|
@ -47,6 +48,8 @@ namespace Catch {
|
||||||
void endMode();
|
void endMode();
|
||||||
void escape();
|
void escape();
|
||||||
bool isControlChar( char c ) const;
|
bool isControlChar( char c ) const;
|
||||||
|
void saveLastMode();
|
||||||
|
void revertBackToLastMode();
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
void addPattern() {
|
void addPattern() {
|
||||||
|
|
|
@ -29,7 +29,8 @@ std::string escape_arg(const std::string& arg) {
|
||||||
escaped.append(num_backslashes * 2, '\\');
|
escaped.append(num_backslashes * 2, '\\');
|
||||||
break;
|
break;
|
||||||
} else if (*it == '"') {
|
} else if (*it == '"') {
|
||||||
escaped.append(num_backslashes * 2 + 1, '\\');
|
escaped.append((num_backslashes + 1) * 2, '\\');
|
||||||
|
escaped.push_back('"');
|
||||||
escaped.push_back(*it);
|
escaped.push_back(*it);
|
||||||
} else {
|
} else {
|
||||||
escaped.append(num_backslashes, '\\');
|
escaped.append(num_backslashes, '\\');
|
||||||
|
|
|
@ -429,6 +429,9 @@ set_tests_properties(LibIdentityTest PROPERTIES PASS_REGULAR_EXPRESSION "descrip
|
||||||
add_test(NAME FilenameAsTagsTest COMMAND $<TARGET_FILE:SelfTest> -\# --list-tags)
|
add_test(NAME FilenameAsTagsTest COMMAND $<TARGET_FILE:SelfTest> -\# --list-tags)
|
||||||
set_tests_properties(FilenameAsTagsTest PROPERTIES PASS_REGULAR_EXPRESSION "\\[#Approx.tests\\]")
|
set_tests_properties(FilenameAsTagsTest PROPERTIES PASS_REGULAR_EXPRESSION "\\[#Approx.tests\\]")
|
||||||
|
|
||||||
|
add_test(NAME EscapeSpecialCharactersInTestNames COMMAND $<TARGET_FILE:SelfTest> "Test with special\\, characters \"in name")
|
||||||
|
set_tests_properties(EscapeSpecialCharactersInTestNames PROPERTIES PASS_REGULAR_EXPRESSION "1 assertion in 1 test case")
|
||||||
|
|
||||||
|
|
||||||
if (CATCH_USE_VALGRIND)
|
if (CATCH_USE_VALGRIND)
|
||||||
add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>)
|
add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>)
|
||||||
|
|
|
@ -1235,6 +1235,7 @@ Misc.tests.cpp:<line number>: passed: v.size() == V for: 15 == 15
|
||||||
Misc.tests.cpp:<line number>: passed: v.capacity() >= V for: 15 >= 15
|
Misc.tests.cpp:<line number>: passed: v.capacity() >= V for: 15 >= 15
|
||||||
VariadicMacros.tests.cpp:<line number>: passed: with 1 message: 'no assertions'
|
VariadicMacros.tests.cpp:<line number>: passed: with 1 message: 'no assertions'
|
||||||
Tricky.tests.cpp:<line number>: passed: 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472
|
Tricky.tests.cpp:<line number>: passed: 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472
|
||||||
|
CmdLine.tests.cpp:<line number>: passed:
|
||||||
Message.tests.cpp:<line number>: failed - but was ok: 1 == 2
|
Message.tests.cpp:<line number>: failed - but was ok: 1 == 2
|
||||||
Misc.tests.cpp:<line number>: passed: with 1 message: 'oops!'
|
Misc.tests.cpp:<line number>: passed: with 1 message: 'oops!'
|
||||||
Exception.tests.cpp:<line number>: failed: unexpected exception with message: 'For some reason someone is throwing a string literal!'
|
Exception.tests.cpp:<line number>: failed: unexpected exception with message: 'For some reason someone is throwing a string literal!'
|
||||||
|
|
|
@ -1380,6 +1380,6 @@ due to unexpected exception with message:
|
||||||
Why would you throw a std::string?
|
Why would you throw a std::string?
|
||||||
|
|
||||||
===============================================================================
|
===============================================================================
|
||||||
test cases: 300 | 226 passed | 70 failed | 4 failed as expected
|
test cases: 301 | 227 passed | 70 failed | 4 failed as expected
|
||||||
assertions: 1568 | 1416 passed | 131 failed | 21 failed as expected
|
assertions: 1569 | 1417 passed | 131 failed | 21 failed as expected
|
||||||
|
|
||||||
|
|
|
@ -9321,6 +9321,14 @@ Tricky.tests.cpp:<line number>: PASSED:
|
||||||
with expansion:
|
with expansion:
|
||||||
3221225472 (0x<hex digits>) == 3221225472
|
3221225472 (0x<hex digits>) == 3221225472
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
Test with special, characters "in name
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
CmdLine.tests.cpp:<line number>
|
||||||
|
...............................................................................
|
||||||
|
|
||||||
|
CmdLine.tests.cpp:<line number>: PASSED:
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
The NO_FAIL macro reports a failure but does not fail the test
|
The NO_FAIL macro reports a failure but does not fail the test
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
@ -12520,6 +12528,6 @@ Misc.tests.cpp:<line number>
|
||||||
Misc.tests.cpp:<line number>: PASSED:
|
Misc.tests.cpp:<line number>: PASSED:
|
||||||
|
|
||||||
===============================================================================
|
===============================================================================
|
||||||
test cases: 300 | 210 passed | 86 failed | 4 failed as expected
|
test cases: 301 | 211 passed | 86 failed | 4 failed as expected
|
||||||
assertions: 1585 | 1416 passed | 148 failed | 21 failed as expected
|
assertions: 1586 | 1417 passed | 148 failed | 21 failed as expected
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<testsuitesloose text artifact
|
<testsuitesloose text artifact
|
||||||
>
|
>
|
||||||
<testsuite name="<exe-name>" errors="17" failures="132" tests="1586" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
|
<testsuite name="<exe-name>" errors="17" failures="132" tests="1587" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
|
||||||
<properties>
|
<properties>
|
||||||
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals]"/>
|
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals]"/>
|
||||||
<property name="random-seed" value="1"/>
|
<property name="random-seed" value="1"/>
|
||||||
|
@ -808,6 +808,7 @@ Misc.tests.cpp:<line number>
|
||||||
<testcase classname="<exe-name>.global" name="TemplateTestSig: vectors can be sized and resized - std::string,15/reserving smaller does not change size or capacity" time="{duration}"/>
|
<testcase classname="<exe-name>.global" name="TemplateTestSig: vectors can be sized and resized - std::string,15/reserving smaller does not change size or capacity" time="{duration}"/>
|
||||||
<testcase classname="<exe-name>.global" name="Test case with one argument" time="{duration}"/>
|
<testcase classname="<exe-name>.global" name="Test case with one argument" time="{duration}"/>
|
||||||
<testcase classname="<exe-name>.global" name="Test enum bit values" time="{duration}"/>
|
<testcase classname="<exe-name>.global" name="Test enum bit values" time="{duration}"/>
|
||||||
|
<testcase classname="<exe-name>.global" name="Test with special, characters "in name" time="{duration}"/>
|
||||||
<testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}"/>
|
<testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}"/>
|
||||||
<testcase classname="<exe-name>.global" name="This test 'should' fail but doesn't" time="{duration}"/>
|
<testcase classname="<exe-name>.global" name="This test 'should' fail but doesn't" time="{duration}"/>
|
||||||
<testcase classname="<exe-name>.global" name="Thrown string literals are translated" time="{duration}">
|
<testcase classname="<exe-name>.global" name="Thrown string literals are translated" time="{duration}">
|
||||||
|
|
|
@ -11269,6 +11269,9 @@ Message from section two
|
||||||
</Expression>
|
</Expression>
|
||||||
<OverallResult success="true"/>
|
<OverallResult success="true"/>
|
||||||
</TestCase>
|
</TestCase>
|
||||||
|
<TestCase name="Test with special, characters "in name" tags="[cli][regression]" filename="projects/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
|
||||||
|
<OverallResult success="true"/>
|
||||||
|
</TestCase>
|
||||||
<TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
|
<TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
|
||||||
<Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
|
<Expression success="false" type="CHECK_NOFAIL" filename="projects/<exe-name>/UsageTests/Message.tests.cpp" >
|
||||||
<Original>
|
<Original>
|
||||||
|
@ -14912,7 +14915,7 @@ loose text artifact
|
||||||
</Section>
|
</Section>
|
||||||
<OverallResult success="true"/>
|
<OverallResult success="true"/>
|
||||||
</TestCase>
|
</TestCase>
|
||||||
<OverallResults successes="1416" failures="149" expectedFailures="21"/>
|
<OverallResults successes="1417" failures="149" expectedFailures="21"/>
|
||||||
</Group>
|
</Group>
|
||||||
<OverallResults successes="1416" failures="148" expectedFailures="21"/>
|
<OverallResults successes="1417" failures="148" expectedFailures="21"/>
|
||||||
</Catch>
|
</Catch>
|
||||||
|
|
|
@ -506,3 +506,8 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE("Test with special, characters \"in name", "[cli][regression]") {
|
||||||
|
// This test case succeeds if we can invoke it from the CLI
|
||||||
|
SUCCEED();
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue