Skip to content

Commit

Permalink
Merge pull request #1769 from amitherman95/amitherman-1767
Browse files Browse the repository at this point in the history
Patch:Failure to pass special chars through input file
  • Loading branch information
horenmar authored Oct 9, 2019
2 parents 75200e1 + 3109add commit 1c57496
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
14 changes: 11 additions & 3 deletions include/internal/catch_test_spec_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "catch_test_spec_parser.h"


namespace Catch {

TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
Expand All @@ -18,6 +19,7 @@ namespace Catch {
m_escapeChars.clear();
m_substring.reserve(m_arg.size());
m_patternName.reserve(m_arg.size());
m_realPatternPos = 0;
for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
visitChar( m_arg[m_pos] );
endMode();
Expand All @@ -32,6 +34,7 @@ namespace Catch {
escape();
m_substring += c;
m_patternName += c;
m_realPatternPos++;
return;
}else if((m_mode != EscapedName) && (c == ',') ) {
endMode();
Expand All @@ -49,7 +52,10 @@ namespace Catch {
break;
case EscapedName:
endMode();
break;
m_substring += c;
m_patternName += c;
m_realPatternPos++;
return;
default:
case Tag:
case QuotedName:
Expand All @@ -59,8 +65,10 @@ namespace Catch {
}

m_substring += c;
if( !isControlChar( c ) )
if( !isControlChar( c ) ) {
m_patternName += c;
m_realPatternPos++;
}
}
// Two of the processing methods return true to signal the caller to return
// without adding the given character to the current pattern strings
Expand Down Expand Up @@ -119,7 +127,7 @@ namespace Catch {
void TestSpecParser::escape() {
saveLastMode();
m_mode = EscapedName;
m_escapeChars.push_back( m_pos );
m_escapeChars.push_back(m_realPatternPos);
}
bool TestSpecParser::isControlChar( char c ) const {
switch( m_mode ) {
Expand Down
1 change: 1 addition & 0 deletions include/internal/catch_test_spec_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace Catch {
Mode lastMode = None;
bool m_exclusion = false;
std::size_t m_pos = 0;
std::size_t m_realPatternPos = 0;
std::string m_arg;
std::string m_substring;
std::string m_patternName;
Expand Down
6 changes: 6 additions & 0 deletions projects/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,12 @@ set_tests_properties(FilenameAsTagsTest PROPERTIES PASS_REGULAR_EXPRESSION "\\[#
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")

add_test(NAME SpecialCharactersInTestNamesFromFile COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/special-characters-in-file.input")
set_tests_properties(SpecialCharactersInTestNamesFromFile PROPERTIES PASS_REGULAR_EXPRESSION "1 assertion in 1 test case")

add_test(NAME RunningTestsFromFile COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/plain-old-tests.input")
set_tests_properties(RunningTestsFromFile PROPERTIES PASS_REGULAR_EXPRESSION "6 assertions in 2 test cases")


if (CATCH_USE_VALGRIND)
add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>)
Expand Down
2 changes: 2 additions & 0 deletions projects/SelfTest/Misc/plain-old-tests.input
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
random SECTION tests
nested SECTION tests
1 change: 1 addition & 0 deletions projects/SelfTest/Misc/special-characters-in-file.input
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test with special\, characters \"in name

0 comments on commit 1c57496

Please sign in to comment.