Index: third_party/protobuf/src/google/protobuf/arenastring_unittest.cc |
diff --git a/third_party/protobuf/src/google/protobuf/arenastring_unittest.cc b/third_party/protobuf/src/google/protobuf/arenastring_unittest.cc |
index e5afe42d08b578a5e87dd52cf9c34b7cbef42b72..ea405d7d3ed0d07666eaf02b095cf415fe6d74b4 100644 |
--- a/third_party/protobuf/src/google/protobuf/arenastring_unittest.cc |
+++ b/third_party/protobuf/src/google/protobuf/arenastring_unittest.cc |
@@ -59,11 +59,11 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnHeap) { |
ArenaStringPtr field; |
::std::string default_value = "default"; |
field.UnsafeSetDefault(&default_value); |
- EXPECT_EQ(string("default"), field.Get()); |
+ EXPECT_EQ(string("default"), field.Get(&default_value)); |
field.Set(&default_value, WrapString("Test short"), NULL); |
- EXPECT_EQ(string("Test short"), field.Get()); |
+ EXPECT_EQ(string("Test short"), field.Get(&default_value)); |
field.Set(&default_value, WrapString("Test long long long long value"), NULL); |
- EXPECT_EQ(string("Test long long long long value"), field.Get()); |
+ EXPECT_EQ(string("Test long long long long value"), field.Get(&default_value)); |
field.Set(&default_value, string(""), NULL); |
field.Destroy(&default_value, NULL); |
@@ -71,11 +71,11 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnHeap) { |
field2.UnsafeSetDefault(&default_value); |
::std::string* mut = field2.Mutable(&default_value, NULL); |
EXPECT_EQ(mut, field2.Mutable(&default_value, NULL)); |
- EXPECT_EQ(mut, &field2.Get()); |
+ EXPECT_EQ(mut, &field2.Get(&default_value)); |
EXPECT_NE(&default_value, mut); |
EXPECT_EQ(string("default"), *mut); |
*mut = "Test long long long long value"; // ensure string allocates storage |
- EXPECT_EQ(string("Test long long long long value"), field2.Get()); |
+ EXPECT_EQ(string("Test long long long long value"), field2.Get(&default_value)); |
field2.Destroy(&default_value, NULL); |
} |
@@ -84,11 +84,12 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnArena) { |
ArenaStringPtr field; |
::std::string default_value = "default"; |
field.UnsafeSetDefault(&default_value); |
- EXPECT_EQ(string("default"), field.Get()); |
+ EXPECT_EQ(string("default"), field.Get(&default_value)); |
field.Set(&default_value, WrapString("Test short"), &arena); |
- EXPECT_EQ(string("Test short"), field.Get()); |
+ EXPECT_EQ(string("Test short"), field.Get(&default_value)); |
field.Set(&default_value, WrapString("Test long long long long value"), &arena); |
- EXPECT_EQ(string("Test long long long long value"), field.Get()); |
+ EXPECT_EQ(string("Test long long long long value"), |
+ field.Get(&default_value)); |
field.Set(&default_value, string(""), &arena); |
field.Destroy(&default_value, &arena); |
@@ -96,11 +97,12 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnArena) { |
field2.UnsafeSetDefault(&default_value); |
::std::string* mut = field2.Mutable(&default_value, &arena); |
EXPECT_EQ(mut, field2.Mutable(&default_value, &arena)); |
- EXPECT_EQ(mut, &field2.Get()); |
+ EXPECT_EQ(mut, &field2.Get(&default_value)); |
EXPECT_NE(&default_value, mut); |
EXPECT_EQ(string("default"), *mut); |
*mut = "Test long long long long value"; // ensure string allocates storage |
- EXPECT_EQ(string("Test long long long long value"), field2.Get()); |
+ EXPECT_EQ(string("Test long long long long value"), |
+ field2.Get(&default_value)); |
field2.Destroy(&default_value, &arena); |
} |