From 4c93a595a1d9ecc8aacb7c99f6dbf0f1f2d475fa Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Sat, 26 Apr 2025 18:46:49 -0600 Subject: [PATCH] Fix typos --- BUILD.bazel | 2 +- docs/command-line.md | 2 +- docs/generators.md | 4 ++-- docs/release-notes.md | 4 ++-- docs/test-fixtures.md | 2 +- src/catch2/internal/catch_decomposer.hpp | 4 ++-- src/catch2/internal/catch_run_context.cpp | 2 +- src/catch2/internal/catch_section.hpp | 2 +- src/catch2/internal/catch_string_manip.cpp | 2 +- .../Baselines/automake.sw.approved.txt | 2 +- .../Baselines/automake.sw.multi.approved.txt | 2 +- .../Baselines/console.sw.approved.txt | 18 ++++++++--------- .../Baselines/console.sw.multi.approved.txt | 18 ++++++++--------- .../SelfTest/Baselines/junit.sw.approved.txt | 20 +++++++++---------- .../Baselines/junit.sw.multi.approved.txt | 20 +++++++++---------- .../Baselines/sonarqube.sw.approved.txt | 20 +++++++++---------- .../Baselines/sonarqube.sw.multi.approved.txt | 20 +++++++++---------- tests/SelfTest/Baselines/tap.sw.approved.txt | 18 ++++++++--------- .../Baselines/tap.sw.multi.approved.txt | 18 ++++++++--------- .../Baselines/teamcity.sw.approved.txt | 4 ++-- .../Baselines/teamcity.sw.multi.approved.txt | 4 ++-- tests/SelfTest/Baselines/xml.sw.approved.txt | 2 +- .../Baselines/xml.sw.multi.approved.txt | 2 +- .../IntrospectiveTests/Integer.tests.cpp | 2 +- .../IntrospectiveTests/Json.tests.cpp | 2 +- .../RandomNumberGeneration.tests.cpp | 4 ++-- 26 files changed, 100 insertions(+), 100 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index d96c7fa7..8dc83db6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -68,7 +68,7 @@ expand_template( cc_library( name = "catch2_generated", hdrs = ["catch2/catch_user_config.hpp"], - include_prefix = ".", # to manipulate -I of dependenices + include_prefix = ".", # to manipulate -I of dependencies visibility = ["//visibility:public"], ) diff --git a/docs/command-line.md b/docs/command-line.md index 7e69bf12..18c4eeaf 100644 --- a/docs/command-line.md +++ b/docs/command-line.md @@ -123,7 +123,7 @@ specs. You can: This allows test cases that are tagged with **either** "[some-tag]" **or** "[other-tag]". A test case with both will obviously also pass the filter. - Note that commas take precendence over simple concatenation. This means + Note that commas take precedence over simple concatenation. This means that `[a][b],[c]` accepts tests that are tagged with either both "[a]" and "[b]", or tests that are tagged with just "[c]". diff --git a/docs/generators.md b/docs/generators.md index 4e0d99b8..41e01241 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -219,8 +219,8 @@ For floating point generators, the situation is much more complex. Generally Catch2 only promises reproducibility (or even just correctness!) on platforms that obey the IEEE-754 standard. Furthermore, reproducibility only applies between binaries that perform floating point math in the -same way, e.g. if you compile a binary targetting the x87 FPU and another -one targetting SSE2 for floating point math, their results will vary. +same way, e.g. if you compile a binary targeting the x87 FPU and another +one targeting SSE2 for floating point math, their results will vary. Similarly, binaries compiled with compiler flags that relax the IEEE-754 adherence, e.g. `-ffast-math`, might provide different results than those compiled for strict IEEE-754 adherence. diff --git a/docs/release-notes.md b/docs/release-notes.md index a393a52f..fd0559bd 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -93,7 +93,7 @@ * Removed redundant `CTEST_FILE` param when creating the indirection file for `PRE_TEST` discovery mode (#2936) * Rewrote the test discovery logic to use output from the JSON reporter * This means that `catch_discover_tests` now requires CMake 3.19 or newer - * Added `ADD_TAGS_AS_LABELS` option. If specified, each CTest test will be labeled with corrensponding Catch2's test tag + * Added `ADD_TAGS_AS_LABELS` option. If specified, each CTest test will be labeled with corresponding Catch2's test tag * Bumped up the minimum required CMake version to build Catch2 to 3.16 * Meson build now provides option to avoid installing Catch2 * Bazel build is moved to Bzlmod. @@ -175,7 +175,7 @@ ### Improvements * Reintroduced support for GCC 5 and 6 (#2836) * As with VS2017, if they start causing trouble again, they will be dropped again. -* Added workaround for targetting newest MacOS (Sonoma) using GCC (#2837, #2839) +* Added workaround for targeting newest MacOS (Sonoma) using GCC (#2837, #2839) * `CATCH_CONFIG_DEFAULT_REPORTER` can now be an arbitrary reporter spec * Previously it could only be a plain reporter name, so it was impossible to compile in custom arguments to the reporter. * Improved performance of generating 64bit random integers by 20+% diff --git a/docs/test-fixtures.md b/docs/test-fixtures.md index 653b50e0..72a0df95 100644 --- a/docs/test-fixtures.md +++ b/docs/test-fixtures.md @@ -130,7 +130,7 @@ TEST_CASE_PERSISTENT_FIXTURE( MyFixture, "Tests with MyFixture" ) { } ``` -This example demonstates two possible use-cases of this fixture type: +This example demonstrates two possible use-cases of this fixture type: 1. Improve test run times by reducing the amount of expensive and redundant setup and tear-down required. 2. Reusing results from the previous partial run, in the current diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp index adce89f2..b6592c54 100644 --- a/src/catch2/internal/catch_decomposer.hpp +++ b/src/catch2/internal/catch_decomposer.hpp @@ -45,7 +45,7 @@ * when the compiler handles `ExprLhs == b`, it also tries to resolve * the overload set for `b == ExprLhs`. * - * To accomodate these use cases, decomposer ended up rather complex. + * To accommodate these use cases, decomposer ended up rather complex. * * 1) These types are handled by adding SFINAE overloads to our comparison * operators, checking whether `T == U` are comparable with the given @@ -163,7 +163,7 @@ namespace Catch { public: constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; } constexpr auto getResult() const -> bool { return m_result; } - //! This function **has** to be overriden by the derived class. + //! This function **has** to be overridden by the derived class. virtual void streamReconstructedExpression( std::ostream& os ) const; constexpr ITransientExpression( bool isBinaryExpression, bool result ) diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp index 2a102fbe..90d3e66d 100644 --- a/src/catch2/internal/catch_run_context.cpp +++ b/src/catch2/internal/catch_run_context.cpp @@ -361,7 +361,7 @@ namespace Catch { auto& currentTracker = m_trackerContext.currentTracker(); assert( currentTracker.nameAndLocation() != nameAndLoc && - "Trying to create tracker for a genreator that already has one" ); + "Trying to create tracker for a generator that already has one" ); auto newTracker = Catch::Detail::make_unique( CATCH_MOVE(nameAndLoc), m_trackerContext, ¤tTracker ); diff --git a/src/catch2/internal/catch_section.hpp b/src/catch2/internal/catch_section.hpp index e56c79f3..b99a4c96 100644 --- a/src/catch2/internal/catch_section.hpp +++ b/src/catch2/internal/catch_section.hpp @@ -62,7 +62,7 @@ namespace Catch { #else // These section definitions imply that at most one section at one level -// will be intered (because only one section's __LINE__ can be equal to +// will be entered (because only one section's __LINE__ can be equal to // the dummy `catchInternalSectionHint` variable from `TEST_CASE`). namespace Catch { diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index ce1abaa0..68983787 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -74,7 +74,7 @@ namespace Catch { std::string origStr = CATCH_MOVE(str); str.clear(); // There is at least one replacement, so reserve with the best guess - // we can make without actually counting the number of occurences. + // we can make without actually counting the number of occurrences. str.reserve(origStr.size() - replaceThis.size() + withThis.size()); do { str.append(origStr, copyBegin, i-copyBegin ); diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt index 7be343a1..1f5a08a3 100644 --- a/tests/SelfTest/Baselines/automake.sw.approved.txt +++ b/tests/SelfTest/Baselines/automake.sw.approved.txt @@ -175,7 +175,7 @@ Nor would this :test-result: XFAIL Inequality checks that should fail :test-result: PASS Inequality checks that should succeed :test-result: PASS JsonWriter -:test-result: PASS JsonWriter escapes charaters in strings properly +:test-result: PASS JsonWriter escapes characters in strings properly :test-result: PASS Lambdas in assertions :test-result: PASS Less-than inequalities with different epsilons :test-result: PASS ManuallyRegistered diff --git a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt index 0cd24e41..0bbe9d52 100644 --- a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt @@ -173,7 +173,7 @@ :test-result: XFAIL Inequality checks that should fail :test-result: PASS Inequality checks that should succeed :test-result: PASS JsonWriter -:test-result: PASS JsonWriter escapes charaters in strings properly +:test-result: PASS JsonWriter escapes characters in strings properly :test-result: PASS Lambdas in assertions :test-result: PASS Less-than inequalities with different epsilons :test-result: PASS ManuallyRegistered diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt index a53f40d1..7e7f4bd2 100644 --- a/tests/SelfTest/Baselines/console.sw.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.approved.txt @@ -7652,7 +7652,7 @@ with expansion: ""custom"" == ""custom"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Quote in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7664,7 +7664,7 @@ with expansion: ""\""" == ""\""" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Backslash in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7676,7 +7676,7 @@ with expansion: ""\\"" == ""\\"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Forward slash in a string is **not** escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7688,7 +7688,7 @@ with expansion: ""/"" == ""/"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Backspace in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7700,7 +7700,7 @@ with expansion: ""\b"" == ""\b"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Formfeed in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7712,7 +7712,7 @@ with expansion: ""\f"" == ""\f"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly linefeed in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7724,7 +7724,7 @@ with expansion: ""\n"" == ""\n"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly carriage return in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7736,7 +7736,7 @@ with expansion: ""\r"" == ""\r"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly tab in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7748,7 +7748,7 @@ with expansion: ""\t"" == ""\t"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly combination of characters is escaped ------------------------------------------------------------------------------- Json.tests.cpp: diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt index 418ccf7e..7971092f 100644 --- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt @@ -7650,7 +7650,7 @@ with expansion: ""custom"" == ""custom"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Quote in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7662,7 +7662,7 @@ with expansion: ""\""" == ""\""" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Backslash in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7674,7 +7674,7 @@ with expansion: ""\\"" == ""\\"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Forward slash in a string is **not** escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7686,7 +7686,7 @@ with expansion: ""/"" == ""/"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Backspace in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7698,7 +7698,7 @@ with expansion: ""\b"" == ""\b"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly Formfeed in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7710,7 +7710,7 @@ with expansion: ""\f"" == ""\f"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly linefeed in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7722,7 +7722,7 @@ with expansion: ""\n"" == ""\n"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly carriage return in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7734,7 +7734,7 @@ with expansion: ""\r"" == ""\r"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly tab in a string is escaped ------------------------------------------------------------------------------- Json.tests.cpp: @@ -7746,7 +7746,7 @@ with expansion: ""\t"" == ""\t"" ------------------------------------------------------------------------------- -JsonWriter escapes charaters in strings properly +JsonWriter escapes characters in strings properly combination of characters is escaped ------------------------------------------------------------------------------- Json.tests.cpp: diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt index c3571f3e..8c8fe477 100644 --- a/tests/SelfTest/Baselines/junit.sw.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.approved.txt @@ -929,16 +929,16 @@ at Condition.tests.cpp: - - - - - - - - - - + + + + + + + + + + diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt index 55f5520d..1f5b820f 100644 --- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt @@ -928,16 +928,16 @@ at Condition.tests.cpp: - - - - - - - - - - + + + + + + + + + + diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt index af06793e..8b303074 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt @@ -173,16 +173,16 @@ at AssertionHandler.tests.cpp: - - - - - - - - - - + + + + + + + + + + diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt index 2d8d5105..4de52352 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt @@ -172,16 +172,16 @@ at AssertionHandler.tests.cpp: - - - - - - - - - - + + + + + + + + + + diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt index 801946d3..597150ee 100644 --- a/tests/SelfTest/Baselines/tap.sw.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.approved.txt @@ -1904,23 +1904,23 @@ ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }" ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]" # JsonWriter ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\""" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\b\"" for: ""\b"" == ""\b"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\f\"" for: ""\f"" == ""\f"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\n\"" for: ""\n"" == ""\n"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\r\"" for: ""\r"" == ""\r"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\t\"" for: ""\t"" == ""\t"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n"" # Lambdas in assertions ok {test-number} - []() { return true; }() for: true diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt index 7f281f64..dae1cb43 100644 --- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt @@ -1902,23 +1902,23 @@ ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }" ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]" # JsonWriter ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\""" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\b\"" for: ""\b"" == ""\b"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\f\"" for: ""\f"" == ""\f"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\n\"" for: ""\n"" == ""\n"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\r\"" for: ""\r"" == ""\r"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\t\"" for: ""\t"" == ""\t"" -# JsonWriter escapes charaters in strings properly +# JsonWriter escapes characters in strings properly ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n"" # Lambdas in assertions ok {test-number} - []() { return true; }() for: true diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt index db485523..c36baf63 100644 --- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt +++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt @@ -431,8 +431,8 @@ ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"] ##teamcity[testStarted name='JsonWriter'] ##teamcity[testFinished name='JsonWriter' duration="{duration}"] -##teamcity[testStarted name='JsonWriter escapes charaters in strings properly'] -##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"] +##teamcity[testStarted name='JsonWriter escapes characters in strings properly'] +##teamcity[testFinished name='JsonWriter escapes characters in strings properly' duration="{duration}"] ##teamcity[testStarted name='Lambdas in assertions'] ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"] ##teamcity[testStarted name='Less-than inequalities with different epsilons'] diff --git a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt index dde8a682..12f712f8 100644 --- a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt @@ -431,8 +431,8 @@ ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"] ##teamcity[testStarted name='JsonWriter'] ##teamcity[testFinished name='JsonWriter' duration="{duration}"] -##teamcity[testStarted name='JsonWriter escapes charaters in strings properly'] -##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"] +##teamcity[testStarted name='JsonWriter escapes characters in strings properly'] +##teamcity[testFinished name='JsonWriter escapes characters in strings properly' duration="{duration}"] ##teamcity[testStarted name='Lambdas in assertions'] ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"] ##teamcity[testStarted name='Less-than inequalities with different epsilons'] diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt index aa6bd6a8..5d38aafd 100644 --- a/tests/SelfTest/Baselines/xml.sw.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.approved.txt @@ -9158,7 +9158,7 @@ Approx( 3.14150000000000018 ) - +
diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt index 7f3b4984..1acbb80f 100644 --- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt @@ -9158,7 +9158,7 @@ Approx( 3.14150000000000018 )
- +
diff --git a/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp b/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp index 8955f400..4ce2ae6a 100644 --- a/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp @@ -22,7 +22,7 @@ namespace { ExtendedMultResult{ upper_result, lower_result } ); } - // Simple (and slow) implmentation of extended multiplication for tests + // Simple (and slow) implementation of extended multiplication for tests constexpr Catch::Detail::ExtendedMultResult extendedMultNaive( std::uint64_t lhs, std::uint64_t rhs ) { // This is a simple long multiplication, where we split lhs and rhs diff --git a/tests/SelfTest/IntrospectiveTests/Json.tests.cpp b/tests/SelfTest/IntrospectiveTests/Json.tests.cpp index 8204e3c4..bee85c99 100644 --- a/tests/SelfTest/IntrospectiveTests/Json.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/Json.tests.cpp @@ -111,7 +111,7 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) { } } -TEST_CASE( "JsonWriter escapes charaters in strings properly", "[JsonWriter]" ) { +TEST_CASE( "JsonWriter escapes characters in strings properly", "[JsonWriter]" ) { std::stringstream sstream; SECTION( "Quote in a string is escaped" ) { Catch::JsonValueWriter{ sstream }.write( "\"" ); diff --git a/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp b/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp index 89323215..5166070a 100644 --- a/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp @@ -151,7 +151,7 @@ TEMPLATE_TEST_CASE( "uniform_integer_distribution can handle unit ranges", Catch::SimplePcg32 pcg( seed ); // We check unitary ranges of 3 different values, min for type, max for type, - // some value inbetween just to make sure + // some value in between just to make sure SECTION("lowest value") { constexpr auto lowest = std::numeric_limits::min(); Catch::uniform_integer_distribution dist( lowest, lowest ); @@ -180,7 +180,7 @@ TEST_CASE( "uniform_integer_distribution can handle boolean unit ranges", Catch::SimplePcg32 pcg( seed ); // We check unitary ranges of 3 different values, min for type, max for - // type, some value inbetween just to make sure + // type, some value in between just to make sure SECTION( "lowest value" ) { Catch::uniform_integer_distribution dist( false, false ); CheckReturnValue( dist, pcg, false );