Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-12-05 16:00:20 +0100
committerMartin Hořeňovský2019-12-05 16:00:20 +0100
commit0fea081ad1a678b379182930a3ec22a3e275dbf0 (patch)
tree3afa04ce6805d7a86e9c59f87ac68cb1d21eb8b2
parent90e2549cecc2e886d563b7a88e752c9b4104f798 (diff)
downloadcatch3-0fea081ad1a678b379182930a3ec22a3e275dbf0.tar.gz
Move tests from projects/ to tests/
-rw-r--r--CMakeLists.txt6
-rwxr-xr-xscripts/approvalTests.py2
-rwxr-xr-xscripts/approve.py2
-rw-r--r--tests/CMakeLists.txt (renamed from projects/CMakeLists.txt)12
-rw-r--r--tests/ExtraTests/CMakeLists.txt (renamed from projects/ExtraTests/CMakeLists.txt)0
-rw-r--r--tests/ExtraTests/ToDo.txt (renamed from projects/ExtraTests/ToDo.txt)0
-rw-r--r--tests/ExtraTests/X01-PrefixedMacros.cpp (renamed from projects/ExtraTests/X01-PrefixedMacros.cpp)0
-rw-r--r--tests/ExtraTests/X02-DisabledMacros.cpp (renamed from projects/ExtraTests/X02-DisabledMacros.cpp)0
-rw-r--r--tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp (renamed from projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp)0
-rw-r--r--tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp (renamed from projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp)0
-rw-r--r--tests/ExtraTests/X10-FallbackStringifier.cpp (renamed from projects/ExtraTests/X10-FallbackStringifier.cpp)0
-rw-r--r--tests/ExtraTests/X11-DisableStringification.cpp (renamed from projects/ExtraTests/X11-DisableStringification.cpp)0
-rw-r--r--tests/ExtraTests/X20-BenchmarkingMacros.cpp (renamed from projects/ExtraTests/X20-BenchmarkingMacros.cpp)0
-rw-r--r--tests/ExtraTests/X90-WindowsHeaderInclusion.cpp (renamed from projects/ExtraTests/X90-WindowsHeaderInclusion.cpp)0
-rw-r--r--tests/SelfTest/Baselines/automake.std.approved.txt (renamed from projects/SelfTest/Baselines/automake.std.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/compact.sw.approved.txt (renamed from projects/SelfTest/Baselines/compact.sw.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/console.std.approved.txt (renamed from projects/SelfTest/Baselines/console.std.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/console.sw.approved.txt (renamed from projects/SelfTest/Baselines/console.sw.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/console.swa4.approved.txt (renamed from projects/SelfTest/Baselines/console.swa4.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/junit.sw.approved.txt (renamed from projects/SelfTest/Baselines/junit.sw.approved.txt)0
-rw-r--r--tests/SelfTest/Baselines/sonarqube.sw.approved.txt (renamed from projects/SelfTest/Baselines/sonarqube.sw.approved.txt)58
-rw-r--r--tests/SelfTest/Baselines/xml.sw.approved.txt (renamed from projects/SelfTest/Baselines/xml.sw.approved.txt)4778
-rw-r--r--tests/SelfTest/CompileTimePerfTests/10.tests.cpp (renamed from projects/SelfTest/CompileTimePerfTests/10.tests.cpp)0
-rw-r--r--tests/SelfTest/CompileTimePerfTests/100.tests.cpp (renamed from projects/SelfTest/CompileTimePerfTests/100.tests.cpp)0
-rw-r--r--tests/SelfTest/CompileTimePerfTests/All.tests.cpp (renamed from projects/SelfTest/CompileTimePerfTests/All.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/Details.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/Details.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/String.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/String.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/Tag.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/Tag.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/ToString.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/ToString.tests.cpp)0
-rw-r--r--tests/SelfTest/IntrospectiveTests/Xml.tests.cpp (renamed from projects/SelfTest/IntrospectiveTests/Xml.tests.cpp)0
-rw-r--r--tests/SelfTest/Misc/invalid-test-names.input (renamed from projects/SelfTest/Misc/invalid-test-names.input)0
-rw-r--r--tests/SelfTest/Misc/plain-old-tests.input (renamed from projects/SelfTest/Misc/plain-old-tests.input)0
-rw-r--r--tests/SelfTest/Misc/special-characters-in-file.input (renamed from projects/SelfTest/Misc/special-characters-in-file.input)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_console_colour.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_console_colour.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_debugger.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_debugger.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_option.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_option.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_stream.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_stream.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_test_spec.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_test_spec.cpp)0
-rw-r--r--tests/SelfTest/SurrogateCpps/catch_xmlwriter.cpp (renamed from projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp)0
-rw-r--r--tests/SelfTest/TestMain.cpp (renamed from projects/SelfTest/TestMain.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Approx.tests.cpp (renamed from projects/SelfTest/UsageTests/Approx.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/BDD.tests.cpp (renamed from projects/SelfTest/UsageTests/BDD.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Benchmark.tests.cpp (renamed from projects/SelfTest/UsageTests/Benchmark.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Class.tests.cpp (renamed from projects/SelfTest/UsageTests/Class.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Compilation.tests.cpp (renamed from projects/SelfTest/UsageTests/Compilation.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Condition.tests.cpp (renamed from projects/SelfTest/UsageTests/Condition.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Decomposition.tests.cpp (renamed from projects/SelfTest/UsageTests/Decomposition.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/EnumToString.tests.cpp (renamed from projects/SelfTest/UsageTests/EnumToString.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Exception.tests.cpp (renamed from projects/SelfTest/UsageTests/Exception.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Generators.tests.cpp (renamed from projects/SelfTest/UsageTests/Generators.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Matchers.tests.cpp (renamed from projects/SelfTest/UsageTests/Matchers.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Message.tests.cpp (renamed from projects/SelfTest/UsageTests/Message.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Misc.tests.cpp (renamed from projects/SelfTest/UsageTests/Misc.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringByte.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringByte.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringChrono.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringChrono.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringGeneral.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringOptional.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringOptional.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringPair.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringPair.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringTuple.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringTuple.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringVariant.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringVariant.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringVector.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringVector.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/ToStringWhich.tests.cpp (renamed from projects/SelfTest/UsageTests/ToStringWhich.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/Tricky.tests.cpp (renamed from projects/SelfTest/UsageTests/Tricky.tests.cpp)0
-rw-r--r--tests/SelfTest/UsageTests/VariadicMacros.tests.cpp (renamed from projects/SelfTest/UsageTests/VariadicMacros.tests.cpp)0
-rw-r--r--tests/SelfTest/WarnAboutNoTests.cmake (renamed from projects/SelfTest/WarnAboutNoTests.cmake)0
-rw-r--r--tests/XCode/OCTest/OCTest.xcodeproj/project.pbxproj (renamed from projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj)0
-rw-r--r--tests/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata (renamed from projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata)0
-rw-r--r--tests/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (renamed from projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist)0
-rw-r--r--tests/XCode/OCTest/OCTest/CatchOCTestCase.h (renamed from projects/XCode/OCTest/OCTest/CatchOCTestCase.h)0
-rw-r--r--tests/XCode/OCTest/OCTest/CatchOCTestCase.mm (renamed from projects/XCode/OCTest/OCTest/CatchOCTestCase.mm)0
-rw-r--r--tests/XCode/OCTest/OCTest/Main.mm (renamed from projects/XCode/OCTest/OCTest/Main.mm)0
-rw-r--r--tests/XCode/OCTest/OCTest/OCTest.1 (renamed from projects/XCode/OCTest/OCTest/OCTest.1)0
-rw-r--r--tests/XCode/OCTest/OCTest/OCTest.mm (renamed from projects/XCode/OCTest/OCTest/OCTest.mm)0
-rw-r--r--tests/XCode/OCTest/OCTest/TestObj.h (renamed from projects/XCode/OCTest/OCTest/TestObj.h)0
-rw-r--r--tests/XCode/OCTest/OCTest/TestObj.m (renamed from projects/XCode/OCTest/OCTest/TestObj.m)0
-rw-r--r--tests/XCode/OCTest/catch_objc_impl.mm (renamed from projects/XCode/OCTest/catch_objc_impl.mm)0
84 files changed, 2429 insertions, 2429 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 255e52f9..b13cd3b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,11 @@ include(CTest)
# Basic paths
set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(SOURCES_DIR ${CATCH_DIR}/src/catch2)
-set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
-set(BENCHMARK_DIR ${CATCH_DIR}/projects/Benchmark)
+set(SELF_TEST_DIR ${CATCH_DIR}/tests/SelfTest)
+set(BENCHMARK_DIR ${CATCH_DIR}/tests/Benchmark)
add_subdirectory(src)
-add_subdirectory(projects)
+add_subdirectory(tests)
#option(CATCH_USE_VALGRIND "Perform SelfTests with Valgrind" OFF)
#option(CATCH_BUILD_TESTING "Build SelfTest project" ON)
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index e4858178..18a34959 100755
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -16,7 +16,7 @@ if os.name == 'nt':
# Enable console colours on windows
os.system('')
-rootPath = os.path.join(catchPath, 'projects/SelfTest/Baselines')
+rootPath = os.path.join(catchPath, 'tests/SelfTest/Baselines')
langFilenameParser = re.compile(r'(.+\.[ch]pp)')
filelocParser = re.compile(r'''
diff --git a/scripts/approve.py b/scripts/approve.py
index f03417dc..252d08ec 100755
--- a/scripts/approve.py
+++ b/scripts/approve.py
@@ -8,7 +8,7 @@ import shutil
import glob
from scriptCommon import catchPath
-rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
+rootPath = os.path.join( catchPath, 'tests/SelfTest/Baselines' )
if len(sys.argv) > 1:
files = [os.path.join( rootPath, f ) for f in sys.argv[1:]]
diff --git a/projects/CMakeLists.txt b/tests/CMakeLists.txt
index 4c22f047..a66b009c 100644
--- a/projects/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ include(MiscFunctions)
####
if (MSVC)
configure_file(${CATCH_DIR}/misc/SelfTest.vcxproj.user
- ${CMAKE_BINARY_DIR}/projects
+ ${CMAKE_BINARY_DIR}/tests
COPYONLY)
endif(MSVC) #Temporary workaround
@@ -199,7 +199,7 @@ set_tests_properties(NoTest PROPERTIES
FAIL_REGULAR_EXPRESSION "No tests ran"
)
-add_test(NAME WarnAboutNoTests COMMAND ${CMAKE_COMMAND} -P ${CATCH_DIR}/projects/SelfTest/WarnAboutNoTests.cmake $<TARGET_FILE:SelfTest>)
+add_test(NAME WarnAboutNoTests COMMAND ${CMAKE_COMMAND} -P ${SELF_TEST_DIR}/WarnAboutNoTests.cmake $<TARGET_FILE:SelfTest>)
add_test(NAME UnmatchedOutputFilter COMMAND $<TARGET_FILE:SelfTest> [this-tag-does-not-exist] -w NoTests)
set_tests_properties(UnmatchedOutputFilter
@@ -234,19 +234,19 @@ set_tests_properties(EscapeSpecialCharactersInTestNames PROPERTIES PASS_REGULAR_
add_test(NAME NegativeSpecNoHiddenTests COMMAND $<TARGET_FILE:SelfTest> --list-tests ~[approval])
set_tests_properties(NegativeSpecNoHiddenTests PROPERTIES FAIL_REGULAR_EXPRESSION "\\[\\.\\]")
-add_test(NAME TestsInFile::SimpleSpecs COMMAND $<TARGET_FILE:SelfTest> "-f ${CATCH_DIR}/projects/SelfTest/Misc/plain-old-tests.input")
+add_test(NAME TestsInFile::SimpleSpecs COMMAND $<TARGET_FILE:SelfTest> "-f ${SELF_TEST_DIR}/Misc/plain-old-tests.input")
set_tests_properties(TestsInFile::SimpleSpecs 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")
+add_test(NAME TestsInFile::EscapeSpecialCharacters COMMAND $<TARGET_FILE:SelfTest> "-f ${SELF_TEST_DIR}/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")
+add_test(NAME TestsInFile::InvalidTestNames-1 COMMAND $<TARGET_FILE:SelfTest> "-f ${SELF_TEST_DIR}/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")
+add_test(NAME TestsInFile::InvalidTestNames-2 COMMAND $<TARGET_FILE:SelfTest> "-f ${SELF_TEST_DIR}/Misc/invalid-test-names.input")
set_tests_properties(TestsInFile::InvalidTestNames-2 PROPERTIES PASS_REGULAR_EXPRESSION "No tests ran")
diff --git a/projects/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt
index 196199df..196199df 100644
--- a/projects/ExtraTests/CMakeLists.txt
+++ b/tests/ExtraTests/CMakeLists.txt
diff --git a/projects/ExtraTests/ToDo.txt b/tests/ExtraTests/ToDo.txt
index ab68bd3e..ab68bd3e 100644
--- a/projects/ExtraTests/ToDo.txt
+++ b/tests/ExtraTests/ToDo.txt
diff --git a/projects/ExtraTests/X01-PrefixedMacros.cpp b/tests/ExtraTests/X01-PrefixedMacros.cpp
index c9b16ebc..c9b16ebc 100644
--- a/projects/ExtraTests/X01-PrefixedMacros.cpp
+++ b/tests/ExtraTests/X01-PrefixedMacros.cpp
diff --git a/projects/ExtraTests/X02-DisabledMacros.cpp b/tests/ExtraTests/X02-DisabledMacros.cpp
index 3a969d76..3a969d76 100644
--- a/projects/ExtraTests/X02-DisabledMacros.cpp
+++ b/tests/ExtraTests/X02-DisabledMacros.cpp
diff --git a/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
index 846c9b0f..846c9b0f 100644
--- a/projects/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
+++ b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
diff --git a/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp b/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
index 96f3ceb8..96f3ceb8 100644
--- a/projects/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
+++ b/