diff options
| author | Martin Hořeňovský | 2019-10-20 15:14:50 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-10-20 15:14:50 +0200 |
| commit | 90825a4f7aa4f537a168ce95e901933fda375f88 (patch) | |
| tree | f808c143e0aa8d9b5de9357ccd5cd2b45735b840 | |
| parent | 9e8ae7d4701770c3f4f23414214634f59809fa71 (diff) | |
| download | catch3-90825a4f7aa4f537a168ce95e901933fda375f88.tar.gz | |
Add more tests for reading test specs from file
Related to #1770
| -rw-r--r-- | projects/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | projects/SelfTest/Misc/invalid-test-names.input | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 0a14006c..cbe21fcf 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -435,11 +435,20 @@ 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 TestsInFile::SimpleSpecs COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/plain-old-tests.input") +set_tests_properties(TestsInFile::SimpleSpecs PROPERTIES PASS_REGULAR_EXPRESSION "6 assertions in 2 test cases") -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") +add_test(NAME TestsInFile::EscapeSpecialCharacters COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/special-characters-in-file.input") +set_tests_properties(TestsInFile::EscapeSpecialCharacters PROPERTIES PASS_REGULAR_EXPRESSION "1 assertion in 1 test case") + +# CTest does not allow us to create an AND of required regular expressions, +# so we have to split the test into 2 parts and look for parts of the expected +# output separately. +add_test(NAME TestsInFile::InvalidTestNames-1 COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/invalid-test-names.input") +set_tests_properties(TestsInFile::InvalidTestNames-1 PROPERTIES PASS_REGULAR_EXPRESSION "Invalid Filter: \"Test with special, characters in \\\\\" name\"") + +add_test(NAME TestsInFile::InvalidTestNames-2 COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/invalid-test-names.input") +set_tests_properties(TestsInFile::InvalidTestNames-2 PROPERTIES PASS_REGULAR_EXPRESSION "No tests ran") if (CATCH_USE_VALGRIND) diff --git a/projects/SelfTest/Misc/invalid-test-names.input b/projects/SelfTest/Misc/invalid-test-names.input new file mode 100644 index 00000000..e2bc88ec --- /dev/null +++ b/projects/SelfTest/Misc/invalid-test-names.input @@ -0,0 +1 @@ +Test with special, characters in \" name |