Removed too much

coryan · coryan · commit f71c56d896d1 · 2021-07-09T15:18:54.000Z
diff --git a/google/cloud/storage/internal/grpc_client.cc b/google/cloud/storage/internal/grpc_client.cc
@@ -1871,6 +1871,12 @@ std::string GrpcClient::MD5FromProto(std::string const& v) {
   return internal::Base64Encode(binary);
 }
 
+std::string GrpcClient::MD5ToProto(std::string const& v) {
+  if (v.empty()) return {};
+  auto binary = internal::Base64Decode(v);
+  return internal::HexEncode(binary);
+}
+
 std::string GrpcClient::ComputeMD5Hash(const std::string& payload) {
   return internal::HexEncode(internal::MD5Hash(payload));
 }
diff --git a/google/cloud/storage/internal/grpc_client.h b/google/cloud/storage/internal/grpc_client.h
@@ -322,6 +322,7 @@ class GrpcClient : public RawClient,
   static std::string Crc32cFromProto(google::protobuf::UInt32Value const&);
   static std::uint32_t Crc32cToProto(std::string const&);
   static std::string MD5FromProto(std::string const&);
+  static std::string MD5ToProto(std::string const&);
   static std::string ComputeMD5Hash(std::string const& payload);
 
  protected:
diff --git a/google/cloud/storage/internal/grpc_client_test.cc b/google/cloud/storage/internal/grpc_client_test.cc
@@ -221,8 +221,8 @@ TEST(GrpcClientFromProto, MD5Roundtrip) {
       {"96HF9K981B+JfoQuTVnyCg==", "f7a1c5f4af7cd41f897e842e4d59f20a"},
   };
   for (auto const& test : cases) {
-    auto actual = GrpcClient::MD5FromProto(test.proto);
-    EXPECT_EQ(actual, test.rest);
+    EXPECT_EQ(GrpcClient::MD5FromProto(test.proto), test.rest);
+    EXPECT_EQ(GrpcClient::MD5ToProto(test.rest), test.proto);
   }
 }
 
diff --git a/google/cloud/storage/internal/grpc_object_read_source_test.cc b/google/cloud/storage/internal/grpc_object_read_source_test.cc
@@ -190,13 +190,16 @@ TEST(GrpcObjectReadSource, UseSpillBufferMany) {
 
 TEST(GrpcObjectReadSource, PreserveChecksums) {
   auto mock = absl::make_unique<MockStream>();
-  std::string const expected_md5 = "9e107d9d372bb6826bd81d3542a419d6";
-  std::string const expected_crc32c = "ImIEBA==";
+  std::string const expected_payload =
+      "The quick brown fox jumps over the lazy dog";
+  auto const expected_md5 = ComputeMD5Hash(expected_payload);
+  auto const expected_crc32c = ComputeCrc32cChecksum(expected_payload);
   EXPECT_CALL(*mock, Read)
       .WillOnce([&]() {
         storage_proto::GetObjectMediaResponse response;
         response.mutable_checksummed_data()->set_content("The quick brown");
-        response.mutable_object_checksums()->set_md5_hash(expected_md5);
+        response.mutable_object_checksums()->set_md5_hash(
+            GrpcClient::MD5ToProto(expected_md5));
         response.mutable_object_checksums()->mutable_crc32c()->set_value(
             GrpcClient::Crc32cToProto(expected_crc32c));
         return response;
@@ -207,21 +210,21 @@ TEST(GrpcObjectReadSource, PreserveChecksums) {
             " fox jumps over the lazy dog");
         // The headers may be included more than once in the stream,
         // `GrpcObjectReadSource` should return them only once.
-        response.mutable_object_checksums()->set_md5_hash(expected_md5);
+        response.mutable_object_checksums()->set_md5_hash(
+            GrpcClient::MD5ToProto(expected_md5));
         response.mutable_object_checksums()->mutable_crc32c()->set_value(
             GrpcClient::Crc32cToProto(expected_crc32c));
         return response;
       })
       .WillOnce(Return(Status{}));
   GrpcObjectReadSource tested(std::move(mock));
-  std::string const expected = "The quick brown fox jumps over the lazy dog";
   std::vector<char> buffer(1024);
   auto response = tested.Read(buffer.data(), buffer.size());
   ASSERT_STATUS_OK(response);
-  EXPECT_EQ(expected.size(), response->bytes_received);
+  EXPECT_EQ(expected_payload.size(), response->bytes_received);
   EXPECT_EQ(100, response->response.status_code);
-  std::string actual(buffer.data(), expected.size());
-  EXPECT_EQ(expected, actual);
+  auto const actual = std::string(buffer.data(), response->bytes_received);
+  EXPECT_EQ(expected_payload, actual);
   auto const& headers = response->response.headers;
   EXPECT_FALSE(headers.find("x-goog-hash") == headers.end());
   auto const values = [&headers] {
@@ -232,9 +235,8 @@ TEST(GrpcObjectReadSource, PreserveChecksums) {
     }
     return v;
   }();
-  EXPECT_THAT(values, UnorderedElementsAre(
-                          "crc32c=" + expected_crc32c,
-                          "md5=" + GrpcClient::MD5FromProto(expected_md5)));
+  EXPECT_THAT(values, UnorderedElementsAre("crc32c=" + expected_crc32c,
+                                           "md5=" + expected_md5));
 
   auto status = tested.Close();
   EXPECT_STATUS_OK(status);

Original file line number	Diff line number	Diff line change
`@@ -1871,6 +1871,12 @@ std::string GrpcClient::MD5FromProto(std::string const& v) {`
`1871`	`1871`	`return internal::Base64Encode(binary);`
`1872`	`1872`	`}`
`1873`	`1873`
	`1874`	`+std::string GrpcClient::MD5ToProto(std::string const& v) {`
	`1875`	`+ if (v.empty()) return {};`
	`1876`	`+ auto binary = internal::Base64Decode(v);`
	`1877`	`+ return internal::HexEncode(binary);`
	`1878`	`+}`
	`1879`	`+`
`1874`	`1880`	`std::string GrpcClient::ComputeMD5Hash(const std::string& payload) {`
`1875`	`1881`	`return internal::HexEncode(internal::MD5Hash(payload));`
`1876`	`1882`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,8 @@ TEST(GrpcClientFromProto, MD5Roundtrip) {`
`221`	`221`	`{"96HF9K981B+JfoQuTVnyCg==", "f7a1c5f4af7cd41f897e842e4d59f20a"},`
`222`	`222`	`};`
`223`	`223`	`for (auto const& test : cases) {`
`224`		`- auto actual = GrpcClient::MD5FromProto(test.proto);`
`225`		`- EXPECT_EQ(actual, test.rest);`
	`224`	`+ EXPECT_EQ(GrpcClient::MD5FromProto(test.proto), test.rest);`
	`225`	`+ EXPECT_EQ(GrpcClient::MD5ToProto(test.rest), test.proto);`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`