Remove usage of google::protobuf::util::error. (#59)

benjaminp · web-flow · commit f1591a413181 · 2021-05-07T17:27:55.000-07:00
This is needed to be compatible with protobuf 3.16.0.
diff --git a/repositories.bzl b/repositories.bzl
@@ -92,8 +92,8 @@ cc_library(
         build_file_content = BUILD,
     )
 
-PROTOBUF_COMMIT = "3.15.5"  # Mar 04, 2021
-PROTOBUF_SHA256 = "bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b"
+PROTOBUF_COMMIT = "3.16.0"  # Mar 04, 2021
+PROTOBUF_SHA256 = "7892a35d979304a404400a101c46ce90e85ec9e2a766a86041bb361f626247f5"
 
 RULES_PROTO_SHA = "97d8af4dc474595af3900dd85cb3a29ad28cc313"  # Oct 31, 2019
 RULES_PROTO_SHA256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208"
diff --git a/src/include/grpc_transcoding/request_message_translator.h b/src/include/grpc_transcoding/request_message_translator.h
@@ -135,7 +135,7 @@ class RequestMessageTranslator : public MessageStream {
   class StatusErrorListener
       : public ::google::protobuf::util::converter::ErrorListener {
    public:
-    StatusErrorListener() : status_(::google::protobuf::util::Status::OK) {}
+    StatusErrorListener() {}
     virtual ~StatusErrorListener() {}
 
     ::google::protobuf::util::Status status() const { return status_; }
diff --git a/src/message_reader.cc b/src/message_reader.cc
@@ -92,7 +92,7 @@ std::unique_ptr<pbio::ZeroCopyInputStream> MessageReader::NextMessage() {
       finished_ = in_->Finished();
       if (finished_ && in_->BytesAvailable() != 0) {
         status_ = google::protobuf::util::Status(
-            google::protobuf::util::error::INTERNAL,
+            google::protobuf::util::StatusCode::kInternal,
             "Incomplete gRPC frame header received");
       }
       return nullptr;
@@ -107,7 +107,7 @@ std::unique_ptr<pbio::ZeroCopyInputStream> MessageReader::NextMessage() {
 
     if (delimiter_[0] != 0) {
       status_ = google::protobuf::util::Status(
-          google::protobuf::util::error::INTERNAL,
+          google::protobuf::util::StatusCode::kInternal,
           "Unsupported gRPC frame flag: " + std::to_string(delimiter_[0]));
       return nullptr;
     }
@@ -119,7 +119,7 @@ std::unique_ptr<pbio::ZeroCopyInputStream> MessageReader::NextMessage() {
   if (in_->BytesAvailable() < static_cast<pb::int64>(current_message_size_)) {
     if (in_->Finished()) {
       status_ = google::protobuf::util::Status(
-          google::protobuf::util::error::INTERNAL,
+          google::protobuf::util::StatusCode::kInternal,
           "Incomplete gRPC frame expected size: " +
               std::to_string(current_message_size_) + " actual size: " +
               std::to_string(in_->BytesAvailable()));
diff --git a/src/request_message_translator.cc b/src/request_message_translator.cc
@@ -133,15 +133,15 @@ void RequestMessageTranslator::StatusErrorListener::InvalidName(
     const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
     internal::string_view unknown_name, internal::string_view message) {
   status_ = ::google::protobuf::util::Status(
-      ::google::protobuf::util::error::INVALID_ARGUMENT,
+      ::google::protobuf::util::StatusCode::kInvalidArgument,
       loc.ToString() + ": " + std::string(message));
 }
 
 void RequestMessageTranslator::StatusErrorListener::InvalidValue(
     const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
     internal::string_view type_name, internal::string_view value) {
   status_ = ::google::protobuf::util::Status(
-      ::google::protobuf::util::error::INVALID_ARGUMENT,
+      ::google::protobuf::util::StatusCode::kInvalidArgument,
       loc.ToString() + ": invalid value " + std::string(value) + " for type " +
           std::string(type_name));
 }
@@ -150,7 +150,7 @@ void RequestMessageTranslator::StatusErrorListener::MissingField(
     const ::google::protobuf::util::converter::LocationTrackerInterface& loc,
     internal::string_view missing_name) {
   status_ = ::google::protobuf::util::Status(
-      ::google::protobuf::util::error::INVALID_ARGUMENT,
+      ::google::protobuf::util::StatusCode::kInvalidArgument,
       loc.ToString() + ": missing field " + std::string(missing_name));
 }
 
diff --git a/src/request_stream_translator.cc b/src/request_stream_translator.cc
@@ -28,7 +28,6 @@ namespace transcoding {
 
 namespace pb = google::protobuf;
 namespace pbutil = google::protobuf::util;
-namespace pberr = google::protobuf::util::error;
 namespace pbconv = google::protobuf::util::converter;
 
 RequestStreamTranslator::RequestStreamTranslator(
@@ -67,7 +66,7 @@ RequestStreamTranslator* RequestStreamTranslator::StartObject(
   }
   if (depth_ == 0) {
     // In depth_ == 0 case we expect only StartList()
-    status_ = pbutil::Status(pberr::INVALID_ARGUMENT,
+    status_ = pbutil::Status(pbutil::StatusCode::kInvalidArgument,
                              "Expected an array instead of an object");
     return this;
   }
@@ -89,7 +88,7 @@ RequestStreamTranslator* RequestStreamTranslator::EndObject() {
   --depth_;
   if (depth_ < 1) {
     status_ =
-        pbutil::Status(pberr::INVALID_ARGUMENT, "Mismatched end of object.");
+        pbutil::Status(pbutil::StatusCode::kInvalidArgument, "Mismatched end of object.");
     return this;
   }
   translator_->Input().EndObject();
@@ -131,7 +130,7 @@ RequestStreamTranslator* RequestStreamTranslator::EndList() {
   --depth_;
   if (depth_ < 0) {
     status_ =
-        pbutil::Status(pberr::INVALID_ARGUMENT, "Mismatched end of array.");
+        pbutil::Status(pbutil::StatusCode::kInvalidArgument, "Mismatched end of array.");
     return this;
   }
   if (depth_ == 0) {
@@ -252,7 +251,7 @@ void RequestStreamTranslator::EndMessageTranslator() {
   } else {
     // This shouldn't happen unless something like StartList(), StartObject(),
     // EndList() has been called
-    status_ = pbutil::Status(pberr::INVALID_ARGUMENT, "Invalid object");
+    status_ = pbutil::Status(pbutil::StatusCode::kInvalidArgument, "Invalid object");
   }
   translator_.reset();
 }
@@ -265,7 +264,7 @@ void RequestStreamTranslator::RenderData(internal::string_view name,
   }
   if (depth_ == 0) {
     // In depth_ == 0 case we expect only a StartList()
-    status_ = pbutil::Status(pberr::INVALID_ARGUMENT,
+    status_ = pbutil::Status(pbutil::StatusCode::kInvalidArgument,
                              "Expected an array instead of a scalar value.");
   } else if (depth_ == 1) {
     // This means we have an array of scalar values. This can happen if the HTTP
diff --git a/src/response_to_json_translator.cc b/src/response_to_json_translator.cc
@@ -107,7 +107,7 @@ bool ResponseToJsonTranslator::TranslateMessage(
       // output JSON with a '['.
       if (!WriteChar(&json_stream, '[')) {
         status_ = ::google::protobuf::util::Status(
-            ::google::protobuf::util::error::INTERNAL,
+            ::google::protobuf::util::StatusCode::kInternal,
             "Failed to build the response message.");
         return false;
       }
@@ -116,7 +116,7 @@ bool ResponseToJsonTranslator::TranslateMessage(
       // For streaming calls add a ',' before each message except the first.
       if (!WriteChar(&json_stream, ',')) {
         status_ = ::google::protobuf::util::Status(
-            ::google::protobuf::util::error::INTERNAL,
+            ::google::protobuf::util::StatusCode::kInternal,
             "Failed to build the response message.");
         return false;
       }
diff --git a/src/type_helper.cc b/src/type_helper.cc
@@ -27,7 +27,6 @@
 
 namespace pbutil = ::google::protobuf::util;
 namespace pbconv = ::google::protobuf::util::converter;
-namespace pberr = ::google::protobuf::util::error;
 
 namespace google {
 namespace grpc {
@@ -63,7 +62,7 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
       }
       return pbutil::Status();
     } else {
-      return pbutil::Status(pberr::NOT_FOUND,
+      return pbutil::Status(pbutil::StatusCode::kNotFound,
                             "Type '" + type_url + "' cannot be found.");
     }
   }
@@ -78,7 +77,7 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
       }
       return pbutil::Status();
     } else {
-      return pbutil::Status(pberr::NOT_FOUND,
+      return pbutil::Status(pbutil::StatusCode::kNotFound,
                             "Enum '" + type_url + "' cannot be found.");
     }
   }
@@ -159,7 +158,7 @@ pbutil::Status TypeHelper::ResolveFieldPath(
     // Find the field by name in the current type
     auto field = Info()->FindField(current_type, field_names[i]);
     if (nullptr == field) {
-      return pbutil::Status(pberr::INVALID_ARGUMENT,
+      return pbutil::Status(pbutil::StatusCode::kInvalidArgument,
                             "Could not find field \"" + field_names[i] +
                                 "\" in the type \"" + current_type->name() +
                                 "\".");
@@ -170,22 +169,22 @@ pbutil::Status TypeHelper::ResolveFieldPath(
       // If this is not the last field in the path, it must be a message
       if (google::protobuf::Field::TYPE_MESSAGE != field->kind()) {
         return pbutil::Status(
-            pberr::INVALID_ARGUMENT,
+            pbutil::StatusCode::kInvalidArgument,
             "Encountered a non-leaf field \"" + field->name() +
                 "\" that is not a message while parsing a field path");
       }
 
       // Update the type of the current message
       current_type = Info()->GetTypeByTypeUrl(field->type_url());
       if (nullptr == current_type) {
-        return pbutil::Status(pberr::INVALID_ARGUMENT,
+        return pbutil::Status(pbutil::StatusCode::kInvalidArgument,
                               "Cannot find the type \"" + field->type_url() +
                                   "\" while parsing a field path.");
       }
     }
   }
   *field_path_out = std::move(field_path);
-  return pbutil::Status::OK;
+  return pbutil::Status();
 }
 
 }  // namespace transcoding
diff --git a/test/json_request_translator_test.cc b/test/json_request_translator_test.cc
@@ -34,8 +34,6 @@ namespace transcoding {
 namespace testing {
 namespace {
 
-namespace pberr = google::protobuf::util::error;
-
 // TranslationTestCase helps us build translation test cases and validate the
 // translation output.
 //
@@ -486,7 +484,7 @@ TEST_F(JsonRequestTranslatorTest, ErrorInvalidJson) {
       AddChunk(invalid);
       Finish();
       EXPECT_TRUE(Tester().ExpectNone());
-      EXPECT_TRUE(Tester().ExpectStatusEq(pberr::INVALID_ARGUMENT));
+      EXPECT_TRUE(Tester().ExpectStatusEq(google::protobuf::util::StatusCode::kInvalidArgument));
     }
   }
 }
@@ -735,7 +733,7 @@ TEST_F(JsonRequestTranslatorTest, StreamingErrorNotAnArray) {
   AddChunk(R"({"name" : "1"})");
   Finish();
   EXPECT_TRUE(Tester().ExpectNone());
-  EXPECT_TRUE(Tester().ExpectStatusEq(pberr::INVALID_ARGUMENT));
+  EXPECT_TRUE(Tester().ExpectStatusEq(google::protobuf::util::StatusCode::kInvalidArgument));
 }
 
 }  // namespace
diff --git a/test/message_reader_test.cc b/test/message_reader_test.cc
@@ -384,7 +384,7 @@ TEST_F(MessageReaderTest, IncompleteFrameHeader) {
 
   EXPECT_EQ(nullptr, reader.NextMessage().get());
   EXPECT_FALSE(reader.Status().ok());
-  EXPECT_EQ(reader.Status().error_message(),
+  EXPECT_EQ(reader.Status().message(),
             "Incomplete gRPC frame header received");
 }
 
@@ -397,7 +397,7 @@ TEST_F(MessageReaderTest, InvalidFrameFlag) {
 
   EXPECT_EQ(nullptr, reader.NextMessage().get());
   EXPECT_FALSE(reader.Status().ok());
-  EXPECT_EQ(reader.Status().error_message(), "Unsupported gRPC frame flag: 10");
+  EXPECT_EQ(reader.Status().message(), "Unsupported gRPC frame flag: 10");
 }
 
 TEST_F(MessageReaderTest, IncompleteFrame) {
@@ -409,7 +409,7 @@ TEST_F(MessageReaderTest, IncompleteFrame) {
 
   EXPECT_EQ(nullptr, reader.NextMessage().get());
   EXPECT_FALSE(reader.Status().ok());
-  EXPECT_EQ(reader.Status().error_message(),
+  EXPECT_EQ(reader.Status().message(),
             "Incomplete gRPC frame expected size: 5 actual size: 1");
 }
 
diff --git a/test/message_stream_test.cc b/test/message_stream_test.cc
@@ -53,7 +53,7 @@ class TestMessageStream : public MessageStream {
   }
   bool Finished() const { return messages_.empty() && finished_; }
   google::protobuf::util::Status Status() const {
-    return google::protobuf::util::Status::OK;
+    return google::protobuf::util::Status();
   }
 
  private:
diff --git a/test/proto_stream_tester.cc b/test/proto_stream_tester.cc
@@ -32,7 +32,7 @@ ProtoStreamTester::ProtoStreamTester(MessageStream& stream, bool delimiters)
 
 bool ProtoStreamTester::ExpectNone() {
   // First check the status of the stream
-  if (!ExpectStatusEq(google::protobuf::util::error::OK)) {
+  if (!ExpectStatusEq(google::protobuf::util::StatusCode::kOk)) {
     return false;
   }
   std::string message;
@@ -46,7 +46,7 @@ bool ProtoStreamTester::ExpectNone() {
 
 bool ProtoStreamTester::ExpectFinishedEq(bool expected) {
   // First check the status of the stream
-  if (!ExpectStatusEq(google::protobuf::util::error::OK)) {
+  if (!ExpectStatusEq(google::protobuf::util::StatusCode::kOk)) {
     return false;
   }
   if (expected != stream_.Finished()) {
@@ -78,7 +78,7 @@ unsigned DelimiterToSize(const unsigned char* delimiter) {
 
 bool ProtoStreamTester::ValidateDelimiter(const std::string& message) {
   // First check the status of the stream
-  if (!ExpectStatusEq(google::protobuf::util::error::OK)) {
+  if (!ExpectStatusEq(google::protobuf::util::StatusCode::kOk)) {
     return false;
   }
   if (message.size() < kDelimiterSize) {
@@ -98,13 +98,13 @@ bool ProtoStreamTester::ValidateDelimiter(const std::string& message) {
   return true;
 }
 
-bool ProtoStreamTester::ExpectStatusEq(int error_code) {
-  if (error_code != stream_.Status().error_code()) {
+bool ProtoStreamTester::ExpectStatusEq(google::protobuf::util::StatusCode error_code) {
+  if (error_code != stream_.Status().code()) {
     ADD_FAILURE()
         << "ObjectTranslatorTest::ValidateStatus: Status doesn't match "
            "expected: "
-        << error_code << " actual: " << stream_.Status().error_code() << " - "
-        << stream_.Status().error_message() << std::endl;
+        << static_cast<int>(error_code) << " actual: " << static_cast<int>(stream_.Status().code()) << " - "
+        << stream_.Status().message() << std::endl;
     return false;
   }
   return true;
diff --git a/test/proto_stream_tester.h b/test/proto_stream_tester.h
@@ -45,7 +45,7 @@ class ProtoStreamTester {
   bool ExpectNextEq(const std::string& expected_proto_text);
   bool ExpectNone();
   bool ExpectFinishedEq(bool expected);
-  bool ExpectStatusEq(int error_code);
+  bool ExpectStatusEq(google::protobuf::util::StatusCode error_code);
 
  private:
   // Validates the GRPC message delimiter at the beginning
@@ -61,7 +61,7 @@ class ProtoStreamTester {
 template <typename MessageType>
 bool ProtoStreamTester::ExpectNextEq(const std::string& expected_proto_text) {
   // First check the status of the stream
-  if (!ExpectStatusEq(google::protobuf::util::error::OK)) {
+  if (!ExpectStatusEq(google::protobuf::util::StatusCode::kOk)) {
     return false;
   }
   // Try to get a message
@@ -70,7 +70,7 @@ bool ProtoStreamTester::ExpectNextEq(const std::string& expected_proto_text) {
     ADD_FAILURE() << "ProtoStreamTester::ValidateNext: NextMessage() "
                      "returned false\n";
     // Use ExpectStatusEq() to output the status if it's not OK.
-    ExpectStatusEq(google::protobuf::util::error::OK);
+    ExpectStatusEq(google::protobuf::util::StatusCode::kOk);
     return false;
   }
   // Validate the delimiter if it's expected
diff --git a/test/request_message_translator_test.cc b/test/request_message_translator_test.cc
@@ -447,7 +447,7 @@ TEST_F(RequestMessageTranslatorTest, UnexpectedScalarBody) {
   Input().RenderString("", "History");
 
   EXPECT_TRUE(Tester().ExpectStatusEq(
-      ::google::protobuf::util::error::INVALID_ARGUMENT));
+      ::google::protobuf::util::StatusCode::kInvalidArgument));
 }
 
 TEST_F(RequestMessageTranslatorTest, UnexpectedList) {
@@ -457,7 +457,7 @@ TEST_F(RequestMessageTranslatorTest, UnexpectedList) {
   Input().StartList("")->EndList();
 
   EXPECT_TRUE(Tester().ExpectStatusEq(
-      ::google::protobuf::util::error::INVALID_ARGUMENT));
+      ::google::protobuf::util::StatusCode::kInvalidArgument));
 }
 
 TEST_F(RequestMessageTranslatorTest, IgnoreUnkownFields) {
diff --git a/test/request_stream_translator_test.cc b/test/request_stream_translator_test.cc
diff --git a/test/response_to_json_translator_test.cc b/test/response_to_json_translator_test.cc
diff --git a/test/test_common.cc b/test/test_common.cc
diff --git a/test/type_helper_test.cc b/test/type_helper_test.cc

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ cc_library(`
`92`	`92`	`build_file_content = BUILD,`
`93`	`93`	`)`
`94`	`94`
`95`		`-PROTOBUF_COMMIT = "3.15.5" # Mar 04, 2021`
`96`		`-PROTOBUF_SHA256 = "bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b"`
	`95`	`+PROTOBUF_COMMIT = "3.16.0" # Mar 04, 2021`
	`96`	`+PROTOBUF_SHA256 = "7892a35d979304a404400a101c46ce90e85ec9e2a766a86041bb361f626247f5"`
`97`	`97`
`98`	`98`	`RULES_PROTO_SHA = "97d8af4dc474595af3900dd85cb3a29ad28cc313" # Oct 31, 2019`
`99`	`99`	`RULES_PROTO_SHA256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208"`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`namespace pbutil = ::google::protobuf::util;`
`29`	`29`	`namespace pbconv = ::google::protobuf::util::converter;`
`30`		`-namespace pberr = ::google::protobuf::util::error;`
`31`	`30`
`32`	`31`	`namespace google {`
`33`	`32`	`namespace grpc {`
`@@ -63,7 +62,7 @@ class SimpleTypeResolver : public pbutil::TypeResolver {`
`63`	`62`	`}`
`64`	`63`	`return pbutil::Status();`
`65`	`64`	`} else {`
`66`		`- return pbutil::Status(pberr::NOT_FOUND,`
	`65`	`+ return pbutil::Status(pbutil::StatusCode::kNotFound,`
`67`	`66`	`"Type '" + type_url + "' cannot be found.");`
`68`	`67`	`}`
`69`	`68`	`}`
`@@ -78,7 +77,7 @@ class SimpleTypeResolver : public pbutil::TypeResolver {`
`78`	`77`	`}`
`79`	`78`	`return pbutil::Status();`
`80`	`79`	`} else {`
`81`		`- return pbutil::Status(pberr::NOT_FOUND,`
	`80`	`+ return pbutil::Status(pbutil::StatusCode::kNotFound,`
`82`	`81`	`"Enum '" + type_url + "' cannot be found.");`
`83`	`82`	`}`
`84`	`83`	`}`
`@@ -159,7 +158,7 @@ pbutil::Status TypeHelper::ResolveFieldPath(`
`159`	`158`	`// Find the field by name in the current type`
`160`	`159`	`auto field = Info()->FindField(current_type, field_names[i]);`
`161`	`160`	`if (nullptr == field) {`
`162`		`- return pbutil::Status(pberr::INVALID_ARGUMENT,`
	`161`	`+ return pbutil::Status(pbutil::StatusCode::kInvalidArgument,`
`163`	`162`	`"Could not find field \"" + field_names[i] +`
`164`	`163`	`"\" in the type \"" + current_type->name() +`
`165`	`164`	`"\".");`
`@@ -170,22 +169,22 @@ pbutil::Status TypeHelper::ResolveFieldPath(`
`170`	`169`	`// If this is not the last field in the path, it must be a message`
`171`	`170`	`if (google::protobuf::Field::TYPE_MESSAGE != field->kind()) {`
`172`	`171`	`return pbutil::Status(`
`173`		`- pberr::INVALID_ARGUMENT,`
	`172`	`+ pbutil::StatusCode::kInvalidArgument,`
`174`	`173`	`"Encountered a non-leaf field \"" + field->name() +`
`175`	`174`	`"\" that is not a message while parsing a field path");`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`// Update the type of the current message`
`179`	`178`	`current_type = Info()->GetTypeByTypeUrl(field->type_url());`
`180`	`179`	`if (nullptr == current_type) {`
`181`		`- return pbutil::Status(pberr::INVALID_ARGUMENT,`
	`180`	`+ return pbutil::Status(pbutil::StatusCode::kInvalidArgument,`
`182`	`181`	`"Cannot find the type \"" + field->type_url() +`
`183`	`182`	`"\" while parsing a field path.");`
`184`	`183`	`}`
`185`	`184`	`}`
`186`	`185`	`}`
`187`	`186`	`*field_path_out = std::move(field_path);`
`188`		`- return pbutil::Status::OK;`
	`187`	`+ return pbutil::Status();`
`189`	`188`	`}`
`190`	`189`
`191`	`190`	`} // namespace transcoding`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ namespace transcoding {`
`34`	`34`	`namespace testing {`
`35`	`35`	`namespace {`
`36`	`36`
`37`		`-namespace pberr = google::protobuf::util::error;`
`38`		`-`
`39`	`37`	`// TranslationTestCase helps us build translation test cases and validate the`
`40`	`38`	`// translation output.`
`41`	`39`	`//`
`@@ -486,7 +484,7 @@ TEST_F(JsonRequestTranslatorTest, ErrorInvalidJson) {`
`486`	`484`	`AddChunk(invalid);`
`487`	`485`	`Finish();`
`488`	`486`	`EXPECT_TRUE(Tester().ExpectNone());`
`489`		`- EXPECT_TRUE(Tester().ExpectStatusEq(pberr::INVALID_ARGUMENT));`
	`487`	`+ EXPECT_TRUE(Tester().ExpectStatusEq(google::protobuf::util::StatusCode::kInvalidArgument));`
`490`	`488`	`}`
`491`	`489`	`}`
`492`	`490`	`}`
`@@ -735,7 +733,7 @@ TEST_F(JsonRequestTranslatorTest, StreamingErrorNotAnArray) {`
`735`	`733`	`AddChunk(R"({"name" : "1"})");`
`736`	`734`	`Finish();`
`737`	`735`	`EXPECT_TRUE(Tester().ExpectNone());`
`738`		`- EXPECT_TRUE(Tester().ExpectStatusEq(pberr::INVALID_ARGUMENT));`
	`736`	`+ EXPECT_TRUE(Tester().ExpectStatusEq(google::protobuf::util::StatusCode::kInvalidArgument));`
`739`	`737`	`}`
`740`	`738`
`741`	`739`	`} // namespace`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ TEST_F(MessageReaderTest, IncompleteFrameHeader) {`
`384`	`384`
`385`	`385`	`EXPECT_EQ(nullptr, reader.NextMessage().get());`
`386`	`386`	`EXPECT_FALSE(reader.Status().ok());`
`387`		`- EXPECT_EQ(reader.Status().error_message(),`
	`387`	`+ EXPECT_EQ(reader.Status().message(),`
`388`	`388`	`"Incomplete gRPC frame header received");`
`389`	`389`	`}`
`390`	`390`
`@@ -397,7 +397,7 @@ TEST_F(MessageReaderTest, InvalidFrameFlag) {`
`397`	`397`
`398`	`398`	`EXPECT_EQ(nullptr, reader.NextMessage().get());`
`399`	`399`	`EXPECT_FALSE(reader.Status().ok());`
`400`		`- EXPECT_EQ(reader.Status().error_message(), "Unsupported gRPC frame flag: 10");`
	`400`	`+ EXPECT_EQ(reader.Status().message(), "Unsupported gRPC frame flag: 10");`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`TEST_F(MessageReaderTest, IncompleteFrame) {`
`@@ -409,7 +409,7 @@ TEST_F(MessageReaderTest, IncompleteFrame) {`
`409`	`409`
`410`	`410`	`EXPECT_EQ(nullptr, reader.NextMessage().get());`
`411`	`411`	`EXPECT_FALSE(reader.Status().ok());`
`412`		`- EXPECT_EQ(reader.Status().error_message(),`
	`412`	`+ EXPECT_EQ(reader.Status().message(),`
`413`	`413`	`"Incomplete gRPC frame expected size: 5 actual size: 1");`
`414`	`414`	`}`
`415`	`415`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class TestMessageStream : public MessageStream {`
`53`	`53`	`}`
`54`	`54`	`bool Finished() const { return messages_.empty() && finished_; }`
`55`	`55`	`google::protobuf::util::Status Status() const {`
`56`		`- return google::protobuf::util::Status::OK;`
	`56`	`+ return google::protobuf::util::Status();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private:`