From 6ae3bde73dd9090712e22986afe866229e61d305 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 25 Nov 2014 14:01:44 -0800 Subject: Fix issue 99. --- src/google/protobuf/map_test.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/google/protobuf/map_test.cc') diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index f9544efb..c680ccb2 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -544,6 +544,13 @@ TEST_F(MapImplTest, EqualRange) { EXPECT_TRUE(const_map_.end() == const_range.second); } +TEST_F(MapImplTest, ConvertToStdMap) { + map_[100] = 101; + std::map std_map(map_.begin(), map_.end()); + EXPECT_EQ(1, std_map.size()); + EXPECT_EQ(101, std_map[100]); +} + // Map Field Reflection Test ======================================== static int Func(int i, int j) { @@ -1740,6 +1747,20 @@ TEST(GeneratedMapFieldTest, MessageLiteMap) { EXPECT_EQ(1, to.map_field().at(1)); } +TEST(GeneratedMapFieldTest, IsInitialized) { + unittest::TestRequiredMessageMap map_message; + + // Add an uninitialized message. + (*map_message.mutable_map_field())[0]; + EXPECT_FALSE(map_message.IsInitialized()); + + // Initialize uninitialized message + (*map_message.mutable_map_field())[0].set_a(0); + (*map_message.mutable_map_field())[0].set_b(0); + (*map_message.mutable_map_field())[0].set_c(0); + EXPECT_TRUE(map_message.IsInitialized()); +} + // Generated Message Reflection Test ================================ TEST(GeneratedMapFieldReflectionTest, SpaceUsed) { -- cgit v1.2.3