diff options
author | Ubuntu <s.wegele@gmx.de> | 2017-12-20 09:14:44 +0000 |
---|---|---|
committer | Ubuntu <s.wegele@gmx.de> | 2017-12-20 09:14:44 +0000 |
commit | e68caa3e6aa518f443a33795f9c1d1a276ef77d3 (patch) | |
tree | bc416ab70b6485da59dfeae6df8ca47755f0d3e4 /src | |
parent | ffa18ad28fe73dc81088988fa7ea86c23784237a (diff) | |
download | protobuf-e68caa3e6aa518f443a33795f9c1d1a276ef77d3.tar.gz protobuf-e68caa3e6aa518f443a33795f9c1d1a276ef77d3.tar.bz2 protobuf-e68caa3e6aa518f443a33795f9c1d1a276ef77d3.zip |
formatting issues
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/util/json_util.cc | 3 | ||||
-rw-r--r-- | src/google/protobuf/util/json_util_test.cc | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc index e917ecc4..25e78a65 100644 --- a/src/google/protobuf/util/json_util.cc +++ b/src/google/protobuf/util/json_util.cc @@ -50,8 +50,9 @@ namespace util { namespace internal { ZeroCopyStreamByteSink::~ZeroCopyStreamByteSink() { - if (buffer_size_ > 0) + if (buffer_size_ > 0) { stream_->BackUp(buffer_size_); + } } void ZeroCopyStreamByteSink::Append(const char* bytes, size_t len) { diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc index 1395356b..98d2f4ab 100644 --- a/src/google/protobuf/util/json_util_test.cc +++ b/src/google/protobuf/util/json_util_test.cc @@ -458,18 +458,20 @@ TEST(ZeroCopyStreamByteSinkTest, TestAllInputOutputPatterns) { } } -TEST_F(JsonUtilTest, TestWronJsonInput) { +TEST_F(JsonUtilTest, TestWrongJsonInput) { const char json[] = "{\"unknown_field\":\"some_value\"}"; google::protobuf::io::ArrayInputStream input_stream(json, strlen(json)); - char protoBuffer[10000]; - google::protobuf::io::ArrayOutputStream output_stream(protoBuffer, sizeof(protoBuffer)); - const char *messageType = "type.googleapis.com/proto3.TestMessage"; + char proto_buffer[10000]; + google::protobuf::io::ArrayOutputStream output_stream(proto_buffer, sizeof(proto_buffer)); + std::string message_type = "type.googleapis.com/proto3.TestMessage"; TypeResolver* resolver = NewTypeResolverForDescriptorPool("type.googleapis.com", DescriptorPool::generated_pool()); - util::Status resultStatus = util::JsonToBinaryStream(resolver, messageType, &input_stream, &output_stream); + util::Status result_status = util::JsonToBinaryStream(resolver, message_type, &input_stream, &output_stream); + + delete resolver; - EXPECT_FALSE(resultStatus.ok()); - EXPECT_EQ(resultStatus.error_code(), google::protobuf::util::error::INVALID_ARGUMENT); + EXPECT_FALSE(result_status.ok()); + EXPECT_EQ(result_status.error_code(), google::protobuf::util::error::INVALID_ARGUMENT); } } // namespace |