diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/util/internal/expecting_objectwriter.h | |
parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/internal/expecting_objectwriter.h')
-rw-r--r-- | src/google/protobuf/util/internal/expecting_objectwriter.h | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/src/google/protobuf/util/internal/expecting_objectwriter.h b/src/google/protobuf/util/internal/expecting_objectwriter.h index ae98ddd8..a7f6fc22 100644 --- a/src/google/protobuf/util/internal/expecting_objectwriter.h +++ b/src/google/protobuf/util/internal/expecting_objectwriter.h @@ -54,6 +54,7 @@ #include <google/protobuf/util/internal/object_writer.h> #include <gmock/gmock.h> + namespace google { namespace protobuf { namespace util { @@ -81,7 +82,8 @@ class MockObjectWriter : public ObjectWriter { MOCK_METHOD2(RenderUint64, ObjectWriter*(StringPiece, uint64)); MOCK_METHOD2(RenderDouble, ObjectWriter*(StringPiece, double)); MOCK_METHOD2(RenderFloat, ObjectWriter*(StringPiece, float)); - MOCK_METHOD2(RenderString, ObjectWriter*(StringPiece, StringPiece)); + MOCK_METHOD2(RenderString, + ObjectWriter*(StringPiece, StringPiece)); MOCK_METHOD2(RenderBytes, ObjectWriter*(StringPiece, StringPiece)); MOCK_METHOD1(RenderNull, ObjectWriter*(StringPiece)); }; @@ -91,9 +93,8 @@ class ExpectingObjectWriter : public ObjectWriter { explicit ExpectingObjectWriter(MockObjectWriter* mock) : mock_(mock) {} virtual ObjectWriter* StartObject(StringPiece name) { - (name.empty() - ? EXPECT_CALL(*mock_, StartObject(IsEmpty())) - : EXPECT_CALL(*mock_, StartObject(StrEq(name.ToString())))) + (name.empty() ? EXPECT_CALL(*mock_, StartObject(IsEmpty())) + : EXPECT_CALL(*mock_, StartObject(StrEq(string(name))))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -107,9 +108,8 @@ class ExpectingObjectWriter : public ObjectWriter { } virtual ObjectWriter* StartList(StringPiece name) { - (name.empty() - ? EXPECT_CALL(*mock_, StartList(IsEmpty())) - : EXPECT_CALL(*mock_, StartList(StrEq(name.ToString())))) + (name.empty() ? EXPECT_CALL(*mock_, StartList(IsEmpty())) + : EXPECT_CALL(*mock_, StartList(StrEq(string(name))))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -125,8 +125,8 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderBool(StringPiece name, bool value) { (name.empty() ? EXPECT_CALL(*mock_, RenderBool(IsEmpty(), TypedEq<bool>(value))) - : EXPECT_CALL(*mock_, RenderBool(StrEq(name.ToString()), - TypedEq<bool>(value)))) + : EXPECT_CALL(*mock_, + RenderBool(StrEq(string(name)), TypedEq<bool>(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -135,8 +135,8 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderInt32(StringPiece name, int32 value) { (name.empty() ? EXPECT_CALL(*mock_, RenderInt32(IsEmpty(), TypedEq<int32>(value))) - : EXPECT_CALL(*mock_, RenderInt32(StrEq(name.ToString()), - TypedEq<int32>(value)))) + : EXPECT_CALL(*mock_, + RenderInt32(StrEq(string(name)), TypedEq<int32>(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -145,7 +145,7 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderUint32(StringPiece name, uint32 value) { (name.empty() ? EXPECT_CALL(*mock_, RenderUint32(IsEmpty(), TypedEq<uint32>(value))) - : EXPECT_CALL(*mock_, RenderUint32(StrEq(name.ToString()), + : EXPECT_CALL(*mock_, RenderUint32(StrEq(string(name)), TypedEq<uint32>(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); @@ -155,8 +155,8 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderInt64(StringPiece name, int64 value) { (name.empty() ? EXPECT_CALL(*mock_, RenderInt64(IsEmpty(), TypedEq<int64>(value))) - : EXPECT_CALL(*mock_, RenderInt64(StrEq(name.ToString()), - TypedEq<int64>(value)))) + : EXPECT_CALL(*mock_, + RenderInt64(StrEq(string(name)), TypedEq<int64>(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -165,7 +165,7 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderUint64(StringPiece name, uint64 value) { (name.empty() ? EXPECT_CALL(*mock_, RenderUint64(IsEmpty(), TypedEq<uint64>(value))) - : EXPECT_CALL(*mock_, RenderUint64(StrEq(name.ToString()), + : EXPECT_CALL(*mock_, RenderUint64(StrEq(string(name)), TypedEq<uint64>(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); @@ -174,9 +174,9 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderDouble(StringPiece name, double value) { (name.empty() - ? EXPECT_CALL(*mock_, RenderDouble(IsEmpty(), - NanSensitiveDoubleEq(value))) - : EXPECT_CALL(*mock_, RenderDouble(StrEq(name.ToString()), + ? EXPECT_CALL(*mock_, + RenderDouble(IsEmpty(), NanSensitiveDoubleEq(value))) + : EXPECT_CALL(*mock_, RenderDouble(StrEq(string(name)), NanSensitiveDoubleEq(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); @@ -185,21 +185,24 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderFloat(StringPiece name, float value) { (name.empty() - ? EXPECT_CALL(*mock_, RenderFloat(IsEmpty(), - NanSensitiveFloatEq(value))) - : EXPECT_CALL(*mock_, RenderFloat(StrEq(name.ToString()), + ? EXPECT_CALL(*mock_, + RenderFloat(IsEmpty(), NanSensitiveFloatEq(value))) + : EXPECT_CALL(*mock_, RenderFloat(StrEq(string(name)), NanSensitiveFloatEq(value)))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; } - virtual ObjectWriter* RenderString(StringPiece name, StringPiece value) { + virtual ObjectWriter* RenderString(StringPiece name, + StringPiece value) { (name.empty() - ? EXPECT_CALL(*mock_, RenderString(IsEmpty(), - TypedEq<StringPiece>(value.ToString()))) - : EXPECT_CALL(*mock_, RenderString(StrEq(name.ToString()), - TypedEq<StringPiece>(value.ToString())))) + ? EXPECT_CALL(*mock_, + RenderString(IsEmpty(), + TypedEq<StringPiece>(string(value)))) + : EXPECT_CALL(*mock_, + RenderString(StrEq(string(name)), + TypedEq<StringPiece>(string(value))))) .WillOnce(Return(mock_)) .RetiresOnSaturation(); return this; @@ -218,7 +221,7 @@ class ExpectingObjectWriter : public ObjectWriter { virtual ObjectWriter* RenderNull(StringPiece name) { (name.empty() ? EXPECT_CALL(*mock_, RenderNull(IsEmpty())) - : EXPECT_CALL(*mock_, RenderNull(StrEq(name.ToString()))) + : EXPECT_CALL(*mock_, RenderNull(StrEq(string(name)))) .WillOnce(Return(mock_)) .RetiresOnSaturation()); return this; @@ -233,6 +236,6 @@ class ExpectingObjectWriter : public ObjectWriter { } // namespace converter } // namespace util } // namespace protobuf - } // namespace google + #endif // GOOGLE_PROTOBUF_UTIL_CONVERTER_EXPECTING_OBJECTWRITER_H__ |