diff options
author | Samuel Huang <huangs@chromium.org> | 2018-06-21 15:50:22 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 19:59:48 -0700 |
commit | f35146e48edca6755e98749a2cb5cc00272d308b (patch) | |
tree | 62e88698cbb4f79fea0f7b10326961b0f665e0a8 /integration_test.cc | |
parent | 87dabe1110568bd11cd9044b1c5c49ab598bc2ad (diff) | |
download | zucchini-f35146e48edca6755e98749a2cb5cc00272d308b.tar.gz |
[Zucchini] Refactor Zucchini-gen in zucchini_io layer.
This CL moves Zucchini-gen invocation code from zucchini_commands.cc
(in target zucchini) to zucchini_integration.cc (in target zucchini_io)
to clean up layering in Zucchini API, i.e.:
- zucchini_lib: Operates on buffers only.
- zucchini_io: Adds files interface, uses memory-mapped I/O.
- zucchini: Stand-alone executable that parses command-line arguments.
Other changes:
- Rename zucchini_lib functions (zuchcini.h), to dedup names and
emphasize that these functions operate on buffers:
- GenerateEnsemble() -> GenerateBuffer(),
- GenerateEnsembleWithImposedMatches() -> GenerateBufferImposed(),
- GenerateRaw() -> GenerateBufferRaw(),
- Apply() -> ApplyBuffer().
These renames only affect Zucchini and various tests.
- Variable renames and parameter reordering in zucchini_integration.cc.
- Remove '-dd' param in help text of Zucchini-detect (was never ported
from Trunk, and has been recently deleted there as well).
- Replace all base::File&& with base::File.
- Miscellaneous cleanup for header include.
- Update README.md.
Change-Id: I835b80d4d3d7b291fa822a7a89dab225bf9171e9
Reviewed-on: https://chromium-review.googlesource.com/1105625
Reviewed-by: Samuel Huang <huangs@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569274}
NOKEYCHECK=True
GitOrigin-RevId: 9f0f325d6e2595deb8d50c77e0464946f3bf1ec1
Diffstat (limited to 'integration_test.cc')
-rw-r--r-- | integration_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/integration_test.cc b/integration_test.cc index c4c7004..e7df927 100644 --- a/integration_test.cc +++ b/integration_test.cc @@ -49,8 +49,8 @@ void TestGenApply(const std::string& old_filename, // Generate patch from "old" to "new". ASSERT_EQ(status::kStatusSuccess, - raw ? GenerateRaw(old_region, new_region, &patch_writer) - : GenerateEnsemble(old_region, new_region, &patch_writer)); + raw ? GenerateBufferRaw(old_region, new_region, &patch_writer) + : GenerateBuffer(old_region, new_region, &patch_writer)); size_t patch_size = patch_writer.SerializedSize(); EXPECT_GE(patch_size, 80U); // Minimum size is empty patch. @@ -73,9 +73,9 @@ void TestGenApply(const std::string& old_filename, // Apply patch to "old" to get "patched new", ensure it's identical to "new". std::vector<uint8_t> patched_new_buffer(new_region.size()); - ASSERT_EQ(status::kStatusSuccess, - Apply(old_region, *patch_reader, - {patched_new_buffer.data(), patched_new_buffer.size()})); + ASSERT_EQ(status::kStatusSuccess, ApplyBuffer(old_region, *patch_reader, + {patched_new_buffer.data(), + patched_new_buffer.size()})); // Note that |new_region| and |patched_new_buffer| are the same size. EXPECT_TRUE(std::equal(new_region.begin(), new_region.end(), |