Merge pull request #17907 from ncteisen/build-madness

Fix Internal Build
pull/17479/head
Noah Eisen 6 years ago committed by GitHub
commit ed0a565583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 29
      test/cpp/util/channel_trace_proto_helper.cc

@ -16,19 +16,19 @@
* *
*/ */
#include "test/cpp/util/channel_trace_proto_helper.h" #include <grpc/support/port_platform.h>
#include <google/protobuf/text_format.h> #include "test/cpp/util/channel_trace_proto_helper.h"
#include <google/protobuf/util/json_util.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpcpp/impl/codegen/config.h>
#include <grpcpp/impl/codegen/config_protobuf.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "src/proto/grpc/channelz/channelz.pb.h" #include "src/proto/grpc/channelz/channelz.pb.h"
namespace grpc { namespace grpc {
namespace testing {
namespace { namespace {
@ -37,25 +37,24 @@ namespace {
// according to https://developers.google.com/protocol-buffers/docs/proto3#json // according to https://developers.google.com/protocol-buffers/docs/proto3#json
template <typename Message> template <typename Message>
void VaidateProtoJsonTranslation(char* json_c_str) { void VaidateProtoJsonTranslation(char* json_c_str) {
std::string json_str(json_c_str); grpc::string json_str(json_c_str);
Message msg; Message msg;
google::protobuf::util::JsonParseOptions parse_options; grpc::protobuf::json::JsonParseOptions parse_options;
// If the following line is failing, then uncomment the last line of the // If the following line is failing, then uncomment the last line of the
// comment, and uncomment the lines that print the two strings. You can // comment, and uncomment the lines that print the two strings. You can
// then compare the output, and determine what fields are missing. // then compare the output, and determine what fields are missing.
// //
// parse_options.ignore_unknown_fields = true; // parse_options.ignore_unknown_fields = true;
EXPECT_EQ(google::protobuf::util::JsonStringToMessage(json_str, &msg, grpc::protobuf::util::Status s =
parse_options), grpc::protobuf::json::JsonStringToMessage(json_str, &msg, parse_options);
google::protobuf::util::Status::OK); EXPECT_TRUE(s.ok());
std::string proto_json_str; grpc::string proto_json_str;
google::protobuf::util::JsonPrintOptions print_options; grpc::protobuf::json::JsonPrintOptions print_options;
// We usually do not want this to be true, however it can be helpful to // We usually do not want this to be true, however it can be helpful to
// uncomment and see the output produced then all fields are printed. // uncomment and see the output produced then all fields are printed.
// print_options.always_print_primitive_fields = true; // print_options.always_print_primitive_fields = true;
EXPECT_EQ(google::protobuf::util::MessageToJsonString(msg, &proto_json_str, s = grpc::protobuf::json::MessageToJsonString(msg, &proto_json_str);
print_options), EXPECT_TRUE(s.ok());
google::protobuf::util::Status::OK);
// uncomment these to compare the the json strings. // uncomment these to compare the the json strings.
// gpr_log(GPR_ERROR, "tracer json: %s", json_str.c_str()); // gpr_log(GPR_ERROR, "tracer json: %s", json_str.c_str());
// gpr_log(GPR_ERROR, "proto json: %s", proto_json_str.c_str()); // gpr_log(GPR_ERROR, "proto json: %s", proto_json_str.c_str());
@ -64,6 +63,8 @@ void VaidateProtoJsonTranslation(char* json_c_str) {
} // namespace } // namespace
namespace testing {
void ValidateChannelTraceProtoJsonTranslation(char* json_c_str) { void ValidateChannelTraceProtoJsonTranslation(char* json_c_str) {
VaidateProtoJsonTranslation<grpc::channelz::v1::ChannelTrace>(json_c_str); VaidateProtoJsonTranslation<grpc::channelz::v1::ChannelTrace>(json_c_str);
} }

Loading…
Cancel
Save