aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/test
diff options
context:
space:
mode:
authorGennadiy Rozental <rogeeff@google.com>2020-05-01 17:12:01 -0400
committerGennadiy Rozental <rogeeff@google.com>2020-05-01 17:12:01 -0400
commitb99b421d8d68f471122eba6e733e5970e5c538ad (patch)
tree5035a111147b5cf271b78a3bc6fa5f1574cab1b4 /googletest/test
parent1293297874290e1d7cfd73279d4a6d49617ca400 (diff)
parent9d580ea80592189e6d44fa35bcf9cdea8bf620d6 (diff)
downloadgoogletest-b99b421d8d68f471122eba6e733e5970e5c538ad.tar.gz
googletest-b99b421d8d68f471122eba6e733e5970e5c538ad.tar.bz2
googletest-b99b421d8d68f471122eba6e733e5970e5c538ad.zip
Merge pull request #2818 from inazarenko:master
PiperOrigin-RevId: 308650221
Diffstat (limited to 'googletest/test')
-rw-r--r--googletest/test/gtest_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index 005a2d40..631180e3 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7115,6 +7115,10 @@ TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) {
EXPECT_TRUE(IsAProtocolMessage<::proto2::MessageLite>::value);
}
+TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAnOpenSourceProtocolMessage) {
+ EXPECT_TRUE(IsAProtocolMessage<::google::protobuf::MessageLite>::value);
+}
+
// Tests that IsAProtocolMessage<T>::value is false when T is neither
// ::proto2::Message nor a sub-class of it.
TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) {