diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:39:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 10:39:40 -0400 |
| commit | f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90 (patch) | |
| tree | 7d4dad554bf23bb5783b7aacf4dd0c8704c7754b /googlemock/test/gmock_test.cc | |
| parent | 6c093a2391eb66a42bd4146443265eddad06be0c (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.tar.gz googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.tar.bz2 googletest-f3a9fa6a62a29746eba6c7092a2fada2fc1a5e90.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test/gmock_test.cc')
| -rw-r--r-- | googlemock/test/gmock_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc index 28995345..341a17da 100644 --- a/googlemock/test/gmock_test.cc +++ b/googlemock/test/gmock_test.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // @@ -37,6 +36,7 @@ #include <string> #include "gtest/gtest.h" +#include "gtest/internal/custom/gtest.h" #if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) @@ -51,9 +51,9 @@ void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N], const ::std::string& expected_gmock_verbose) { const ::std::string old_verbose = GMOCK_FLAG(verbose); - int argc = M; + int argc = M - 1; InitGoogleMock(&argc, const_cast<Char**>(argv)); - ASSERT_EQ(N, argc) << "The new argv has wrong number of elements."; + ASSERT_EQ(N - 1, argc) << "The new argv has wrong number of elements."; for (int i = 0; i < N; i++) { EXPECT_STREQ(new_argv[i], argv[i]); |