Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
37a8c106
Commit
37a8c106
authored
Jul 27, 2015
by
kosak
Browse files
Missing diff that should have gone along with the pull of gtest 738.
parent
a6e32f0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
39 deletions
+0
-39
test/gmock_test.cc
test/gmock_test.cc
+0
-39
No files found.
test/gmock_test.cc
View file @
37a8c106
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
using
testing
::
GMOCK_FLAG
(
verbose
);
using
testing
::
GMOCK_FLAG
(
verbose
);
using
testing
::
InitGoogleMock
;
using
testing
::
InitGoogleMock
;
using
testing
::
internal
::
g_init_gtest_count
;
// Verifies that calling InitGoogleMock() on argv results in new_argv,
// Verifies that calling InitGoogleMock() on argv results in new_argv,
// and the gmock_verbose flag's value is set to expected_gmock_verbose.
// and the gmock_verbose flag's value is set to expected_gmock_verbose.
...
@@ -135,25 +134,6 @@ TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
...
@@ -135,25 +134,6 @@ TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
TestInitGoogleMock
(
argv
,
new_argv
,
"error"
);
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
)
{
TEST
(
WideInitGoogleMockTest
,
ParsesInvalidCommandLine
)
{
const
wchar_t
*
argv
[]
=
{
const
wchar_t
*
argv
[]
=
{
NULL
NULL
...
@@ -228,25 +208,6 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
...
@@ -228,25 +208,6 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
TestInitGoogleMock
(
argv
,
new_argv
,
"error"
);
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.
// Makes sure Google Mock flags can be accessed in code.
TEST
(
FlagTest
,
IsAccessibleInCode
)
{
TEST
(
FlagTest
,
IsAccessibleInCode
)
{
bool
dummy
=
testing
::
GMOCK_FLAG
(
catch_leaked_mocks
)
&&
bool
dummy
=
testing
::
GMOCK_FLAG
(
catch_leaked_mocks
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment