Skip to content

Commit ca0c45f

Browse files
committed
fix format with clang-format 3.8
1 parent 7868a09 commit ca0c45f

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

src/include/grpc_transcoding/response_to_json_translator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ class ResponseToJsonTranslator : public MessageStream {
7272
ResponseToJsonTranslator(
7373
::google::protobuf::util::TypeResolver* type_resolver,
7474
std::string type_url, bool streaming, TranscoderInputStream* in,
75-
const ::google::protobuf::util::JsonPrintOptions&
76-
json_print_options = ::google::protobuf::util::JsonPrintOptions());
75+
const ::google::protobuf::util::JsonPrintOptions& json_print_options =
76+
::google::protobuf::util::JsonPrintOptions());
7777

7878
// MessageStream implementation
7979
bool NextMessage(std::string* message);

test/proto_stream_tester.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "google/protobuf/stubs/status.h"
2121
#include "google/protobuf/text_format.h"
2222
#include "google/protobuf/util/message_differencer.h"
23-
#include "gtest/gtest.h"
2423
#include "grpc_transcoding/message_stream.h"
24+
#include "gtest/gtest.h"
2525

2626
namespace google {
2727
namespace grpc {

test/request_translator_test_base.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "google/protobuf/text_format.h"
2828
#include "google/protobuf/type.pb.h"
2929
#include "google/protobuf/util/internal/type_info.h"
30-
#include "gtest/gtest.h"
3130
#include "grpc_transcoding/message_stream.h"
31+
#include "gtest/gtest.h"
3232
#include "test_common.h"
3333

3434
namespace google {

test/request_translator_test_base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#include "google/api/service.pb.h"
2323
#include "google/protobuf/type.pb.h"
2424
#include "google/protobuf/util/type_resolver.h"
25-
#include "gtest/gtest.h"
26-
#include "proto_stream_tester.h"
2725
#include "grpc_transcoding/message_stream.h"
2826
#include "grpc_transcoding/request_message_translator.h"
2927
#include "grpc_transcoding/type_helper.h"
28+
#include "gtest/gtest.h"
29+
#include "proto_stream_tester.h"
3030

3131
namespace google {
3232
namespace grpc {

test/response_to_json_translator_test.cc

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "bookstore.pb.h"
2525
#include "google/protobuf/io/zero_copy_stream.h"
2626
#include "google/protobuf/text_format.h"
27-
#include "gtest/gtest.h"
2827
#include "grpc_transcoding/type_helper.h"
28+
#include "gtest/gtest.h"
2929
#include "test_common.h"
3030

3131
namespace google {
@@ -56,11 +56,11 @@ class ResponseToJsonTranslatorTestRun {
5656
// type_url - type url of messages being translated,
5757
// input - the input to be passed to the MessageReader,
5858
// expected - the expected translated json chunks as the input is processed,
59-
ResponseToJsonTranslatorTestRun(pbutil::TypeResolver* type_resolver,
60-
bool streaming, const std::string& type_url,
61-
const pbutil::JsonPrintOptions& json_print_options,
62-
const std::string& input,
63-
const std::vector<ExpectedAt>& expected)
59+
ResponseToJsonTranslatorTestRun(
60+
pbutil::TypeResolver* type_resolver, bool streaming,
61+
const std::string& type_url,
62+
const pbutil::JsonPrintOptions& json_print_options,
63+
const std::string& input, const std::vector<ExpectedAt>& expected)
6464
: input_(input),
6565
expected_(expected),
6666
streaming_(streaming),
@@ -187,10 +187,11 @@ class ResponseToJsonTranslatorTestCase {
187187
// type_url - type url of messages being translated,
188188
// input - the input to be passed to the MessageReader,
189189
// expected - the expected translated json chunks as the input is processed,
190-
ResponseToJsonTranslatorTestCase(pbutil::TypeResolver* type_resolver,
191-
bool streaming, const std::string& type_url,
192-
const pbutil::JsonPrintOptions& json_print_options,
193-
std::string input, std::vector<ExpectedAt> expected)
190+
ResponseToJsonTranslatorTestCase(
191+
pbutil::TypeResolver* type_resolver, bool streaming,
192+
const std::string& type_url,
193+
const pbutil::JsonPrintOptions& json_print_options, std::string input,
194+
std::vector<ExpectedAt> expected)
194195
: type_resolver_(type_resolver),
195196
streaming_(streaming),
196197
type_url_(type_url),
@@ -277,7 +278,7 @@ class ResponseToJsonTranslatorTest : public ::testing::Test {
277278
void SetJsonAlwaysPrintPrimitiveFields(bool always_print_primitive_fields) {
278279
pbutil::JsonPrintOptions json_print_options;
279280
json_print_options.always_print_primitive_fields =
280-
always_print_primitive_fields;
281+
always_print_primitive_fields;
281282
SetJsonPrintOptions(json_print_options);
282283
}
283284

@@ -305,8 +306,8 @@ class ResponseToJsonTranslatorTest : public ::testing::Test {
305306

306307
return std::unique_ptr<ResponseToJsonTranslatorTestCase>(
307308
new ResponseToJsonTranslatorTestCase(
308-
type_helper_->Resolver(), streaming_, type_url_, json_print_options_,
309-
std::move(input), std::move(expected)));
309+
type_helper_->Resolver(), streaming_, type_url_,
310+
json_print_options_, std::move(input), std::move(expected)));
310311
}
311312

312313
private:

test/test_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "google/api/service.pb.h"
2424
#include "google/protobuf/io/zero_copy_stream.h"
2525
#include "google/protobuf/text_format.h"
26-
#include "gtest/gtest.h"
2726
#include "grpc_transcoding/transcoder_input_stream.h"
27+
#include "gtest/gtest.h"
2828

2929
namespace google {
3030
namespace grpc {

0 commit comments

Comments
 (0)