Fix typos

This commit is contained in:
Chris Thrasher 2024-08-25 17:07:28 -06:00
parent fa306fc85e
commit feb8cfc0a5
No known key found for this signature in database
GPG Key ID: 56FB686C9DFC8E2C
29 changed files with 104 additions and 108 deletions

View File

@ -66,7 +66,7 @@ expand_template(
cc_library( cc_library(
name = "catch2_generated", name = "catch2_generated",
hdrs = ["catch2/catch_user_config.hpp"], hdrs = ["catch2/catch_user_config.hpp"],
include_prefix = ".", # to manipulate -I of dependenices include_prefix = ".", # to manipulate -I of dependencies
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )

View File

@ -68,7 +68,7 @@ endif ()
# Find the reuired flags foreach language. # Find the required flags foreach language.
set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET}) set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY}) set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY})

View File

@ -123,7 +123,7 @@ specs. You can:
This allows test cases that are tagged with **either** "[some-tag]" **or** 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. "[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 that `[a][b],[c]` accepts tests that are tagged with either both "[a]" and
"[b]", or tests that are tagged with just "[c]". "[b]", or tests that are tagged with just "[c]".

View File

@ -216,8 +216,8 @@ For floating point generators, the situation is much more complex.
Generally Catch2 only promises reproducibility (or even just correctness!) Generally Catch2 only promises reproducibility (or even just correctness!)
on platforms that obey the IEEE-754 standard. Furthermore, reproducibility on platforms that obey the IEEE-754 standard. Furthermore, reproducibility
only applies between binaries that perform floating point math in the 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 same way, e.g. if you compile a binary targeting the x87 FPU and another
one targetting SSE2 for floating point math, their results will vary. one targeting SSE2 for floating point math, their results will vary.
Similarly, binaries compiled with compiler flags that relax the IEEE-754 Similarly, binaries compiled with compiler flags that relax the IEEE-754
adherence, e.g. `-ffast-math`, might provide different results than those adherence, e.g. `-ffast-math`, might provide different results than those
compiled for strict IEEE-754 adherence. compiled for strict IEEE-754 adherence.

View File

