Skip to content

Commit 6b3ca5f

Browse files
committed
Fix checksum_helpers_test compilation error due to removed structs
1 parent f008e43 commit 6b3ca5f

1 file changed

Lines changed: 8 additions & 103 deletions

File tree

google/cloud/storage/internal/checksum_helpers_test.cc

Lines changed: 8 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -24,147 +24,52 @@ namespace internal {
2424
namespace {
2525

2626
TEST(ChecksumHelpersTest, DownloadChecksumSettingsDefaults) {
27-
ReadObjectRangeRequest request("bucket", "object");
28-
auto settings = GetDownloadChecksumSettings(request, Options{});
27+
auto settings = GetDownloadChecksumSettings(Options{});
2928
EXPECT_TRUE(settings.md5);
3029
EXPECT_FALSE(settings.crc32c);
3130
}
3231

3332
TEST(ChecksumHelpersTest, DownloadChecksumSettingsOnlyNewOptions) {
34-
ReadObjectRangeRequest request("bucket", "object");
3533
auto settings = GetDownloadChecksumSettings(
36-
request,
3734
Options{}.set<DownloadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
3835
EXPECT_FALSE(settings.md5);
3936
EXPECT_TRUE(settings.crc32c);
4037

4138
settings = GetDownloadChecksumSettings(
42-
request, Options{}.set<DownloadChecksumValidationOption>(
43-
ChecksumAlgorithm::kCrc32c));
39+
Options{}.set<DownloadChecksumValidationOption>(
40+
ChecksumAlgorithm::kCrc32c));
4441
EXPECT_TRUE(settings.md5);
4542
EXPECT_FALSE(settings.crc32c);
4643

4744
settings = GetDownloadChecksumSettings(
48-
request, Options{}.set<DownloadChecksumValidationOption>(
49-
ChecksumAlgorithm::kNone));
45+
Options{}.set<DownloadChecksumValidationOption>(
46+
ChecksumAlgorithm::kNone));
5047
EXPECT_TRUE(settings.md5);
5148
EXPECT_TRUE(settings.crc32c);
52-
53-
54-
}
55-
56-
TEST(ChecksumHelpersTest, DownloadChecksumSettingsOnlyOldOptions) {
57-
ReadObjectRangeRequest request("bucket", "object");
58-
request.set_option(DisableMD5Hash(true));
59-
request.set_option(DisableCrc32cChecksum(true));
60-
auto settings = GetDownloadChecksumSettings(request, Options{});
61-
EXPECT_TRUE(settings.md5);
62-
EXPECT_TRUE(settings.crc32c);
63-
64-
request.set_option(DisableMD5Hash(false));
65-
request.set_option(DisableCrc32cChecksum(false));
66-
settings = GetDownloadChecksumSettings(request, Options{});
67-
EXPECT_FALSE(settings.md5);
68-
EXPECT_FALSE(settings.crc32c);
69-
}
70-
71-
TEST(ChecksumHelpersTest, DownloadChecksumSettingsOverride) {
72-
ReadObjectRangeRequest request("bucket", "object");
73-
request.set_option(DisableMD5Hash(true));
74-
request.set_option(DisableCrc32cChecksum(false));
75-
auto settings = GetDownloadChecksumSettings(
76-
request,
77-
Options{}.set<DownloadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
78-
EXPECT_TRUE(settings.md5);
79-
EXPECT_FALSE(settings.crc32c);
80-
81-
request.set_option(DisableMD5Hash(false));
82-
request.set_option(DisableCrc32cChecksum(true));
83-
settings = GetDownloadChecksumSettings(
84-
request,
85-
Options{}.set<DownloadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
86-
EXPECT_FALSE(settings.md5);
87-
EXPECT_TRUE(settings.crc32c);
88-
89-
request.set_option(DisableMD5Hash(true));
90-
request.set_option(DisableCrc32cChecksum(false));
91-
settings = GetDownloadChecksumSettings(
92-
request, Options{}.set<DownloadChecksumValidationOption>(
93-
ChecksumAlgorithm::kNone));
94-
EXPECT_TRUE(settings.md5);
95-
EXPECT_FALSE(settings.crc32c);
9649
}
9750

9851
TEST(ChecksumHelpersTest, UploadChecksumSettingsDefaults) {
99-
InsertObjectMediaRequest request("bucket", "object", "contents");
100-
auto settings = GetUploadChecksumSettings(request, Options{});
52+
auto settings = GetUploadChecksumSettings(Options{});
10153
EXPECT_TRUE(settings.md5);
10254
EXPECT_FALSE(settings.crc32c);
10355
}
10456

10557
TEST(ChecksumHelpersTest, UploadChecksumSettingsOnlyNewOptions) {
106-
InsertObjectMediaRequest request("bucket", "object", "contents");
10758
auto settings = GetUploadChecksumSettings(
108-
request,
10959
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
11060
EXPECT_FALSE(settings.md5);
11161
EXPECT_TRUE(settings.crc32c);
11262

11363
settings = GetUploadChecksumSettings(
114-
request, Options{}.set<UploadChecksumValidationOption>(
115-
ChecksumAlgorithm::kCrc32c));
64+
Options{}.set<UploadChecksumValidationOption>(
65+
ChecksumAlgorithm::kCrc32c));
11666
EXPECT_TRUE(settings.md5);
11767
EXPECT_FALSE(settings.crc32c);
11868

11969
settings = GetUploadChecksumSettings(
120-
request,
12170
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kNone));
12271
EXPECT_TRUE(settings.md5);
12372
EXPECT_TRUE(settings.crc32c);
124-
125-
126-
}
127-
128-
TEST(ChecksumHelpersTest, UploadChecksumSettingsOnlyOldOptions) {
129-
InsertObjectMediaRequest request("bucket", "object", "contents");
130-
request.set_option(DisableMD5Hash(true));
131-
request.set_option(DisableCrc32cChecksum(true));
132-
auto settings = GetUploadChecksumSettings(request, Options{});
133-
EXPECT_TRUE(settings.md5);
134-
EXPECT_TRUE(settings.crc32c);
135-
136-
request.set_option(DisableMD5Hash(false));
137-
request.set_option(DisableCrc32cChecksum(false));
138-
settings = GetUploadChecksumSettings(request, Options{});
139-
EXPECT_FALSE(settings.md5);
140-
EXPECT_FALSE(settings.crc32c);
141-
}
142-
143-
TEST(ChecksumHelpersTest, UploadChecksumSettingsOverride) {
144-
InsertObjectMediaRequest request("bucket", "object", "contents");
145-
request.set_option(DisableMD5Hash(true));
146-
request.set_option(DisableCrc32cChecksum(false));
147-
auto settings = GetUploadChecksumSettings(
148-
request,
149-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
150-
EXPECT_TRUE(settings.md5);
151-
EXPECT_FALSE(settings.crc32c);
152-
153-
request.set_option(DisableMD5Hash(false));
154-
request.set_option(DisableCrc32cChecksum(true));
155-
settings = GetUploadChecksumSettings(
156-
request,
157-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kMD5));
158-
EXPECT_FALSE(settings.md5);
159-
EXPECT_TRUE(settings.crc32c);
160-
161-
request.set_option(DisableMD5Hash(true));
162-
request.set_option(DisableCrc32cChecksum(false));
163-
settings = GetUploadChecksumSettings(
164-
request,
165-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kNone));
166-
EXPECT_TRUE(settings.md5);
167-
EXPECT_FALSE(settings.crc32c);
16873
}
16974

17075
} // namespace

0 commit comments

Comments
 (0)