Commit 6202251f authored by Abseil Team's avatar Abseil Team Committed by Derek Mauro
Browse files

Googletest export

Introduce GMOCK_FLAG_GET and GMOCK_FLAG_SET macros.

PiperOrigin-RevId: 396649214
parent 159c9ad2
...@@ -50,7 +50,6 @@ class Mock { ...@@ -50,7 +50,6 @@ class Mock {
namespace testing { namespace testing {
namespace gmock_nice_strict_test { namespace gmock_nice_strict_test {
using testing::GMOCK_FLAG(verbose);
using testing::HasSubstr; using testing::HasSubstr;
using testing::NaggyMock; using testing::NaggyMock;
using testing::NiceMock; using testing::NiceMock;
...@@ -140,8 +139,8 @@ class MockBaz { ...@@ -140,8 +139,8 @@ class MockBaz {
// Tests that a raw mock generates warnings for uninteresting calls. // Tests that a raw mock generates warnings for uninteresting calls.
TEST(RawMockTest, WarningForUninterestingCall) { TEST(RawMockTest, WarningForUninterestingCall) {
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
MockFoo raw_foo; MockFoo raw_foo;
...@@ -151,14 +150,14 @@ TEST(RawMockTest, WarningForUninterestingCall) { ...@@ -151,14 +150,14 @@ TEST(RawMockTest, WarningForUninterestingCall) {
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
// Tests that a raw mock generates warnings for uninteresting calls // Tests that a raw mock generates warnings for uninteresting calls
// that delete the mock object. // that delete the mock object.
TEST(RawMockTest, WarningForUninterestingCallAfterDeath) { TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
MockFoo* const raw_foo = new MockFoo; MockFoo* const raw_foo = new MockFoo;
...@@ -170,7 +169,7 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) { ...@@ -170,7 +169,7 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
// Tests that a raw mock generates informational logs for // Tests that a raw mock generates informational logs for
...@@ -178,14 +177,14 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) { ...@@ -178,14 +177,14 @@ TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
TEST(RawMockTest, InfoForUninterestingCall) { TEST(RawMockTest, InfoForUninterestingCall) {
MockFoo raw_foo; MockFoo raw_foo;
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "info"; GMOCK_FLAG_SET(verbose, "info");
CaptureStdout(); CaptureStdout();
raw_foo.DoThis(); raw_foo.DoThis();
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
TEST(RawMockTest, IsNaggy_IsNice_IsStrict) { TEST(RawMockTest, IsNaggy_IsNice_IsStrict) {
...@@ -223,14 +222,14 @@ TEST(NiceMockTest, NoWarningForUninterestingCallAfterDeath) { ...@@ -223,14 +222,14 @@ TEST(NiceMockTest, NoWarningForUninterestingCallAfterDeath) {
TEST(NiceMockTest, InfoForUninterestingCall) { TEST(NiceMockTest, InfoForUninterestingCall) {
NiceMock<MockFoo> nice_foo; NiceMock<MockFoo> nice_foo;
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "info"; GMOCK_FLAG_SET(verbose, "info");
CaptureStdout(); CaptureStdout();
nice_foo.DoThis(); nice_foo.DoThis();
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
#endif // GTEST_HAS_STREAM_REDIRECTION #endif // GTEST_HAS_STREAM_REDIRECTION
...@@ -326,8 +325,8 @@ TEST(NiceMockTest, IsNaggy_IsNice_IsStrict) { ...@@ -326,8 +325,8 @@ TEST(NiceMockTest, IsNaggy_IsNice_IsStrict) {
// Tests that a naggy mock generates warnings for uninteresting calls. // Tests that a naggy mock generates warnings for uninteresting calls.
TEST(NaggyMockTest, WarningForUninterestingCall) { TEST(NaggyMockTest, WarningForUninterestingCall) {
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
NaggyMock<MockFoo> naggy_foo; NaggyMock<MockFoo> naggy_foo;
...@@ -337,14 +336,14 @@ TEST(NaggyMockTest, WarningForUninterestingCall) { ...@@ -337,14 +336,14 @@ TEST(NaggyMockTest, WarningForUninterestingCall) {
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
// Tests that a naggy mock generates a warning for an uninteresting call // Tests that a naggy mock generates a warning for an uninteresting call
// that deletes the mock object. // that deletes the mock object.
TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) { TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) {
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
NaggyMock<MockFoo>* const naggy_foo = new NaggyMock<MockFoo>; NaggyMock<MockFoo>* const naggy_foo = new NaggyMock<MockFoo>;
...@@ -356,7 +355,7 @@ TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) { ...@@ -356,7 +355,7 @@ TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) {
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
#endif // GTEST_HAS_STREAM_REDIRECTION #endif // GTEST_HAS_STREAM_REDIRECTION
...@@ -419,8 +418,8 @@ TEST(NaggyMockTest, AcceptsClassNamedMock) { ...@@ -419,8 +418,8 @@ TEST(NaggyMockTest, AcceptsClassNamedMock) {
} }
TEST(NaggyMockTest, IsNaggyInDestructor) { TEST(NaggyMockTest, IsNaggyInDestructor) {
const std::string saved_flag = GMOCK_FLAG(verbose); const std::string saved_flag = GMOCK_FLAG_GET(verbose);
GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
CaptureStdout(); CaptureStdout();
{ {
...@@ -431,7 +430,7 @@ TEST(NaggyMockTest, IsNaggyInDestructor) { ...@@ -431,7 +430,7 @@ TEST(NaggyMockTest, IsNaggyInDestructor) {
EXPECT_THAT(GetCapturedStdout(), EXPECT_THAT(GetCapturedStdout(),
HasSubstr("Uninteresting mock function call")); HasSubstr("Uninteresting mock function call"));
GMOCK_FLAG(verbose) = saved_flag; GMOCK_FLAG_SET(verbose, saved_flag);
} }
TEST(NaggyMockTest, IsNaggy_IsNice_IsStrict) { TEST(NaggyMockTest, IsNaggy_IsNice_IsStrict) {
......
...@@ -76,7 +76,6 @@ using testing::DoDefault; ...@@ -76,7 +76,6 @@ using testing::DoDefault;
using testing::Eq; using testing::Eq;
using testing::Expectation; using testing::Expectation;
using testing::ExpectationSet; using testing::ExpectationSet;
using testing::GMOCK_FLAG(verbose);
using testing::Gt; using testing::Gt;
using testing::IgnoreResult; using testing::IgnoreResult;
using testing::InSequence; using testing::InSequence;
...@@ -696,9 +695,9 @@ TEST(ExpectCallSyntaxTest, WarnsOnTooFewActions) { ...@@ -696,9 +695,9 @@ TEST(ExpectCallSyntaxTest, WarnsOnTooFewActions) {
} }
TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
int original_behavior = testing::GMOCK_FLAG(default_mock_behavior); int original_behavior = GMOCK_FLAG_GET(default_mock_behavior);
testing::GMOCK_FLAG(default_mock_behavior) = kAllow; GMOCK_FLAG_SET(default_mock_behavior, kAllow);
CaptureStdout(); CaptureStdout();
{ {
MockA a; MockA a;
...@@ -707,7 +706,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { ...@@ -707,7 +706,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
std::string output = GetCapturedStdout(); std::string output = GetCapturedStdout();
EXPECT_TRUE(output.empty()) << output; EXPECT_TRUE(output.empty()) << output;
testing::GMOCK_FLAG(default_mock_behavior) = kWarn; GMOCK_FLAG_SET(default_mock_behavior, kWarn);
CaptureStdout(); CaptureStdout();
{ {
MockA a; MockA a;
...@@ -718,14 +717,14 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { ...@@ -718,14 +717,14 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call", EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
warning_output); warning_output);
testing::GMOCK_FLAG(default_mock_behavior) = kFail; GMOCK_FLAG_SET(default_mock_behavior, kFail);
EXPECT_NONFATAL_FAILURE({ EXPECT_NONFATAL_FAILURE({
MockA a; MockA a;
a.DoA(0); a.DoA(0);
}, "Uninteresting mock function call"); }, "Uninteresting mock function call");
// Out of bounds values are converted to kWarn // Out of bounds values are converted to kWarn
testing::GMOCK_FLAG(default_mock_behavior) = -1; GMOCK_FLAG_SET(default_mock_behavior, -1);
CaptureStdout(); CaptureStdout();
{ {
MockA a; MockA a;
...@@ -735,7 +734,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { ...@@ -735,7 +734,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", warning_output); EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", warning_output);
EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call", EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
warning_output); warning_output);
testing::GMOCK_FLAG(default_mock_behavior) = 3; GMOCK_FLAG_SET(default_mock_behavior, 3);
CaptureStdout(); CaptureStdout();
{ {
MockA a; MockA a;
...@@ -746,7 +745,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { ...@@ -746,7 +745,7 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) {
EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call", EXPECT_PRED_FORMAT2(IsSubstring, "Uninteresting mock function call",
warning_output); warning_output);
testing::GMOCK_FLAG(default_mock_behavior) = original_behavior; GMOCK_FLAG_SET(default_mock_behavior, original_behavior);
} }
#endif // GTEST_HAS_STREAM_REDIRECTION #endif // GTEST_HAS_STREAM_REDIRECTION
...@@ -2024,10 +2023,10 @@ class MockC { ...@@ -2024,10 +2023,10 @@ class MockC {
class VerboseFlagPreservingFixture : public testing::Test { class VerboseFlagPreservingFixture : public testing::Test {
protected: protected:
VerboseFlagPreservingFixture() VerboseFlagPreservingFixture()
: saved_verbose_flag_(GMOCK_FLAG(verbose)) {} : saved_verbose_flag_(GMOCK_FLAG_GET(verbose)) {}
~VerboseFlagPreservingFixture() override { ~VerboseFlagPreservingFixture() override {
GMOCK_FLAG(verbose) = saved_verbose_flag_; GMOCK_FLAG_SET(verbose, saved_verbose_flag_);
} }
private: private:
...@@ -2043,7 +2042,7 @@ class VerboseFlagPreservingFixture : public testing::Test { ...@@ -2043,7 +2042,7 @@ class VerboseFlagPreservingFixture : public testing::Test {
// --gmock_verbose=warning is specified. // --gmock_verbose=warning is specified.
TEST(FunctionCallMessageTest, TEST(FunctionCallMessageTest,
UninterestingCallOnNaggyMockGeneratesNoStackTraceWhenVerboseWarning) { UninterestingCallOnNaggyMockGeneratesNoStackTraceWhenVerboseWarning) {
GMOCK_FLAG(verbose) = kWarningVerbosity; GMOCK_FLAG_SET(verbose, kWarningVerbosity);
NaggyMock<MockC> c; NaggyMock<MockC> c;
CaptureStdout(); CaptureStdout();
c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable()); c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable());
...@@ -2057,7 +2056,7 @@ TEST(FunctionCallMessageTest, ...@@ -2057,7 +2056,7 @@ TEST(FunctionCallMessageTest,
// --gmock_verbose=info is specified. // --gmock_verbose=info is specified.
TEST(FunctionCallMessageTest, TEST(FunctionCallMessageTest,
UninterestingCallOnNaggyMockGeneratesFyiWithStackTraceWhenVerboseInfo) { UninterestingCallOnNaggyMockGeneratesFyiWithStackTraceWhenVerboseInfo) {
GMOCK_FLAG(verbose) = kInfoVerbosity; GMOCK_FLAG_SET(verbose, kInfoVerbosity);
NaggyMock<MockC> c; NaggyMock<MockC> c;
CaptureStdout(); CaptureStdout();
c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable()); c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable());
...@@ -2213,7 +2212,7 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { ...@@ -2213,7 +2212,7 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
// Tests that --gmock_verbose=info causes both expected and // Tests that --gmock_verbose=info causes both expected and
// uninteresting calls to be reported. // uninteresting calls to be reported.
TEST_F(GMockVerboseFlagTest, Info) { TEST_F(GMockVerboseFlagTest, Info) {
GMOCK_FLAG(verbose) = kInfoVerbosity; GMOCK_FLAG_SET(verbose, kInfoVerbosity);
TestExpectedCall(true); TestExpectedCall(true);
TestUninterestingCallOnNaggyMock(true); TestUninterestingCallOnNaggyMock(true);
} }
...@@ -2221,7 +2220,7 @@ TEST_F(GMockVerboseFlagTest, Info) { ...@@ -2221,7 +2220,7 @@ TEST_F(GMockVerboseFlagTest, Info) {
// Tests that --gmock_verbose=warning causes uninteresting calls to be // Tests that --gmock_verbose=warning causes uninteresting calls to be
// reported. // reported.
TEST_F(GMockVerboseFlagTest, Warning) { TEST_F(GMockVerboseFlagTest, Warning) {
GMOCK_FLAG(verbose) = kWarningVerbosity; GMOCK_FLAG_SET(verbose, kWarningVerbosity);
TestExpectedCall(false); TestExpectedCall(false);
TestUninterestingCallOnNaggyMock(true); TestUninterestingCallOnNaggyMock(true);
} }
...@@ -2229,7 +2228,7 @@ TEST_F(GMockVerboseFlagTest, Warning) { ...@@ -2229,7 +2228,7 @@ TEST_F(GMockVerboseFlagTest, Warning) {
// Tests that --gmock_verbose=warning causes neither expected nor // Tests that --gmock_verbose=warning causes neither expected nor
// uninteresting calls to be reported. // uninteresting calls to be reported.
TEST_F(GMockVerboseFlagTest, Error) { TEST_F(GMockVerboseFlagTest, Error) {
GMOCK_FLAG(verbose) = kErrorVerbosity; GMOCK_FLAG_SET(verbose, kErrorVerbosity);
TestExpectedCall(false); TestExpectedCall(false);
TestUninterestingCallOnNaggyMock(false); TestUninterestingCallOnNaggyMock(false);
} }
...@@ -2237,7 +2236,7 @@ TEST_F(GMockVerboseFlagTest, Error) { ...@@ -2237,7 +2236,7 @@ TEST_F(GMockVerboseFlagTest, Error) {
// Tests that --gmock_verbose=SOME_INVALID_VALUE has the same effect // Tests that --gmock_verbose=SOME_INVALID_VALUE has the same effect
// as --gmock_verbose=warning. // as --gmock_verbose=warning.
TEST_F(GMockVerboseFlagTest, InvalidFlagIsTreatedAsWarning) { TEST_F(GMockVerboseFlagTest, InvalidFlagIsTreatedAsWarning) {
GMOCK_FLAG(verbose) = "invalid"; // Treated as "warning". GMOCK_FLAG_SET(verbose, "invalid"); // Treated as "warning".
TestExpectedCall(false); TestExpectedCall(false);
TestUninterestingCallOnNaggyMock(true); TestUninterestingCallOnNaggyMock(true);
} }
...@@ -2270,21 +2269,21 @@ class GMockLogTest : public VerboseFlagPreservingFixture { ...@@ -2270,21 +2269,21 @@ class GMockLogTest : public VerboseFlagPreservingFixture {
}; };
TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsWarning) { TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsWarning) {
GMOCK_FLAG(verbose) = kWarningVerbosity; GMOCK_FLAG_SET(verbose, kWarningVerbosity);
EXPECT_CALL(helper_, Foo(_)) EXPECT_CALL(helper_, Foo(_))
.WillOnce(Return(PrintMeNot())); .WillOnce(Return(PrintMeNot()));
helper_.Foo(PrintMeNot()); // This is an expected call. helper_.Foo(PrintMeNot()); // This is an expected call.
} }
TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsError) { TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsError) {
GMOCK_FLAG(verbose) = kErrorVerbosity; GMOCK_FLAG_SET(verbose, kErrorVerbosity);
EXPECT_CALL(helper_, Foo(_)) EXPECT_CALL(helper_, Foo(_))
.WillOnce(Return(PrintMeNot())); .WillOnce(Return(PrintMeNot()));
helper_.Foo(PrintMeNot()); // This is an expected call. helper_.Foo(PrintMeNot()); // This is an expected call.
} }
TEST_F(GMockLogTest, DoesNotPrintWarningInternallyIfVerbosityIsError) { TEST_F(GMockLogTest, DoesNotPrintWarningInternallyIfVerbosityIsError) {
GMOCK_FLAG(verbose) = kErrorVerbosity; GMOCK_FLAG_SET(verbose, kErrorVerbosity);
ON_CALL(helper_, Foo(_)) ON_CALL(helper_, Foo(_))
.WillByDefault(Return(PrintMeNot())); .WillByDefault(Return(PrintMeNot()));
helper_.Foo(PrintMeNot()); // This should generate a warning. helper_.Foo(PrintMeNot()); // This should generate a warning.
...@@ -2768,8 +2767,8 @@ int main(int argc, char **argv) { ...@@ -2768,8 +2767,8 @@ int main(int argc, char **argv) {
testing::InitGoogleMock(&argc, argv); testing::InitGoogleMock(&argc, argv);
// Ensures that the tests pass no matter what value of // Ensures that the tests pass no matter what value of
// --gmock_catch_leaked_mocks and --gmock_verbose the user specifies. // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
testing::GMOCK_FLAG(catch_leaked_mocks) = true; GMOCK_FLAG_SET(catch_leaked_mocks, true);
testing::GMOCK_FLAG(verbose) = testing::internal::kWarningVerbosity; GMOCK_FLAG_SET(verbose, testing::internal::kWarningVerbosity);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
...@@ -72,21 +72,21 @@ class GMockOutputTest : public testing::Test { ...@@ -72,21 +72,21 @@ class GMockOutputTest : public testing::Test {
}; };
TEST_F(GMockOutputTest, ExpectedCall) { TEST_F(GMockOutputTest, ExpectedCall) {
testing::GMOCK_FLAG(verbose) = "info"; GMOCK_FLAG_SET(verbose, "info");
EXPECT_CALL(foo_, Bar2(0, _)); EXPECT_CALL(foo_, Bar2(0, _));
foo_.Bar2(0, 0); // Expected call foo_.Bar2(0, 0); // Expected call
testing::GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
} }
TEST_F(GMockOutputTest, ExpectedCallToVoidFunction) { TEST_F(GMockOutputTest, ExpectedCallToVoidFunction) {
testing::GMOCK_FLAG(verbose) = "info"; GMOCK_FLAG_SET(verbose, "info");
EXPECT_CALL(foo_, Bar3(0, _)); EXPECT_CALL(foo_, Bar3(0, _));
foo_.Bar3(0, 0); // Expected call foo_.Bar3(0, 0); // Expected call
testing::GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
} }
TEST_F(GMockOutputTest, ExplicitActionsRunOut) { TEST_F(GMockOutputTest, ExplicitActionsRunOut) {
...@@ -297,8 +297,8 @@ int main(int argc, char **argv) { ...@@ -297,8 +297,8 @@ int main(int argc, char **argv) {
testing::InitGoogleMock(&argc, argv); testing::InitGoogleMock(&argc, argv);
// Ensures that the tests pass no matter what value of // Ensures that the tests pass no matter what value of
// --gmock_catch_leaked_mocks and --gmock_verbose the user specifies. // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
testing::GMOCK_FLAG(catch_leaked_mocks) = true; GMOCK_FLAG_SET(catch_leaked_mocks, true);
testing::GMOCK_FLAG(verbose) = "warning"; GMOCK_FLAG_SET(verbose, "warning");
TestCatchesLeakedMocksInAdHocTests(); TestCatchesLeakedMocksInAdHocTests();
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) #if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
using testing::GMOCK_FLAG(default_mock_behavior);
using testing::GMOCK_FLAG(verbose);
using testing::InitGoogleMock; using testing::InitGoogleMock;
// Verifies that calling InitGoogleMock() on argv results in new_argv, // Verifies that calling InitGoogleMock() on argv results in new_argv,
...@@ -49,7 +47,7 @@ using testing::InitGoogleMock; ...@@ -49,7 +47,7 @@ using testing::InitGoogleMock;
template <typename Char, int M, int N> template <typename Char, int M, int N>
void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N], void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N],
const ::std::string& expected_gmock_verbose) { const ::std::string& expected_gmock_verbose) {
const ::std::string old_verbose = GMOCK_FLAG(verbose); const ::std::string old_verbose = GMOCK_FLAG_GET(verbose);
int argc = M - 1; int argc = M - 1;
InitGoogleMock(&argc, const_cast<Char**>(argv)); InitGoogleMock(&argc, const_cast<Char**>(argv));
...@@ -59,8 +57,8 @@ void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N], ...@@ -59,8 +57,8 @@ void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N],
EXPECT_STREQ(new_argv[i], argv[i]); EXPECT_STREQ(new_argv[i], argv[i]);
} }
EXPECT_EQ(expected_gmock_verbose, GMOCK_FLAG(verbose).c_str()); EXPECT_EQ(expected_gmock_verbose, GMOCK_FLAG_GET(verbose));
GMOCK_FLAG(verbose) = old_verbose; // Restores the gmock_verbose flag. GMOCK_FLAG_SET(verbose, old_verbose); // Restores the gmock_verbose flag.
} }
TEST(InitGoogleMockTest, ParsesInvalidCommandLine) { TEST(InitGoogleMockTest, ParsesInvalidCommandLine) {
...@@ -68,7 +66,7 @@ TEST(InitGoogleMockTest, ParsesInvalidCommandLine) { ...@@ -68,7 +66,7 @@ TEST(InitGoogleMockTest, ParsesInvalidCommandLine) {
const char* new_argv[] = {nullptr}; const char* new_argv[] = {nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(InitGoogleMockTest, ParsesEmptyCommandLine) { TEST(InitGoogleMockTest, ParsesEmptyCommandLine) {
...@@ -76,7 +74,7 @@ TEST(InitGoogleMockTest, ParsesEmptyCommandLine) { ...@@ -76,7 +74,7 @@ TEST(InitGoogleMockTest, ParsesEmptyCommandLine) {
const char* new_argv[] = {"foo.exe", nullptr}; const char* new_argv[] = {"foo.exe", nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(InitGoogleMockTest, ParsesSingleFlag) { TEST(InitGoogleMockTest, ParsesSingleFlag) {
...@@ -88,16 +86,16 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) { ...@@ -88,16 +86,16 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) {
} }
TEST(InitGoogleMockTest, ParsesMultipleFlags) { TEST(InitGoogleMockTest, ParsesMultipleFlags) {
int old_default_behavior = GMOCK_FLAG(default_mock_behavior); int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info", const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
L"--gmock_default_mock_behavior=2", nullptr}; L"--gmock_default_mock_behavior=2", nullptr};
const wchar_t* new_argv[] = {L"foo.exe", nullptr}; const wchar_t* new_argv[] = {L"foo.exe", nullptr};
TestInitGoogleMock(argv, new_argv, "info"); TestInitGoogleMock(argv, new_argv, "info");
EXPECT_EQ(2, GMOCK_FLAG(default_mock_behavior)); EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
EXPECT_NE(2, old_default_behavior); EXPECT_NE(2, old_default_behavior);
GMOCK_FLAG(default_mock_behavior) = old_default_behavior; GMOCK_FLAG_SET(default_mock_behavior, old_default_behavior);
} }
TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) { TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) {
...@@ -105,7 +103,7 @@ TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) { ...@@ -105,7 +103,7 @@ TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) {
const char* new_argv[] = {"foo.exe", "--non_gmock_flag=blah", nullptr}; const char* new_argv[] = {"foo.exe", "--non_gmock_flag=blah", nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) { TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
...@@ -122,7 +120,7 @@ TEST(WideInitGoogleMockTest, ParsesInvalidCommandLine) { ...@@ -122,7 +120,7 @@ TEST(WideInitGoogleMockTest, ParsesInvalidCommandLine) {
const wchar_t* new_argv[] = {nullptr}; const wchar_t* new_argv[] = {nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) { TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) {
...@@ -130,7 +128,7 @@ TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) { ...@@ -130,7 +128,7 @@ TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) {
const wchar_t* new_argv[] = {L"foo.exe", nullptr}; const wchar_t* new_argv[] = {L"foo.exe", nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(WideInitGoogleMockTest, ParsesSingleFlag) { TEST(WideInitGoogleMockTest, ParsesSingleFlag) {
...@@ -142,16 +140,16 @@ TEST(WideInitGoogleMockTest, ParsesSingleFlag) { ...@@ -142,16 +140,16 @@ TEST(WideInitGoogleMockTest, ParsesSingleFlag) {
} }
TEST(WideInitGoogleMockTest, ParsesMultipleFlags) { TEST(WideInitGoogleMockTest, ParsesMultipleFlags) {
int old_default_behavior = GMOCK_FLAG(default_mock_behavior); int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info", const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
L"--gmock_default_mock_behavior=2", nullptr}; L"--gmock_default_mock_behavior=2", nullptr};
const wchar_t* new_argv[] = {L"foo.exe", nullptr}; const wchar_t* new_argv[] = {L"foo.exe", nullptr};
TestInitGoogleMock(argv, new_argv, "info"); TestInitGoogleMock(argv, new_argv, "info");
EXPECT_EQ(2, GMOCK_FLAG(default_mock_behavior)); EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
EXPECT_NE(2, old_default_behavior); EXPECT_NE(2, old_default_behavior);
GMOCK_FLAG(default_mock_behavior) = old_default_behavior; GMOCK_FLAG_SET(default_mock_behavior, old_default_behavior);
} }
TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) { TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) {
...@@ -159,7 +157,7 @@ TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) { ...@@ -159,7 +157,7 @@ TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) {
const wchar_t* new_argv[] = {L"foo.exe", L"--non_gmock_flag=blah", nullptr}; const wchar_t* new_argv[] = {L"foo.exe", L"--non_gmock_flag=blah", nullptr};
TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose)); TestInitGoogleMock(argv, new_argv, GMOCK_FLAG_GET(verbose));
} }
TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) { TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
...@@ -175,7 +173,7 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) { ...@@ -175,7 +173,7 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
// 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(verbose) == ""; GMOCK_FLAG_GET(catch_leaked_mocks) && GMOCK_FLAG_GET(verbose) == "";
(void)dummy; // Avoids the "unused local variable" warning. (void)dummy; // Avoids the "unused local variable" warning.
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment