Skip to content

Commit 51185aa

Browse files
shubham-up-47shubham-up-47
committed
fixing file formatting
1 parent ecbafc9 commit 51185aa

7 files changed

Lines changed: 43 additions & 41 deletions

File tree

‎google/cloud/storage/client_object_test.cc‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,17 @@ TEST_F(ObjectTest, UploadFileResumable) {
287287
auto const contents = std::string{"some not so simple contents"};
288288

289289
EXPECT_CALL(*mock_, CreateResumableUpload)
290-
.WillOnce(Return(internal::CreateResumableUploadResponse{"test-upload-id"}));
291-
EXPECT_CALL(*mock_, UploadChunk).WillOnce(Return(make_status_or(
292-
internal::QueryResumableUploadResponse{absl::nullopt, expected})));
290+
.WillOnce(
291+
Return(internal::CreateResumableUploadResponse{"test-upload-id"}));
292+
EXPECT_CALL(*mock_, UploadChunk)
293+
.WillOnce(Return(make_status_or(
294+
internal::QueryResumableUploadResponse{absl::nullopt, expected})));
293295

294296
TempFile temp(contents);
295297
auto client = ClientForMock();
296-
auto actual = client.UploadFile(
297-
temp.name(), "test-bucket-name", "test-object-name",
298-
UseResumableUploadSession(""));
298+
auto actual =
299+
client.UploadFile(temp.name(), "test-bucket-name", "test-object-name",
300+
UseResumableUploadSession(""));
299301
ASSERT_STATUS_OK(actual);
300302
EXPECT_EQ(expected, *actual);
301303
}

‎google/cloud/storage/internal/connection_impl.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -782,8 +782,8 @@ StatusOr<std::unique_ptr<std::string>> StorageConnectionImpl::UploadFileSimple(
782782
GCP_ERROR_INFO());
783783
}
784784

785-
auto payload =
786-
std::make_unique<std::string>(static_cast<std::size_t>(upload_size), char{});
785+
auto payload = std::make_unique<std::string>(
786+
static_cast<std::size_t>(upload_size), char{});
787787
is.seekg(upload_offset, std::ios::beg);
788788
// We need to use `&payload[0]` until C++17
789789
// NOLINTNEXTLINE(readability-container-data-pointer)
@@ -798,7 +798,7 @@ StatusOr<std::unique_ptr<std::string>> StorageConnectionImpl::UploadFileSimple(
798798
}
799799
is.close();
800800

801-
return std::move(payload);
801+
return payload;
802802
}
803803

804804
StatusOr<std::unique_ptr<std::istream>>

‎google/cloud/storage/internal/connection_impl.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ class StorageConnectionImpl
103103
std::string const& file_name, std::size_t file_size,
104104
InsertObjectMediaRequest& request) override;
105105
StatusOr<std::unique_ptr<std::istream>> UploadFileResumable(
106-
std::string const& file_name,
107-
ResumableUploadRequest& request) override;
106+
std::string const& file_name, ResumableUploadRequest& request) override;
108107

109108
StatusOr<ListBucketAclResponse> ListBucketAcl(
110109
ListBucketAclRequest const& request) override;

