gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3573 from cclauss:patch-1

Browse Source 
PiperOrigin-RevId: 397998384
This commit is contained in:
dinord
2021-09-23 23:31:33 +00:00
parent 319a9d19bc 5b43f14be9
commit 09074c1571
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/gmock_cook_book.md
View File

@@ -4188,7 +4188,7 @@ This implementation class does *not* need to inherit from any particular class.
What matters is that it must have a `Perform()` method template. This method What matters is that it must have a `Perform()` method template. This method
template takes the mock function's arguments as a tuple in a **single** template takes the mock function's arguments as a tuple in a **single**
argument, and returns the result of the action. It can be either `const` or not, argument, and returns the result of the action. It can be either `const` or not,
but must be invokable with exactly one template argument, which is the result but must be invocable with exactly one template argument, which is the result
type. In other words, you must be able to call `Perform<R>(args)` where `R` is type. In other words, you must be able to call `Perform<R>(args)` where `R` is
the mock function's return type and `args` is its arguments in a tuple. the mock function's return type and `args` is its arguments in a tuple.

10
googletest/test/gtest_pred_impl_unittest.cc
View File

@@ -136,7 +136,7 @@ class Predicate1Test : public testing::Test {
// Verifies that the control flow in the test function is expected. // Verifies that the control flow in the test function is expected.
if (expected_to_finish_ && !finished_) { if (expected_to_finish_ && !finished_) {
FAIL() << "The predicate assertion unexpactedly aborted the test."; FAIL() << "The predicate assertion unexpectedly aborted the test.";
} else if (!expected_to_finish_ && finished_) { } else if (!expected_to_finish_ && finished_) {
FAIL() << "The failed predicate assertion didn't abort the test " FAIL() << "The failed predicate assertion didn't abort the test "
"as expected."; "as expected.";
@@ -530,7 +530,7 @@ class Predicate2Test : public testing::Test {
// Verifies that the control flow in the test function is expected. // Verifies that the control flow in the test function is expected.
if (expected_to_finish_ && !finished_) { if (expected_to_finish_ && !finished_) {
FAIL() << "The predicate assertion unexpactedly aborted the test."; FAIL() << "The predicate assertion unexpectedly aborted the test.";
} else if (!expected_to_finish_ && finished_) { } else if (!expected_to_finish_ && finished_) {
FAIL() << "The failed predicate assertion didn't abort the test " FAIL() << "The failed predicate assertion didn't abort the test "
"as expected."; "as expected.";
@@ -966,7 +966,7 @@ class Predicate3Test : public testing::Test {
// Verifies that the control flow in the test function is expected. // Verifies that the control flow in the test function is expected.
if (expected_to_finish_ && !finished_) { if (expected_to_finish_ && !finished_) {
FAIL() << "The predicate assertion unexpactedly aborted the test."; FAIL() << "The predicate assertion unexpectedly aborted the test.";
} else if (!expected_to_finish_ && finished_) { } else if (!expected_to_finish_ && finished_) {
FAIL() << "The failed predicate assertion didn't abort the test " FAIL() << "The failed predicate assertion didn't abort the test "
"as expected."; "as expected.";
@@ -1444,7 +1444,7 @@ class Predicate4Test : public testing::Test {
// Verifies that the control flow in the test function is expected. // Verifies that the control flow in the test function is expected.
if (expected_to_finish_ && !finished_) { if (expected_to_finish_ && !finished_) {
FAIL() << "The predicate assertion unexpactedly aborted the test."; FAIL() << "The predicate assertion unexpectedly aborted the test.";
} else if (!expected_to_finish_ && finished_) { } else if (!expected_to_finish_ && finished_) {
FAIL() << "The failed predicate assertion didn't abort the test " FAIL() << "The failed predicate assertion didn't abort the test "
"as expected."; "as expected.";
@@ -1964,7 +1964,7 @@ class Predicate5Test : public testing::Test {
// Verifies that the control flow in the test function is expected. // Verifies that the control flow in the test function is expected.
if (expected_to_finish_ && !finished_) { if (expected_to_finish_ && !finished_) {
FAIL() << "The predicate assertion unexpactedly aborted the test."; FAIL() << "The predicate assertion unexpectedly aborted the test.";
} else if (!expected_to_finish_ && finished_) { } else if (!expected_to_finish_ && finished_) {
FAIL() << "The failed predicate assertion didn't abort the test " FAIL() << "The failed predicate assertion didn't abort the test "
"as expected."; "as expected.";

2
googletest/test/gtest_unittest.cc
View File

@@ -404,7 +404,7 @@ TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
// Tests FormatEpochTimeInMillisAsIso8601(). The correctness of conversion // Tests FormatEpochTimeInMillisAsIso8601(). The correctness of conversion
// for particular dates below was verified in Python using // for particular dates below was verified in Python using
// datetime.datetime.fromutctimestamp(<timetamp>/1000). // datetime.datetime.fromutctimestamp(<timestamp>/1000).
// FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we // FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we
// have to set up a particular timezone to obtain predictable results. // have to set up a particular timezone to obtain predictable results.