summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2015-07-27 20:52:35 (GMT)
committerkosak <kosak@google.com>2015-07-27 20:52:35 (GMT)
commit37a8c1068d064118aa34918d597a5e23698304b6 (patch)
treee2c461cc095b1763e81e2da16a98653c934c665e
parenta6e32f0a2c681c2fa0a022da24b0a4be903cf13b (diff)
downloadgoogletest-37a8c1068d064118aa34918d597a5e23698304b6.zip
googletest-37a8c1068d064118aa34918d597a5e23698304b6.tar.gz
googletest-37a8c1068d064118aa34918d597a5e23698304b6.tar.bz2
Missing diff that should have gone along with the pull of gtest 738.
-rw-r--r--test/gmock_test.cc39
1 files changed, 0 insertions, 39 deletions
diff --git a/test/gmock_test.cc b/test/gmock_test.cc
index 0b89113..baba717 100644
--- a/test/gmock_test.cc
+++ b/test/gmock_test.cc
@@ -40,7 +40,6 @@
using testing::GMOCK_FLAG(verbose);
using testing::InitGoogleMock;
-using testing::internal::g_init_gtest_count;
// Verifies that calling InitGoogleMock() on argv results in new_argv,
// and the gmock_verbose flag's value is set to expected_gmock_verbose.
@@ -135,25 +134,6 @@ TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
TestInitGoogleMock(argv, new_argv, "error");
}
-TEST(InitGoogleMockTest, CallsInitGoogleTest) {
- const int old_init_gtest_count = g_init_gtest_count;
- const char* argv[] = {
- "foo.exe",
- "--non_gmock_flag=blah",
- "--gmock_verbose=error",
- NULL
- };
-
- const char* new_argv[] = {
- "foo.exe",
- "--non_gmock_flag=blah",
- NULL
- };
-
- TestInitGoogleMock(argv, new_argv, "error");
- EXPECT_EQ(old_init_gtest_count + 1, g_init_gtest_count);
-}
-
TEST(WideInitGoogleMockTest, ParsesInvalidCommandLine) {
const wchar_t* argv[] = {
NULL
@@ -228,25 +208,6 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
TestInitGoogleMock(argv, new_argv, "error");
}
-TEST(WideInitGoogleMockTest, CallsInitGoogleTest) {
- const int old_init_gtest_count = g_init_gtest_count;
- const wchar_t* argv[] = {
- L"foo.exe",
- L"--non_gmock_flag=blah",
- L"--gmock_verbose=error",
- NULL
- };
-
- const wchar_t* new_argv[] = {
- L"foo.exe",
- L"--non_gmock_flag=blah",
- NULL
- };
-
- TestInitGoogleMock(argv, new_argv, "error");
- EXPECT_EQ(old_init_gtest_count + 1, g_init_gtest_count);
-}
-
// Makes sure Google Mock flags can be accessed in code.
TEST(FlagTest, IsAccessibleInCode) {
bool dummy = testing::GMOCK_FLAG(catch_leaked_mocks) &&