Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

code review changes

Browse Source
pull/36582/head
Mark D. Roth 7 months ago
parent 49c0fa8a7a
commit fd287182ad
3 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      test/core/channelz/channel_trace_test.cc
  2. 18
      test/cpp/util/channel_trace_proto_helper.cc
  3. 18
      test/cpp/util/channel_trace_proto_helper.h

2
test/core/channelz/channel_trace_test.cc
Unescape View File

@ -163,7 +163,7 @@ MATCHER_P(IsEmptyChannelTrace, num_events_logged_expected,
void ValidateJsonProtoTranslation(const Json& json) { void ValidateJsonProtoTranslation(const Json& json) {
std::string json_str = JsonDump(json); std::string json_str = JsonDump(json);
grpc::testing::ValidateChannelTraceProtoJsonTranslation(json_str.c_str()); grpc::testing::ValidateChannelTraceProtoJsonTranslation(json_str);
} }
} // anonymous namespace } // anonymous namespace

18
test/cpp/util/channel_trace_proto_helper.cc
Unescape View File

@ -41,7 +41,7 @@ namespace {
// then back to json. This ensures that the json string was correctly formatted // then back to json. This ensures that the json string was correctly formatted
// 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(const std::string& json_str) { void VaidateProtoJsonTranslation(absl::string_view json_str) {
Message msg; Message msg;
grpc::protobuf::json::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
@ -73,42 +73,42 @@ void VaidateProtoJsonTranslation(const std::string& json_str) {
namespace testing { namespace testing {
void ValidateChannelTraceProtoJsonTranslation(const std::string& json_string) { void ValidateChannelTraceProtoJsonTranslation(absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::ChannelTrace>(json_string); VaidateProtoJsonTranslation<grpc::channelz::v1::ChannelTrace>(json_string);
} }
void ValidateChannelProtoJsonTranslation(const std::string& json_string) { void ValidateChannelProtoJsonTranslation(absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::Channel>(json_string); VaidateProtoJsonTranslation<grpc::channelz::v1::Channel>(json_string);
} }
void ValidateGetTopChannelsResponseProtoJsonTranslation( void ValidateGetTopChannelsResponseProtoJsonTranslation(
const std::string& json_string) { absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::GetTopChannelsResponse>( VaidateProtoJsonTranslation<grpc::channelz::v1::GetTopChannelsResponse>(
json_string); json_string);
} }
void ValidateGetChannelResponseProtoJsonTranslation( void ValidateGetChannelResponseProtoJsonTranslation(
const std::string& json_string) { absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::GetChannelResponse>( VaidateProtoJsonTranslation<grpc::channelz::v1::GetChannelResponse>(
json_string); json_string);
} }
void ValidateGetServerResponseProtoJsonTranslation( void ValidateGetServerResponseProtoJsonTranslation(
const std::string& json_string) { absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::GetServerResponse>( VaidateProtoJsonTranslation<grpc::channelz::v1::GetServerResponse>(
json_string); json_string);
} }
void ValidateSubchannelProtoJsonTranslation(const std::string& json_string) { void ValidateSubchannelProtoJsonTranslation(absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::Subchannel>(json_string); VaidateProtoJsonTranslation<grpc::channelz::v1::Subchannel>(json_string);
} }
void ValidateServerProtoJsonTranslation(const std::string& json_string) { void ValidateServerProtoJsonTranslation(absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::Server>(json_string); VaidateProtoJsonTranslation<grpc::channelz::v1::Server>(json_string);
} }
void ValidateGetServersResponseProtoJsonTranslation( void ValidateGetServersResponseProtoJsonTranslation(
const std::string& json_string) { absl::string_view json_string) {
VaidateProtoJsonTranslation<grpc::channelz::v1::GetServersResponse>( VaidateProtoJsonTranslation<grpc::channelz::v1::GetServersResponse>(
json_string); json_string);
} }

18
test/cpp/util/channel_trace_proto_helper.h
Unescape View File

@ -19,23 +19,23 @@
#ifndef GRPC_TEST_CPP_UTIL_CHANNEL_TRACE_PROTO_HELPER_H #ifndef GRPC_TEST_CPP_UTIL_CHANNEL_TRACE_PROTO_HELPER_H
#define GRPC_TEST_CPP_UTIL_CHANNEL_TRACE_PROTO_HELPER_H #define GRPC_TEST_CPP_UTIL_CHANNEL_TRACE_PROTO_HELPER_H
#include <string> #include "absl/strings/string_view.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {
void ValidateChannelTraceProtoJsonTranslation(const std::string& json_string); void ValidateChannelTraceProtoJsonTranslation(absl::string_view json_string);
void ValidateChannelProtoJsonTranslation(const std::string& json_string); void ValidateChannelProtoJsonTranslation(absl::string_view json_string);
void ValidateGetTopChannelsResponseProtoJsonTranslation( void ValidateGetTopChannelsResponseProtoJsonTranslation(
const std::string& json_string); absl::string_view json_string);
void ValidateGetChannelResponseProtoJsonTranslation( void ValidateGetChannelResponseProtoJsonTranslation(
const std::string& json_string); absl::string_view json_string);
void ValidateGetServerResponseProtoJsonTranslation( void ValidateGetServerResponseProtoJsonTranslation(
const std::string& json_string); absl::string_view json_string);
void ValidateSubchannelProtoJsonTranslation(const std::string& json_string); void ValidateSubchannelProtoJsonTranslation(absl::string_view json_string);
void ValidateServerProtoJsonTranslation(const std::string& json_string); void ValidateServerProtoJsonTranslation(absl::string_view json_string);
void ValidateGetServersResponseProtoJsonTranslation( void ValidateGetServersResponseProtoJsonTranslation(
const std::string& json_string); absl::string_view json_string);
} // namespace testing } // namespace testing
} // namespace grpc } // namespace grpc

Write Preview
Loading…
Cancel
Save