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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorLeitwolf112026-10-25 02:37:35 +0300
committerLeitwolf112026-10-25 02:37:35 +0300
commit126dc333564cb72b5115d9a9242d66694694b6d0 (patch)
tree0bce4462b2e190c39b3e1c5f697e3e4abd1a5e2a /src
parent13f81a480a93807c14dddb5abdb97355ced4d4c5 (diff)
downloadcatch3-126dc333564cb72b5115d9a9242d66694694b6d0.tar.gz
Give Catch3 its own build names and headers
Catch2 compatibility means the API tests are written in: the macros, such as TEST_CASE and REQUIRE, and the Catch:: namespace. It does not mean Catch2's build names or header paths. find_package(Catch2) found Catch3, and a project using both frameworks met two packages, two sets of targets, two Catch.cmake modules and two catch2/ header trees with the same names. Build names: - CMake: project and package Catch3, targets Catch3::Catch3 and Catch3::Catch3WithMain, libraries Catch3 and Catch3Main, options CATCH3_*, lib/cmake/Catch3 with Catch3Config, and pkg-config catch3 and catch3-with-main. The version is Catch3's, 0.3.0, compatible within a minor version. - The CMake scripts are Catch3.cmake (catch3_discover_tests), Catch3AddTests.cmake and Catch3ShardTests.cmake (catch3_add_sharded_tests); the helpers they define at ctest time have a catch3_ prefix. ParseAndAddCatchTests.cmake, deprecated upstream, is gone. - Bazel //:catch3 and //:catch3_main, Meson catch3 and catch3-with-main (with override_dependency), Xmake catch3 and catch3_main, Premake Catch3 and Catch3WithMain. Visual Studio projects get GUIDs of their own. - The Progmasoft::Catch3 target and package are gone: property testing and snapshots are part of Catch3::Catch3. Their sources now build with the library's warning flags, so property failures are built field by field (no missing initializers) and the default property name is a thread-local pointer to the name its scope owns (no global destructor). Headers: the engine moved from src/catch2 to src/Progmasoft/Catch3 with Progmasoft names, so <catch2/catch_test_macros.hpp> is <Progmasoft/Catch3/TestMacros.hpp>, <catch2/matchers/catch_matchers_string.hpp> is <Progmasoft/Catch3/Matchers/String.hpp>, and interface headers are named after their interface, such as Interfaces/IConfig.hpp. Include guards became #pragma once. The installed headers go to include/Progmasoft. src/Progmasoft/Context.cpp is StrategyContext.cpp, so no two sources share a file name. tools/scripts/upstreamFiles.txt lists the files that come from Catch2. The license check expects BSL-1.0 on them and Progmasoft's header on the rest of src/Progmasoft; the convenience-header check, the amalgamation script and the surrogate tests take the engine's headers from it. The amalgamated files are regenerated. The header-guard workflow checks for #pragma once instead of checkguard. Documents, the README and the release notes describe the new names.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt652
-rw-r--r--src/Progmasoft/BUILD.bazel148
-rw-r--r--src/Progmasoft/Catch3.hpp2
-rw-r--r--src/Progmasoft/Catch3/All.hpp127
-rw-r--r--src/Progmasoft/Catch3/Approx.cpp (renamed from src/catch2/catch_approx.cpp)6
-rw-r--r--src/Progmasoft/Catch3/Approx.hpp (renamed from src/catch2/catch_approx.hpp)6
-rw-r--r--src/Progmasoft/Catch3/AssertionInfo.hpp (renamed from src/catch2/catch_assertion_info.hpp)10
-rw-r--r--src/Progmasoft/Catch3/AssertionResult.cpp (renamed from src/catch2/catch_assertion_result.cpp)6
-rw-r--r--src/Progmasoft/Catch3/AssertionResult.hpp (renamed from src/catch2/catch_assertion_result.hpp)14
-rw-r--r--src/Progmasoft/Catch3/Assertions.hpp6
-rw-r--r--src/Progmasoft/Catch3/Benchmark/All.hpp44
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Benchmark.cpp (renamed from src/catch2/benchmark/catch_benchmark.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Benchmark.hpp (renamed from src/catch2/benchmark/catch_benchmark.hpp)40
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Chronometer.cpp (renamed from src/catch2/benchmark/catch_chronometer.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Chronometer.hpp (renamed from src/catch2/benchmark/catch_chronometer.hpp)12
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Clock.hpp (renamed from src/catch2/benchmark/catch_clock.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Constructor.hpp (renamed from src/catch2/benchmark/catch_constructor.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Analyse.cpp (renamed from src/catch2/benchmark/detail/catch_analyse.cpp)12
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Analyse.hpp (renamed from src/catch2/benchmark/detail/catch_analyse.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/BenchmarkFunction.cpp (renamed from src/catch2/benchmark/detail/catch_benchmark_function.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/BenchmarkFunction.hpp (renamed from src/catch2/benchmark/detail/catch_benchmark_function.hpp)12
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/BenchmarkStats.hpp (renamed from src/catch2/benchmark/detail/catch_benchmark_stats.hpp)12
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/BenchmarkStatsFwd.hpp (renamed from src/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/CompleteInvoke.hpp (renamed from src/catch2/benchmark/detail/catch_complete_invoke.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/EstimateClock.hpp (renamed from src/catch2/benchmark/detail/catch_estimate_clock.hpp)16
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Measure.hpp (renamed from src/catch2/benchmark/detail/catch_measure.hpp)10
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Repeat.hpp (renamed from src/catch2/benchmark/detail/catch_repeat.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/RunForAtLeast.cpp (renamed from src/catch2/benchmark/detail/catch_run_for_at_least.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/RunForAtLeast.hpp (renamed from src/catch2/benchmark/detail/catch_run_for_at_least.hpp)18
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Stats.cpp (renamed from src/catch2/benchmark/detail/catch_stats.cpp)10
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Stats.hpp (renamed from src/catch2/benchmark/detail/catch_stats.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Detail/Timing.hpp (renamed from src/catch2/benchmark/detail/catch_timing.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Environment.hpp (renamed from src/catch2/benchmark/catch_environment.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Estimate.hpp (renamed from src/catch2/benchmark/catch_estimate.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Benchmark/ExecutionPlan.hpp (renamed from src/catch2/benchmark/catch_execution_plan.hpp)16
-rw-r--r--src/Progmasoft/Catch3/Benchmark/Optimizer.hpp (renamed from src/catch2/benchmark/catch_optimizer.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Benchmark/OutlierClassification.hpp (renamed from src/catch2/benchmark/catch_outlier_classification.hpp)5
-rw-r--r--src/Progmasoft/Catch3/Benchmark/SampleAnalysis.hpp (renamed from src/catch2/benchmark/catch_sample_analysis.hpp)10
-rw-r--r--src/Progmasoft/Catch3/CaseSensitive.hpp (renamed from src/catch2/catch_case_sensitive.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Config.cpp (renamed from src/catch2/catch_config.cpp)10
-rw-r--r--src/Progmasoft/Catch3/Config.hpp (renamed from src/catch2/catch_config.hpp)18
-rw-r--r--src/Progmasoft/Catch3/EngineVersion.cpp (renamed from src/catch2/catch_version.cpp)2
-rw-r--r--src/Progmasoft/Catch3/EngineVersion.hpp (renamed from src/catch2/catch_version.hpp)4
-rw-r--r--src/Progmasoft/Catch3/EngineVersionMacros.hpp (renamed from src/catch2/catch_version_macros.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Generators/Adapters.hpp (renamed from src/catch2/generators/catch_generators_adapters.hpp)12
-rw-r--r--src/Progmasoft/Catch3/Generators/All.hpp (renamed from src/catch2/generators/catch_generators_all.hpp)16
-rw-r--r--src/Progmasoft/Catch3/Generators/GeneratorException.cpp (renamed from src/catch2/generators/catch_generator_exception.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Generators/GeneratorException.hpp (renamed from src/catch2/generators/catch_generator_exception.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Generators/Generators.cpp (renamed from src/catch2/generators/catch_generators.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Generators/Generators.hpp (renamed from src/catch2/generators/catch_generators.hpp)18
-rw-r--r--src/Progmasoft/Catch3/Generators/Random.cpp (renamed from src/catch2/generators/catch_generators_random.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Generators/Random.hpp (renamed from src/catch2/generators/catch_generators_random.hpp)14
-rw-r--r--src/Progmasoft/Catch3/Generators/Range.hpp (renamed from src/catch2/generators/catch_generators_range.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Generators/Throw.cpp (renamed from src/catch2/generators/catch_generators_throw.cpp)6
-rw-r--r--src/Progmasoft/Catch3/Generators/Throw.hpp (renamed from src/catch2/generators/catch_generators_throw.hpp)4
-rw-r--r--src/Progmasoft/Catch3/GetRandomSeed.cpp (renamed from src/catch2/catch_get_random_seed.cpp)6
-rw-r--r--src/Progmasoft/Catch3/GetRandomSeed.hpp (renamed from src/catch2/catch_get_random_seed.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Interfaces/All.hpp34
-rw-r--r--src/Progmasoft/Catch3/Interfaces/EventListenerFactory.cpp (renamed from src/catch2/interfaces/catch_interfaces_reporter_factory.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Interfaces/EventListenerFactory.hpp (renamed from src/catch2/interfaces/catch_interfaces_reporter_factory.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IConfig.cpp (renamed from src/catch2/interfaces/catch_interfaces_config.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IConfig.hpp (renamed from src/catch2/interfaces/catch_interfaces_config.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IEventListener.cpp (renamed from src/catch2/interfaces/catch_interfaces_reporter.cpp)8
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IEventListener.hpp (renamed from src/catch2/interfaces/catch_interfaces_reporter.hpp)24
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IExceptionTranslator.cpp (renamed from src/catch2/interfaces/catch_interfaces_exception.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IExceptionTranslator.hpp (renamed from src/catch2/interfaces/catch_interfaces_exception.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IGeneratorTracker.cpp (renamed from src/catch2/interfaces/catch_interfaces_generatortracker.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IGeneratorTracker.hpp (renamed from src/catch2/interfaces/catch_interfaces_generatortracker.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IRegistryHub.cpp (renamed from src/catch2/interfaces/catch_interfaces_registry_hub.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IRegistryHub.hpp (renamed from src/catch2/interfaces/catch_interfaces_registry_hub.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IResultCapture.cpp (renamed from src/catch2/interfaces/catch_interfaces_capture.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Interfaces/IResultCapture.hpp (renamed from src/catch2/interfaces/catch_interfaces_capture.hpp)14
-rw-r--r--src/Progmasoft/Catch3/Interfaces/ITagAliasRegistry.hpp (renamed from src/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Interfaces/ITestCaseRegistry.cpp (renamed from src/catch2/interfaces/catch_interfaces_testcase.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Interfaces/ITestCaseRegistry.hpp (renamed from src/catch2/interfaces/catch_interfaces_testcase.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Interfaces/ITestInvoker.hpp (renamed from src/catch2/interfaces/catch_interfaces_test_invoker.hpp)4
-rw-r--r--src/Progmasoft/Catch3/Internal/AssertionHandler.cpp (renamed from src/catch2/internal/catch_assertion_handler.cpp)18
-rw-r--r--src/Progmasoft/Catch3/Internal/AssertionHandler.hpp (renamed from src/catch2/internal/catch_assertion_handler.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Internal/CaseInsensitiveComparisons.cpp (renamed from src/catch2/internal/catch_case_insensitive_comparisons.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Internal/CaseInsensitiveComparisons.hpp (renamed from src/catch2/internal/catch_case_insensitive_comparisons.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/CompareTraits.hpp (renamed from src/catch2/internal/catch_compare_traits.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/CompilerCapabilities.hpp (renamed from src/catch2/internal/catch_compiler_capabilities.hpp)8
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigAndroidLogWrite.hpp (renamed from src/catch2/internal/catch_config_android_logwrite.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigCounter.hpp (renamed from src/catch2/internal/catch_config_counter.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigPrefixMessages.hpp (renamed from src/catch2/internal/catch_config_prefix_messages.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigStaticAnalysisSupport.hpp (renamed from src/catch2/internal/catch_config_static_analysis_support.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigUncaughtExceptions.hpp (renamed from src/catch2/internal/catch_config_uncaught_exceptions.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ConfigWchar.hpp (renamed from src/catch2/internal/catch_config_wchar.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ContainerNonMembers.hpp (renamed from src/catch2/internal/catch_container_nonmembers.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/Context.cpp (renamed from src/catch2/internal/catch_context.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Internal/Context.hpp (renamed from src/catch2/internal/catch_context.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/Debugger.cpp (renamed from src/catch2/internal/catch_debugger.cpp)8
-rw-r--r--src/Progmasoft/Catch3/Internal/Debugger.hpp (renamed from src/catch2/internal/catch_debugger.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/Decomposer.cpp (renamed from src/catch2/internal/catch_decomposer.cpp)2
-rw-r--r--src/Progmasoft/Catch3/Internal/Decomposer.hpp (renamed from src/catch2/internal/catch_decomposer.hpp)16
-rw-r--r--src/Progmasoft/Catch3/Internal/DeprecationMacro.hpp (renamed from src/catch2/internal/catch_deprecation_macro.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/Enforce.cpp (renamed from src/catch2/internal/catch_enforce.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Internal/Enforce.hpp (renamed from src/catch2/internal/catch_enforce.hpp)10
-rw-r--r--src/Progmasoft/Catch3/Internal/EnumInfo.cpp (renamed from src/catch2/internal/catch_enum_info.cpp)4
-rw-r--r--src/Progmasoft/Catch3/Internal/EnumInfo.hpp (renamed from src/catch2/internal/catch_enum_info.hpp)6
-rw-r--r--src/Progmasoft/Catch3/Internal/ErrnoGuard