@ -120,7 +120,7 @@
### Improvements ### Improvements
* Reintroduced support for GCC 5 and 6 (#2836) * Reintroduced support for GCC 5 and 6 (#2836)
* As with VS2017, if they start causing trouble again, they will be dropped again. * 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 * `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. * 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+% * Improved performance of generating 64bit random integers by 20+%

View File

@ -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 1. Improve test run times by reducing the amount of expensive and
redundant setup and tear-down required. redundant setup and tear-down required.
2. Reusing results from the previous partial run, in the current 2. Reusing results from the previous partial run, in the current

View File

@ -87,7 +87,7 @@ function(catch_discover_tests_impl)
# Make sure to escape ; (semicolons) in test names first, because # Make sure to escape ; (semicolons) in test names first, because
# that'd break the foreach loop for "Parse output" later and create # that'd break the foreach loop for "Parse output" later and create
# wrongly splitted and thus failing test cases (false positives) # wrongly split and thus failing test cases (false positives)
string(REPLACE ";" "\;" output "${output}") string(REPLACE ";" "\;" output "${output}")
string(REPLACE "\n" ";" output "${output}") string(REPLACE "\n" ";" output "${output}")

View File

@ -5961,7 +5961,7 @@ namespace Catch {
auto& currentTracker = m_trackerContext.currentTracker(); auto& currentTracker = m_trackerContext.currentTracker();
assert( assert(
currentTracker.nameAndLocation() != nameAndLoc && 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<Generators::GeneratorTracker>( auto newTracker = Catch::Detail::make_unique<Generators::GeneratorTracker>(
CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker ); CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker );
@ -6539,7 +6539,7 @@ namespace Catch {
std::string origStr = CATCH_MOVE(str); std::string origStr = CATCH_MOVE(str);
str.clear(); str.clear();
// There is at least one replacement, so reserve with the best guess // 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()); str.reserve(origStr.size() - replaceThis.size() + withThis.size());
do { do {
str.append(origStr, copyBegin, i-copyBegin ); str.append(origStr, copyBegin, i-copyBegin );

View File

@ -5160,7 +5160,7 @@ namespace Detail {
* when the compiler handles `ExprLhs<T> == b`, it also tries to resolve * when the compiler handles `ExprLhs<T> == b`, it also tries to resolve
* the overload set for `b == ExprLhs<T>`. * the overload set for `b == ExprLhs<T>`.
* *
* 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 * 1) These types are handled by adding SFINAE overloads to our comparison
* operators, checking whether `T == U` are comparable with the given * operators, checking whether `T == U` are comparable with the given
@ -5275,7 +5275,7 @@ namespace Catch {
public: public:
constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; } constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
constexpr auto getResult() const -> bool { return m_result; } 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; virtual void streamReconstructedExpression( std::ostream& os ) const;
constexpr ITransientExpression( bool isBinaryExpression, bool result ) constexpr ITransientExpression( bool isBinaryExpression, bool result )

View File

@ -45,7 +45,7 @@
* when the compiler handles `ExprLhs<T> == b`, it also tries to resolve * when the compiler handles `ExprLhs<T> == b`, it also tries to resolve
* the overload set for `b == ExprLhs<T>`. * the overload set for `b == ExprLhs<T>`.
* *
* 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 * 1) These types are handled by adding SFINAE overloads to our comparison
* operators, checking whether `T == U` are comparable with the given * operators, checking whether `T == U` are comparable with the given
@ -160,7 +160,7 @@ namespace Catch {
public: public:
constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; } constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
constexpr auto getResult() const -> bool { return m_result; } 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; virtual void streamReconstructedExpression( std::ostream& os ) const;
constexpr ITransientExpression( bool isBinaryExpression, bool result ) constexpr ITransientExpression( bool isBinaryExpression, bool result )

View File

@ -361,7 +361,7 @@ namespace Catch {
auto& currentTracker = m_trackerContext.currentTracker(); auto& currentTracker = m_trackerContext.currentTracker();
assert( assert(
currentTracker.nameAndLocation() != nameAndLoc && 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<Generators::GeneratorTracker>( auto newTracker = Catch::Detail::make_unique<Generators::GeneratorTracker>(
CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker ); CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker );

View File

@ -74,7 +74,7 @@ namespace Catch {
std::string origStr = CATCH_MOVE(str); std::string origStr = CATCH_MOVE(str);
str.clear(); str.clear();
// There is at least one replacement, so reserve with the best guess // 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()); str.reserve(origStr.size() - replaceThis.size() + withThis.size());
do { do {
str.append(origStr, copyBegin, i-copyBegin ); str.append(origStr, copyBegin, i-copyBegin );

View File

@ -174,7 +174,7 @@ Nor would this
:test-result: XFAIL Inequality checks that should fail :test-result: XFAIL Inequality checks that should fail
:test-result: PASS Inequality checks that should succeed :test-result: PASS Inequality checks that should succeed
:test-result: PASS JsonWriter :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 Lambdas in assertions
:test-result: PASS Less-than inequalities with different epsilons :test-result: PASS Less-than inequalities with different epsilons
:test-result: PASS ManuallyRegistered :test-result: PASS ManuallyRegistered

View File

@ -172,7 +172,7 @@
:test-result: XFAIL Inequality checks that should fail :test-result: XFAIL Inequality checks that should fail
:test-result: PASS Inequality checks that should succeed :test-result: PASS Inequality checks that should succeed
:test-result: PASS JsonWriter :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 Lambdas in assertions
:test-result: PASS Less-than inequalities with different epsilons :test-result: PASS Less-than inequalities with different epsilons
:test-result: PASS ManuallyRegistered :test-result: PASS ManuallyRegistered

View File

@ -7616,7 +7616,7 @@ with expansion:
""custom"" == ""custom"" ""custom"" == ""custom""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Quote in a string is escaped Quote in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7628,7 +7628,7 @@ with expansion:
""\""" == ""\""" ""\""" == ""\"""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Backslash in a string is escaped Backslash in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7640,7 +7640,7 @@ with expansion:
""\\"" == ""\\"" ""\\"" == ""\\""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Forward slash in a string is **not** escaped Forward slash in a string is **not** escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7652,7 +7652,7 @@ with expansion:
""/"" == ""/"" ""/"" == ""/""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Backspace in a string is escaped Backspace in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7664,7 +7664,7 @@ with expansion:
""\b"" == ""\b"" ""\b"" == ""\b""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Formfeed in a string is escaped Formfeed in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7676,7 +7676,7 @@ with expansion:
""\f"" == ""\f"" ""\f"" == ""\f""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
linefeed in a string is escaped linefeed in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7688,7 +7688,7 @@ with expansion:
""\n"" == ""\n"" ""\n"" == ""\n""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
carriage return in a string is escaped carriage return in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7700,7 +7700,7 @@ with expansion:
""\r"" == ""\r"" ""\r"" == ""\r""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
tab in a string is escaped tab in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7712,7 +7712,7 @@ with expansion:
""\t"" == ""\t"" ""\t"" == ""\t""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
combination of characters is escaped combination of characters is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -18944,4 +18944,3 @@ Misc.tests.cpp:<line number>: PASSED:
=============================================================================== ===============================================================================
test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected
assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected

View File

@ -7614,7 +7614,7 @@ with expansion:
""custom"" == ""custom"" ""custom"" == ""custom""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Quote in a string is escaped Quote in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7626,7 +7626,7 @@ with expansion:
""\""" == ""\""" ""\""" == ""\"""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Backslash in a string is escaped Backslash in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7638,7 +7638,7 @@ with expansion:
""\\"" == ""\\"" ""\\"" == ""\\""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Forward slash in a string is **not** escaped Forward slash in a string is **not** escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7650,7 +7650,7 @@ with expansion:
""/"" == ""/"" ""/"" == ""/""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Backspace in a string is escaped Backspace in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7662,7 +7662,7 @@ with expansion:
""\b"" == ""\b"" ""\b"" == ""\b""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
Formfeed in a string is escaped Formfeed in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7674,7 +7674,7 @@ with expansion:
""\f"" == ""\f"" ""\f"" == ""\f""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
linefeed in a string is escaped linefeed in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7686,7 +7686,7 @@ with expansion:
""\n"" == ""\n"" ""\n"" == ""\n""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
carriage return in a string is escaped carriage return in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7698,7 +7698,7 @@ with expansion:
""\r"" == ""\r"" ""\r"" == ""\r""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
tab in a string is escaped tab in a string is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -7710,7 +7710,7 @@ with expansion:
""\t"" == ""\t"" ""\t"" == ""\t""
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
JsonWriter escapes charaters in strings properly JsonWriter escapes characters in strings properly
combination of characters is escaped combination of characters is escaped
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Json.tests.cpp:<line number> Json.tests.cpp:<line number>
@ -18933,4 +18933,3 @@ Misc.tests.cpp:<line number>: PASSED:
=============================================================================== ===============================================================================
test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected
assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected

View File

@ -928,16 +928,16 @@ at Condition.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/>

View File

@ -927,16 +927,16 @@ at Condition.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/>

View File

@ -172,16 +172,16 @@ at AssertionHandler.tests.cpp:<line number>
<testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/> <testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/>
<testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/> <testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/>
<testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/> <testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Quote in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Backslash in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Backspace in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Formfeed in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/linefeed in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/carriage return in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/tab in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/combination of characters is escaped" duration="{duration}"/>
</file> </file>
<file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp"> <file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp">
<testCase name="Parse uints" duration="{duration}"/> <testCase name="Parse uints" duration="{duration}"/>

View File

@ -171,16 +171,16 @@ at AssertionHandler.tests.cpp:<line number>
<testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/> <testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/>
<testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/> <testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/>
<testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/> <testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Quote in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Backslash in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Backspace in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/Formfeed in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/linefeed in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/carriage return in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/tab in a string is escaped" duration="{duration}"/>
<testCase name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" duration="{duration}"/> <testCase name="JsonWriter escapes characters in strings properly/combination of characters is escaped" duration="{duration}"/>
</file> </file>
<file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp"> <file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp">
<testCase name="Parse uints" duration="{duration}"/> <testCase name="Parse uints" duration="{duration}"/>

View File

@ -1892,23 +1892,23 @@ ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]" ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
# JsonWriter # JsonWriter
ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom"" 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: ""\""" == ""\""" ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
# JsonWriter escapes charaters in strings properly # JsonWriter escapes characters in strings properly
ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\"" ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
# JsonWriter escapes charaters in strings properly # JsonWriter escapes characters in strings properly
ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/"" 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"" 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"" 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"" 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"" 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"" 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"" ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
# Lambdas in assertions # Lambdas in assertions
ok {test-number} - []() { return true; }() for: true ok {test-number} - []() { return true; }() for: true
@ -4548,4 +4548,3 @@ ok {test-number} -
# xmlentitycheck # xmlentitycheck
ok {test-number} - ok {test-number} -
1..2271 1..2271

View File

@ -1890,23 +1890,23 @@ ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]" ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
# JsonWriter # JsonWriter
ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom"" 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: ""\""" == ""\""" ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
# JsonWriter escapes charaters in strings properly # JsonWriter escapes characters in strings properly
ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\"" ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
# JsonWriter escapes charaters in strings properly # JsonWriter escapes characters in strings properly
ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/"" 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"" 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"" 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"" 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"" 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"" 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"" ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
# Lambdas in assertions # Lambdas in assertions
ok {test-number} - []() { return true; }() for: true ok {test-number} - []() { return true; }() for: true
@ -4537,4 +4537,3 @@ ok {test-number} -
# xmlentitycheck # xmlentitycheck
ok {test-number} - ok {test-number} -
1..2271 1..2271

View File

@ -429,8 +429,8 @@
##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"] ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
##teamcity[testStarted name='JsonWriter'] ##teamcity[testStarted name='JsonWriter']
##teamcity[testFinished name='JsonWriter' duration="{duration}"] ##teamcity[testFinished name='JsonWriter' duration="{duration}"]
##teamcity[testStarted name='JsonWriter escapes charaters in strings properly'] ##teamcity[testStarted name='JsonWriter escapes characters in strings properly']
##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"] ##teamcity[testFinished name='JsonWriter escapes characters in strings properly' duration="{duration}"]
##teamcity[testStarted name='Lambdas in assertions'] ##teamcity[testStarted name='Lambdas in assertions']
##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"] ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"]
##teamcity[testStarted name='Less-than inequalities with different epsilons'] ##teamcity[testStarted name='Less-than inequalities with different epsilons']

View File

@ -429,8 +429,8 @@
##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"] ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
##teamcity[testStarted name='JsonWriter'] ##teamcity[testStarted name='JsonWriter']
##teamcity[testFinished name='JsonWriter' duration="{duration}"] ##teamcity[testFinished name='JsonWriter' duration="{duration}"]
##teamcity[testStarted name='JsonWriter escapes charaters in strings properly'] ##teamcity[testStarted name='JsonWriter escapes characters in strings properly']
##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"] ##teamcity[testFinished name='JsonWriter escapes characters in strings properly' duration="{duration}"]
##teamcity[testStarted name='Lambdas in assertions'] ##teamcity[testStarted name='Lambdas in assertions']
##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"] ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"]
##teamcity[testStarted name='Less-than inequalities with different epsilons'] ##teamcity[testStarted name='Less-than inequalities with different epsilons']

View File

@ -9107,7 +9107,7 @@ Approx( 3.14150000000000018 )
</Section> </Section>
<OverallResult success="true" skips="0"/> <OverallResult success="true" skips="0"/>
</TestCase> </TestCase>
<TestCase name="JsonWriter escapes charaters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <TestCase name="JsonWriter escapes characters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Original> <Original>

View File

@ -9107,7 +9107,7 @@ Approx( 3.14150000000000018 )
</Section> </Section>
<OverallResult success="true" skips="0"/> <OverallResult success="true" skips="0"/>
</TestCase> </TestCase>
<TestCase name="JsonWriter escapes charaters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <TestCase name="JsonWriter escapes characters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" > <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
<Original> <Original>

View File

@ -22,7 +22,7 @@ namespace {
ExtendedMultResult<Int>{ upper_result, lower_result } ); ExtendedMultResult<Int>{ 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<std::uint64_t> constexpr Catch::Detail::ExtendedMultResult<std::uint64_t>
extendedMultNaive( std::uint64_t lhs, std::uint64_t rhs ) { extendedMultNaive( std::uint64_t lhs, std::uint64_t rhs ) {
// This is a simple long multiplication, where we split lhs and rhs // This is a simple long multiplication, where we split lhs and rhs

View File

@ -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; std::stringstream sstream;
SECTION( "Quote in a string is escaped" ) { SECTION( "Quote in a string is escaped" ) {
Catch::JsonValueWriter{ sstream }.write( "\"" ); Catch::JsonValueWriter{ sstream }.write( "\"" );