Skip to content

Commit 32d6e13

Browse files
committed
fixing code coverage
1 parent 1c33b6c commit 32d6e13

3 files changed

Lines changed: 57 additions & 8 deletions

File tree

google/cloud/storage/async/client_test.cc

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,14 +1425,19 @@ TEST(AsyncClient, LoggingEnabled) {
14251425
auto rt = client.ReadObject(BucketName("test-bucket"), "test-object").get();
14261426
ASSERT_STATUS_OK(rt);
14271427
AsyncReader r;
1428-
EXPECT_THAT(r.GetRequestMetadata().headers, IsEmpty());
14291428
AsyncToken t;
1430-
EXPECT_FALSE(t.valid());
14311429
std::tie(r, t) = *std::move(rt);
14321430
ASSERT_TRUE(t.valid());
14331431

1434-
auto read_result = r.Read(std::move(t)).get();
1435-
ASSERT_STATUS_OK(read_result);
1432+
auto pt = r.Read(std::move(t)).get();
1433+
AsyncReaderConnection::ReadResponse p;
1434+
AsyncToken t2;
1435+
ASSERT_STATUS_OK(pt);
1436+
std::tie(p, t2) = *std::move(pt);
1437+
EXPECT_FALSE(t2.valid());
1438+
EXPECT_THAT(
1439+
p, VariantWith<ReadPayload>(ResultOf(
1440+
"empty response", [](auto const& p) { return p.size(); }, 0)));
14361441

14371442
auto const log_lines = log.ExtractLines();
14381443
EXPECT_THAT(log_lines, Contains(HasSubstr("ReadObject")));
@@ -1456,14 +1461,19 @@ TEST(AsyncClient, LoggingDisabled) {
14561461
auto rt = client.ReadObject(BucketName("test-bucket"), "test-object").get();
14571462
ASSERT_STATUS_OK(rt);
14581463
AsyncReader r;
1459-
EXPECT_THAT(r.GetRequestMetadata().headers, IsEmpty());
14601464
AsyncToken t;
1461-
EXPECT_FALSE(t.valid());
14621465
std::tie(r, t) = *std::move(rt);
14631466
ASSERT_TRUE(t.valid());
14641467

1465-
auto read_result = r.Read(std::move(t)).get();
1466-
ASSERT_STATUS_OK(read_result);
1468+
auto pt = r.Read(std::move(t)).get();
1469+
AsyncReaderConnection::ReadResponse p;
1470+
AsyncToken t2;
1471+
ASSERT_STATUS_OK(pt);
1472+
std::tie(p, t2) = *std::move(pt);
1473+
EXPECT_FALSE(t2.valid());
1474+
EXPECT_THAT(
1475+
p, VariantWith<ReadPayload>(ResultOf(
1476+
"empty response", [](auto const& p) { return p.size(); }, 0)));
14671477

14681478
EXPECT_THAT(log.ExtractLines(), IsEmpty());
14691479
}

google/cloud/storage/internal/async/connection_logging_test.cc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,26 @@ TEST(ConnectionLogging, ReadObjectRangeNotReady) {
171171
EXPECT_THAT(log_lines, Contains(HasSubstr("ReadObjectRange succeeded")));
172172
}
173173

174+
TEST(ConnectionLogging, ReadObjectRangeNotReadyWithError) {
175+
ScopedLog log;
176+
promise<StatusOr<storage_experimental::ReadPayload>> p;
177+
178+
auto mock = std::make_shared<MockAsyncConnection>();
179+
EXPECT_CALL(*mock, ReadObjectRange).WillOnce(Return(p.get_future()));
180+
EXPECT_CALL(*mock, options).WillRepeatedly(Return(LoggingEnabled()));
181+
182+
auto conn = MakeLoggingAsyncConnection(mock);
183+
auto fut = conn->ReadObjectRange({});
184+
EXPECT_FALSE(fut.is_ready());
185+
p.set_value(PermanentError());
186+
(void)fut.get();
187+
188+
auto const log_lines = log.ExtractLines();
189+
EXPECT_THAT(log_lines,
190+
Contains(HasSubstr("ReadObjectRange(bucket=, object=)")));
191+
EXPECT_THAT(log_lines, Contains(HasSubstr("ReadObjectRange failed")));
192+
}
193+
174194
TEST(ConnectionLogging, StartAppendableObjectUpload) {
175195
ScopedLog log;
176196
auto mock = std::make_shared<MockAsyncConnection>();

google/cloud/storage/internal/async/reader_connection_logging_test.cc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ using ::google::cloud::testing_util::ScopedLog;
3636
using ::google::cloud::testing_util::StatusIs;
3737
using ::testing::Contains;
3838
using ::testing::HasSubstr;
39+
using ::testing::IsEmpty;
40+
using ::testing::Return;
3941

4042
Options LoggingEnabled() {
4143
return Options{}.set<LoggingComponentsOption>({"rpc"});
@@ -110,6 +112,23 @@ TEST(ReaderConnectionLogging, Cancel) {
110112
Contains(HasSubstr("ReaderConnectionLogging::Cancel()")));
111113
}
112114

115+
TEST(ReaderConnectionLogging, GetRequestMetadata) {
116+
ScopedLog log;
117+
118+
auto mock = std::make_unique<MockAsyncReaderConnection>();
119+
RpcMetadata expected{{{"test-header", "test-value"}}, {}};
120+
EXPECT_CALL(*mock, GetRequestMetadata).WillOnce(Return(expected));
121+
122+
auto actual = MakeLoggingReaderConnection(LoggingEnabled(), std::move(mock));
123+
auto metadata = actual->GetRequestMetadata();
124+
125+
EXPECT_EQ(metadata.headers, expected.headers);
126+
EXPECT_EQ(metadata.trailers, expected.trailers);
127+
128+
auto const log_lines = log.ExtractLines();
129+
EXPECT_THAT(log_lines, IsEmpty());
130+
}
131+
113132
} // namespace
114133
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
115134
} // namespace storage_internal

0 commit comments

Comments
 (0)