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

Merge pull request #2353 from anttsov:patch-1

Browse Source 
PiperOrigin-RevId: 261198930
This commit is contained in:
Gennadiy Civil
2019-08-02 11:32:14 -04:00
parent 8756ef9058 64b17693e3
commit c8d338c629
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
googlemock/README.md
View File

@@ -28,6 +28,13 @@ gMock:
- does not use exceptions, and - does not use exceptions, and
- is easy to learn and use. - is easy to learn and use.
Details and examples can be found here:
* [gMock for Dummies](docs/for_dummies.md)
* [Legacy gMock FAQ](docs/gmock_faq.md)
* [gMock Cookbook](docs/cook_book.md)
* [gMock Cheat Sheet](docs/cheat_sheet.md)
Please note that code under scripts/generator/ is from the [cppclean Please note that code under scripts/generator/ is from the [cppclean
project](http://code.google.com/p/cppclean/) and under the Apache project](http://code.google.com/p/cppclean/) and under the Apache
License, which is different from Google Mock's license. License, which is different from Google Mock's license.

2
googlemock/scripts/upload.py
View File

@@ -631,7 +631,7 @@ class VersionControlSystem(object):
new_content: For text files, this is empty. For binary files, this is new_content: For text files, this is empty. For binary files, this is
the contents of the new file, since the diff output won't contain the contents of the new file, since the diff output won't contain
information to reconstruct the current file. information to reconstruct the current file.
is_binary: True if the file is binary. is_binary: True iff the file is binary.
status: The status of the file. status: The status of the file.
""" """

14
googletest/scripts/gen_gtest_pred_impl.py
View File

@@ -540,10 +540,10 @@ class Predicate%(n)sTest : public testing::Test {
} }
} }
// true if the test function is expected to run to finish. // true iff the test function is expected to run to finish.
static bool expected_to_finish_; static bool expected_to_finish_;
// true if the test function did run to finish. // true iff the test function did run to finish.
static bool finished_; static bool finished_;
""" % DEFS """ % DEFS
@@ -572,12 +572,12 @@ typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest;
"""Returns the test for a predicate assertion macro. """Returns the test for a predicate assertion macro.
Args: Args:
use_format: true if the assertion is a *_PRED_FORMAT*. use_format: true iff the assertion is a *_PRED_FORMAT*.
use_assert: true if the assertion is a ASSERT_*. use_assert: true iff the assertion is a ASSERT_*.
expect_failure: true if the assertion is expected to fail. expect_failure: true iff the assertion is expected to fail.
use_functor: true if the first argument of the assertion is use_functor: true iff the first argument of the assertion is
a functor (as opposed to a function) a functor (as opposed to a function)
use_user_type: true if the predicate functor/function takes use_user_type: true iff the predicate functor/function takes
argument(s) of a user-defined type. argument(s) of a user-defined type.
Example: Example:

2
googletest/scripts/pump.py
View File

@@ -161,7 +161,7 @@ class Token:
def StartsWith(lines, pos, string): def StartsWith(lines, pos, string):
"""Returns True if the given position in lines starts with 'string'.""" """Returns True iff the given position in lines starts with 'string'."""
return lines[pos.line][pos.column:].startswith(string) return lines[pos.line][pos.column:].startswith(string)

2
googletest/scripts/upload.py
View File

@@ -631,7 +631,7 @@ class VersionControlSystem(object):
new_content: For text files, this is empty. For binary files, this is new_content: For text files, this is empty. For binary files, this is
the contents of the new file, since the diff output won't contain the contents of the new file, since the diff output won't contain
information to reconstruct the current file. information to reconstruct the current file.
is_binary: True if the file is binary. is_binary: True iff the file is binary.
status: The status of the file. status: The status of the file.
""" """