‎google/cloud/storage/internal/storage_connection.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,14 @@ class StorageConnection {
111111
virtual StatusOr<QueryResumableUploadResponse> UploadChunk(
112112
UploadChunkRequest const& request) = 0;
113113
virtual StatusOr<std::unique_ptr<std::string>> UploadFileSimple(
114-
std::string const& file_name, std::size_t file_size,
115-
InsertObjectMediaRequest& request) {
114+
[[maybe_unused]] std::string const& file_name,
115+
[[maybe_unused]] std::size_t file_size,
116+
[[maybe_unused]] InsertObjectMediaRequest& request) {
116117
return Status(StatusCode::kUnimplemented, "unimplemented");
117118
}
118119
virtual StatusOr<std::unique_ptr<std::istream>> UploadFileResumable(
119-
std::string const& file_name,
120-
ResumableUploadRequest& request) {
120+
[[maybe_unused]] std::string const& file_name,
121+
[[maybe_unused]] ResumableUploadRequest& request) {
121122
return Status(StatusCode::kUnimplemented, "unimplemented");
122123
}
123124
///@}

‎google/cloud/storage/internal/tracing_connection.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ class TracingConnection : public storage::internal::StorageConnection {
9999
StatusOr<storage::internal::QueryResumableUploadResponse> UploadChunk(
100100
storage::internal::UploadChunkRequest const& request) override;
101101
StatusOr<std::unique_ptr<std::string>> UploadFileSimple(
102-
std::string const& file_name,
103-
std::size_t file_size,
102+
std::string const& file_name, std::size_t file_size,
104103
storage::internal::InsertObjectMediaRequest& request) override;
105104
StatusOr<std::unique_ptr<std::istream>> UploadFileResumable(
106105
std::string const& file_name,

‎google/cloud/storage/internal/tracing_connection_test.cc‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -697,26 +697,28 @@ TEST(TracingClientTest, UploadChunk) {
697697
TEST(TracingClientTest, UploadFileSimple) {
698698
auto span_catcher = InstallSpanCatcher();
699699
auto mock = std::make_shared<MockClient>();
700-
EXPECT_CALL(*mock, UploadFileSimple).WillOnce([](std::string const&, std::size_t, storage::internal::InsertObjectMediaRequest&) {
701-
EXPECT_TRUE(ThereIsAnActiveSpan());
702-
return PermanentError();
703-
});
700+
EXPECT_CALL(*mock, UploadFileSimple)
701+
.WillOnce([](std::string const&, std::size_t,
702+
storage::internal::InsertObjectMediaRequest&) {
703+
EXPECT_TRUE(ThereIsAnActiveSpan());
704+
return PermanentError();
705+
});
704706
auto under_test = TracingConnection(mock);
705-
storage::internal::InsertObjectMediaRequest request("test-bucket", "test-object", "");
707+
storage::internal::InsertObjectMediaRequest request("test-bucket",
708+
"test-object", "");
706709
auto actual = under_test.UploadFileSimple("test-file.txt", 1234, request);
707710

708711
auto const code = PermanentError().code();
709712
auto const code_str = StatusCodeToString(code);
710713
auto const msg = PermanentError().message();
711714
EXPECT_THAT(actual, StatusIs(code));
712-
EXPECT_THAT(
713-
span_catcher->GetSpans(),
714-
ElementsAre(AllOf(
715-
SpanNamed("storage::Client::UploadFile/UploadFileSimple"),
716-
SpanHasInstrumentationScope(), SpanKindIsClient(),
717-
SpanWithStatus(opentelemetry::trace::StatusCode::kError, msg),
718-
SpanHasAttributes(
719-
OTelAttribute<std::string>("gl-cpp.status_code", code_str)))));
715+
EXPECT_THAT(span_catcher->GetSpans(),
716+
ElementsAre(AllOf(
717+
SpanNamed("storage::Client::UploadFile/UploadFileSimple"),
718+
SpanHasInstrumentationScope(), SpanKindIsClient(),
719+
SpanWithStatus(opentelemetry::trace::StatusCode::kError, msg),
720+
SpanHasAttributes(OTelAttribute<std::string>(
721+
"gl-cpp.status_code", code_str)))));
720722
}
721723

722724
TEST(TracingClientTest, UploadFileResumable) {
@@ -727,21 +729,21 @@ TEST(TracingClientTest, UploadFileResumable) {
727729
return PermanentError();
728730
});
729731
auto under_test = TracingConnection(mock);
730-
storage::internal::ResumableUploadRequest request("test-bucket", "test-object");
732+
storage::internal::ResumableUploadRequest request("test-bucket",
733+
"test-object");
731734
auto actual = under_test.UploadFileResumable("test-file.txt", request);
732735

733736
auto const code = PermanentError().code();
734737
auto const code_str = StatusCodeToString(code);
735738
auto const msg = PermanentError().message();
736739
EXPECT_THAT(actual, StatusIs(code));
737-
EXPECT_THAT(
738-
span_catcher->GetSpans(),
739-
ElementsAre(AllOf(
740-
SpanNamed("storage::Client::UploadFile/UploadFileResumable"),
741-
SpanHasInstrumentationScope(), SpanKindIsClient(),
742-
SpanWithStatus(opentelemetry::trace::StatusCode::kError, msg),
743-
SpanHasAttributes(
744-
OTelAttribute<std::string>("gl-cpp.status_code", code_str)))));
740+
EXPECT_THAT(span_catcher->GetSpans(),
741+
ElementsAre(AllOf(
742+
SpanNamed("storage::Client::UploadFile/UploadFileResumable"),
743+
SpanHasInstrumentationScope(), SpanKindIsClient(),
744+
SpanWithStatus(opentelemetry::trace::StatusCode::kError, msg),
745+
SpanHasAttributes(OTelAttribute<std::string>(
746+
"gl-cpp.status_code", code_str)))));
745747
}
746748

747749
TEST(TracingClientTest, ListBucketAcl) {

‎google/cloud/storage/testing/mock_client.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ class MockClient : public google::cloud::storage::internal::StorageConnection {
106106
storage::internal::InsertObjectMediaRequest&),
107107
(override));
108108
MOCK_METHOD(StatusOr<std::unique_ptr<std::istream>>, UploadFileResumable,
109-
(std::string const&,
110-
storage::internal::ResumableUploadRequest&),
109+
(std::string const&, storage::internal::ResumableUploadRequest&),
111110
(override));
112111

113112
MOCK_METHOD(StatusOr<internal::ListBucketAclResponse>, ListBucketAcl,

0 commit comments

Comments
 (0)