diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-03-05 11:56:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-03-05 16:53:31 -0800 |
| commit | 838bccb515036433be3a55bec702336f170df38a (patch) | |
| tree | eb94a5e0cbab6fa3e8f5539fed44dd081f48fc04 /payload_generator/ab_generator_unittest.cc | |
| parent | 2af3457b7362c163b1896f7a4b6eee69f8439296 (diff) | |
| parent | 4eee53f5949d5e4cb43894b3d190daf635e31338 (diff) | |
Merge QP1A.190228.005
Change-Id: I546552fe26b74b96c18d929cdda1a527bbcdf4dc
Diffstat (limited to 'payload_generator/ab_generator_unittest.cc')
| -rw-r--r-- | payload_generator/ab_generator_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/payload_generator/ab_generator_unittest.cc b/payload_generator/ab_generator_unittest.cc index 2f8c0c60..270657ab 100644 --- a/payload_generator/ab_generator_unittest.cc +++ b/payload_generator/ab_generator_unittest.cc @@ -49,7 +49,7 @@ bool ExtentEquals(const Extent& ext, } // Tests splitting of a REPLACE/REPLACE_BZ operation. -void TestSplitReplaceOrReplaceBzOperation(InstallOperation_Type orig_type, +void TestSplitReplaceOrReplaceBzOperation(InstallOperation::Type orig_type, bool compressible) { const size_t op_ex1_start_block = 2; const size_t op_ex1_num_blocks = 2; @@ -124,7 +124,7 @@ void TestSplitReplaceOrReplaceBzOperation(InstallOperation_Type orig_type, version, aop, part_file.path(), &result_ops, &blob_file)); // Check the result. - InstallOperation_Type expected_type = + InstallOperation::Type expected_type = compressible ? InstallOperation::REPLACE_BZ : InstallOperation::REPLACE; ASSERT_EQ(2U, result_ops.size()); @@ -200,7 +200,7 @@ void TestSplitReplaceOrReplaceBzOperation(InstallOperation_Type orig_type, } // Tests merging of REPLACE/REPLACE_BZ operations. -void TestMergeReplaceOrReplaceBzOperations(InstallOperation_Type orig_type, +void TestMergeReplaceOrReplaceBzOperations(InstallOperation::Type orig_type, bool compressible) { const size_t first_op_num_blocks = 1; const size_t second_op_num_blocks = 2; @@ -287,7 +287,7 @@ void TestMergeReplaceOrReplaceBzOperations(InstallOperation_Type orig_type, &aops, version, 5, part_file.path(), &blob_file)); // Check the result. - InstallOperation_Type expected_op_type = + InstallOperation::Type expected_op_type = compressible ? InstallOperation::REPLACE_BZ : InstallOperation::REPLACE; EXPECT_EQ(1U, aops.size()); InstallOperation new_op = aops[0].op; |