Add TmpFile class and begin testing merge command via xd3_main_cmdline().

4 files changed, 100 insertions, 9 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index aa35a4a..2b61a46 100644
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -55,7 +55,7 @@ WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
 CFLAGS= -Wall -Wshadow -fno-builtin
 
 # $Format: "REL=$Xdelta3Version$" $
-REL=3.0t
+REL=3.0u_pre0
 
 RELDIR = xdelta$(REL)
 
@@ -67,6 +67,9 @@ EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \
         examples/compare_test.c examples/speed_test.c \
         examples/test.h examples/checksum_test.cc \
         xdelta3.py xdelta3_wrap.c xdelta3.wxs xdelta3.wxi \
+        testing/cmp.h testing/delta.h testing/file.h \
+        testing/modify.h testing/random.h testing/segment.h \
+        testing/sizes.h testing/test.h testing/Makefile \
         README readme.txt
 
 SWIG_FLAGS = -DXD3_DEBUG=1 \
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index 9511d1c..1205bc0 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -3,6 +3,7 @@ namespace regtest {
 
 class Block;
 class BlockIterator;
+class TmpFile;
 
 class FileSpec {
  public:
@@ -82,6 +83,8 @@ class FileSpec {
 
   void PrintData() const;
 
+  void WriteTmpFile(TmpFile *f) const;
+
   typedef BlockIterator iterator;
 
  private:
@@ -125,7 +128,9 @@ public:
     size_ = 0;
   }
 
-  void Block::Print() const;
+  void Print() const;
+
+  void WriteTmpFile(TmpFile *f) const;
 
 private:
   void SetSize(size_t size) {
@@ -208,6 +213,39 @@ private:
   size_t blksize_;
 };
 
+class TmpFile {
+public:
+  // TODO this is a little unportable!
+  TmpFile() {
+    static int static_counter = 0;
+    char buf[32];
+    snprintf(buf, 32, "/tmp/regtest.%d", static_counter++);
+    filename_.append(buf);
+    main_file_init(&file_);
+    CHECK_EQ(0, main_file_open(&file_, filename_.c_str(), XO_WRITE));
+  }
+
+  ~TmpFile() {
+    unlink(filename_.c_str());
+    main_file_cleanup(&file_);
+  }
+
+  void Append(const Block *block) {
+    CHECK_EQ(0, main_file_write(&file_, 
+                                block->Data(), block->Size(), 
+                                "tmpfile write failed"));
+  }
+
+  const char* Name() const {
+    CHECK_EQ(0, main_file_close(&file_));
+    return filename_.c_str();
+  }
+
+private:
+  string filename_;
+  mutable main_file file_;
+};
+
 inline void BlockIterator::Get(Block *block) const {
   xoff_t offset = blkno_ * blksize_;
   const SegmentMap &table = spec_.table_;
@@ -287,5 +325,17 @@ inline void Block::Print() const {
   DP(RINT "\n");
 }
 
+inline void FileSpec::WriteTmpFile(TmpFile *f) const {
+  Block block;
+  for (BlockIterator iter(*this); !iter.Done(); iter.Next()) {
+    iter.Get(&block);
+    f->Append(&block);
+  }
+}
+
+inline void Block::WriteTmpFile(TmpFile *f) const {
+  f->Append(this);
+}
+
 }  // namespace regtest
 
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 307d9e2..7da4110 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -31,8 +31,8 @@ struct TestOptions {
 
 // TODO! the smatcher setup isn't working, 
 void InMemoryEncodeDecode(const TestOptions &options,
-                          FileSpec &source_file, 
-                          FileSpec &target_file, 
+                          const FileSpec &source_file, 
+                          const FileSpec &target_file, 
                           Block *coded_data) {
   xd3_stream encode_stream;
   xd3_config encode_config;
@@ -42,6 +42,10 @@ void InMemoryEncodeDecode(const TestOptions &options,
   xd3_config decode_config;
   xd3_source decode_source;
 
+  if (coded_data) {
+    coded_data->Reset();
+  }
+
   memset(&encode_stream, 0, sizeof (encode_stream));
   memset(&encode_source, 0, sizeof (encode_source));
 
@@ -599,6 +603,39 @@ void TestNonBlockingProgress() {
   InMemoryEncodeDecode(options, spec1, spec2, NULL);
 }
 
+void FourWayMergeTest(const TestOptions &options,
+                      const FileSpec &spec0,
+                      const FileSpec &spec1,
+                      const FileSpec &spec2,
+                      const FileSpec &spec3) {
+  Block delta01, delta12, delta23;
+
+  InMemoryEncodeDecode(options, spec0, spec1, &delta01);
+  InMemoryEncodeDecode(options, spec1, spec2, &delta12);
+  InMemoryEncodeDecode(options, spec2, spec3, &delta23);
+
+  TmpFile f0, d01, d12, d23;
+
+  spec0.WriteTmpFile(&f0);
+  delta01.WriteTmpFile(&d01);
+  delta12.WriteTmpFile(&d12);
+  delta23.WriteTmpFile(&d23);
+
+  // Merge 2
+  TmpFile out;
+  const char* argv[] = {
+    "xdelta3",
+    "merge",
+    "-m", (char*)d01.Name(),
+    (char*)d12.Name(),
+    (char*)out.Name(),
+    NULL,
+  };
+
+  CHECK_EQ(0, xd3_main_cmdline(SIZEOF_ARRAY(argv) - 1, (char**)argv));
+  
+}
+
 void TestMergeCommand() {
   /* Repeat random-input testing for a number of iterations.
    * Test 2, 3, and 4-file scenarios (i.e., 1, 2, and 3-delta merges). */
@@ -651,11 +688,8 @@ void TestMergeCommand() {
       spec1.ModifyTo(ChangeListMutator(cl2), &spec2);
       spec2.ModifyTo(ChangeListMutator(cl3), &spec3);
 
-      Block delta01, delta12, delta23;
-
-      InMemoryEncodeDecode(options, spec0, spec1, &delta01);
-      InMemoryEncodeDecode(options, spec1, spec2, &delta12);
-      InMemoryEncodeDecode(options, spec2, spec3, &delta23);
+      FourWayMergeTest(options, spec0, spec1, spec2, spec3);
+      FourWayMergeTest(options, spec3, spec2, spec1, spec0);
     }
   }
 }
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index 968b8ca..32b62c0 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -28,6 +28,9 @@ do {if (!((x) OP (y))) {			       \
   abort(); \
     } } while (false)
 
+#include <string>
+using std::string;
+
 #include <iostream>
 using std::cerr;
 using std::endl;
@@ -73,6 +76,7 @@ using regtest::Modify1stByte;
 using regtest::FileSpec;
 using regtest::Block;
 using regtest::BlockIterator;
+using regtest::TmpFile;
 
 #include "cmp.h"
 using regtest::CmpDifferentBytes;