diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-03 12:12:17 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-03 12:12:17 -0800 |
| commit | 58dfce93847ece9ae05e70091f982b8882fd3c16 (patch) | |
| tree | 220da0e7ca3a605c2930f00f0cea93c6e8fdb609 /src/google/protobuf/map_test.cc | |
| parent | 81a630c66e23ef513a7cb585ea203bff11cc4167 (diff) | |
| download | protobuf-58dfce93847ece9ae05e70091f982b8882fd3c16.tar.gz protobuf-58dfce93847ece9ae05e70091f982b8882fd3c16.tar.bz2 protobuf-58dfce93847ece9ae05e70091f982b8882fd3c16.zip | |
Update version number in descriptor.pb.h and plugin.pb.h. Protect death
tests with macro PROTOBUF_HAS_DEATH_TEST.
Diffstat (limited to 'src/google/protobuf/map_test.cc')
| -rw-r--r-- | src/google/protobuf/map_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index c680ccb2..9db67523 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -190,6 +190,7 @@ TEST_F(MapImplTest, MutableAt) { ExpectSingleElement(key, value2); } +#ifdef PROTOBUF_HAS_DEATH_TEST TEST_F(MapImplTest, MutableAtNonExistDeathTest) { EXPECT_DEATH(map_.at(0), ""); } @@ -197,6 +198,7 @@ TEST_F(MapImplTest, MutableAtNonExistDeathTest) { TEST_F(MapImplTest, ImmutableAtNonExistDeathTest) { EXPECT_DEATH(const_map_.at(0), ""); } +#endif // PROTOBUF_HAS_DEATH_TEST TEST_F(MapImplTest, CountNonExist) { EXPECT_EQ(0, map_.count(0)); |