Merge branch 'master' into release.

Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
This commit is contained in:
Alexey Polyudov
2020-06-04 12:01:48 -07:00
98 changed files with 4136 additions and 718 deletions
+2 -2
View File
@@ -42,7 +42,7 @@ TEST(PayloadTest, SupportsByteArrayType) {
}
TEST(PayloadTest, SupportsFileType) {
InputFile* raw_file = new InputFile("/path/to/file", 0);
InputFile* raw_file = new InputFile(/*payload_id=*/23, 0);
std::unique_ptr<InputFile> file(raw_file);
Payload payload(std::move(file));
EXPECT_EQ(payload.GetType(), Payload::Type::kFile);
@@ -52,7 +52,7 @@ TEST(PayloadTest, SupportsFileType) {
}
TEST(PayloadTest, SupportsStreamType) {
InputFile* raw_file = new InputFile("/path/to/file", 0);
InputFile* raw_file = new InputFile(/*payload_id=*/17, 0);
std::unique_ptr<InputStream> stream(raw_file);
Payload payload(std::move(stream));
EXPECT_EQ(payload.GetType(), Payload::Type::kStream);