diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-10-04 21:03:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 21:03:47 +0200 |
| commit | ceee80c383d6f34af1a4e0fbb464f3f144cded68 (patch) | |
| tree | acddac2058e907f3db9bafe616b38e156becb51d /googlemock/test | |
| parent | 98024ad2027387680fd4af72b70c14667850b09c (diff) | |
| parent | 7b6561c56e353100aca8458d7bc49c4e0119bae8 (diff) | |
| download | googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.tar.gz googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.tar.bz2 googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-cardinalities_test.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-cardinalities_test.cc b/googlemock/test/gmock-cardinalities_test.cc index 64815e57..04c792b5 100644 --- a/googlemock/test/gmock-cardinalities_test.cc +++ b/googlemock/test/gmock-cardinalities_test.cc @@ -391,7 +391,7 @@ TEST(ExactlyTest, HasCorrectBounds) { EXPECT_EQ(3, c.ConservativeUpperBound()); } -// Tests that a user can make his own cardinality by implementing +// Tests that a user can make their own cardinality by implementing // CardinalityInterface and calling MakeCardinality(). class EvenCardinality : public CardinalityInterface { diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 9c2423ec..72d9a854 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -49,7 +49,7 @@ // implementation. It must come before gtest-internal-inl.h is // included, or there will be a compiler error. This trick is to // prevent a user from accidentally including gtest-internal-inl.h in -// his code. +// their code. #define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" #undef GTEST_IMPLEMENTATION_ diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index c649bfd9..a7bf03e5 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -2682,7 +2682,7 @@ TEST(SynchronizationTest, CanCallMockMethodInAction) { } // namespace -// Allows the user to define his own main and then invoke gmock_main +// Allows the user to define their own main and then invoke gmock_main // from it. This might be necessary on some platforms which require // specific setup and teardown. #if GMOCK_RENAME_MAIN |