Add support for bsdiff of file system metadata blocks

delta_diff_generator_unittest.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+
 #include <set>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
+
 #include <gtest/gtest.h>
+
 #include "base/logging.h"

[adlr, 2010/12/15 03:11:23]

move the base headers up to the library section (w/ gtest) and use <> rather
than ""

[thieule, 2010/12/15 19:57:01]

Done.

+#include "base/string_util.h"
 #include "update_engine/cycle_breaker.h"
 #include "update_engine/delta_diff_generator.h"
 #include "update_engine/delta_performer.h"
 #include "update_engine/extent_ranges.h"
 #include "update_engine/graph_types.h"
 #include "update_engine/graph_utils.h"
 #include "update_engine/subprocess.h"
 #include "update_engine/test_utils.h"
 #include "update_engine/topological_sort.h"
 #include "update_engine/utils.h"
@@ skipping 680 matching lines @@
   FillWithData(&temp_data);
   EXPECT_TRUE(WriteFileVector(temp_dir + kFilename, temp_data));
   ScopedPathUnlinker filename_unlinker(temp_dir + kFilename);
 
   int fd;
   EXPECT_TRUE(utils::MakeTempFile("/tmp/AssignTempBlocksReuseTest.XXXXXX",
                                   NULL,
                                   &fd));
   ScopedFdCloser fd_closer(&fd);
   off_t data_file_size = 0;
-  
+
   EXPECT_TRUE(DeltaDiffGenerator::AssignTempBlocks(&graph,
                                                    temp_dir,
                                                    fd,
                                                    &data_file_size,
                                                    &op_indexes,
                                                    &reverse_op_indexes,
                                                    cuts));
   EXPECT_FALSE(graph[6].valid);
   EXPECT_FALSE(graph[7].valid);
   EXPECT_EQ(1, graph[1].op.src_extents_size());
   EXPECT_EQ(2, graph[1].op.src_extents(0).start_block());
   EXPECT_EQ(1, graph[1].op.src_extents(0).num_blocks());
   EXPECT_EQ(OP_REPLACE_BZ, graph[5].op.type());
 }
 
 TEST_F(DeltaDiffGeneratorTest, CreateScratchNodeTest) {
   Vertex vertex;
   DeltaDiffGenerator::CreateScratchNode(12, 34, &vertex);
   EXPECT_EQ(DeltaArchiveManifest_InstallOperation_Type_REPLACE_BZ,
             vertex.op.type());
   EXPECT_EQ(0, vertex.op.data_offset());
   EXPECT_EQ(0, vertex.op.data_length());
   EXPECT_EQ(1, vertex.op.dst_extents_size());
   EXPECT_EQ(12, vertex.op.dst_extents(0).start_block());
   EXPECT_EQ(34, vertex.op.dst_extents(0).num_blocks());
 }
 
 }  // namespace chromeos_update_engine