diff options
| author | Abseil Team <absl-team@google.com> | 2020-04-01 19:33:24 -0400 |
|---|---|---|
| committer | Andy Getz <durandal@google.com> | 2020-04-04 18:05:22 -0400 |
| commit | c344cb5a8d2bea2a46dcf2805cdb859bb70fa6cb (patch) | |
| tree | 888715146ffb2e5add7a3f6f9981fb44c2a7a819 /googletest/test | |
| parent | 61f010d703b32de9bfb20ab90ece38ab2f25977f (diff) | |
| download | googletest-c344cb5a8d2bea2a46dcf2805cdb859bb70fa6cb.tar.gz googletest-c344cb5a8d2bea2a46dcf2805cdb859bb70fa6cb.tar.bz2 googletest-c344cb5a8d2bea2a46dcf2805cdb859bb70fa6cb.zip | |
Googletest export
This change updates testing::internal::IsAProtocolMessage to return true not
just for full proto messages but also for lite ones (i.e. those inheriting
directly from MessageLite).
PiperOrigin-RevId: 304286535
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index f3b72169..005a2d40 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -7104,7 +7104,7 @@ class ConversionHelperDerived : public ConversionHelperBase {}; // Tests that IsAProtocolMessage<T>::value is a compile-time constant. TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { - GTEST_COMPILE_ASSERT_(IsAProtocolMessage<::proto2::Message>::value, + GTEST_COMPILE_ASSERT_(IsAProtocolMessage<::proto2::MessageLite>::value, const_true); GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false); } @@ -7112,7 +7112,7 @@ TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { // Tests that IsAProtocolMessage<T>::value is true when T is // proto2::Message or a sub-class of it. TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) { - EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value); + EXPECT_TRUE(IsAProtocolMessage<::proto2::MessageLite>::value); } // Tests that IsAProtocolMessage<T>::value is false when T is neither |