Testing for issue 79. TODO around xdelta3.c:3926 successful.

5 files changed, 67 insertions, 19 deletions

diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index f06da2b..9bfbf4c 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -258,6 +258,10 @@ public:
     return blkno_;
   }
 
+  xoff_t Blocks() const {
+    return spec_.Blocks(blksize_);
+  }
+
   xoff_t Offset() const {
     return blkno_ * blksize_;
   }
@@ -274,8 +278,8 @@ public:
     xoff_t blocks = spec_.Blocks(blksize_);
     xoff_t size = spec_.Size();
 
-    CHECK((blkno_ < blocks) ||
-          (blkno_ == blocks && size % blksize_ == 0));
+    DCHECK((blkno_ < blocks) ||
+           (blkno_ == blocks && size % blksize_ == 0));
 
     if (blkno_ == blocks) {
       return 0;
diff --git a/xdelta3/testing/modify.h b/xdelta3/testing/modify.h
index 4b2cea8..baa8861 100644
--- a/xdelta3/testing/modify.h
+++ b/xdelta3/testing/modify.h
@@ -152,6 +152,8 @@ public:
       }
     }
 
+    // This check verifies that the modify does not extend past the
+    // source_table EOF.
     CHECK_LE(m_end, i_end);
   }
 
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 910a8db..7618b38 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -64,21 +64,30 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
   xd3_set_source (&encode_stream, &encode_source);
   xd3_set_source (&decode_stream, &decode_source);
 
-  BlockIterator source_iterator(source_file);
-  BlockIterator target_iterator(target_file);
+  BlockIterator source_iterator(source_file, Constants::BLOCK_SIZE);
+  BlockIterator target_iterator(target_file, Constants::READ_SIZE);
   Block encode_source_block, decode_source_block;
   Block decoded_block, target_block;
   bool encoding = true;
   bool done = false;
+  bool done_after_input = false;
 
-  DP(RINT "source %"Q"u target %"Q"u\n",
-     source_file.Size(), target_file.Size());
+  DP(RINT "source %"Q"u[%"Q"u] target %"Q"u[%lu] winsize %lu\n",
+     source_file.Size(), Constants::BLOCK_SIZE,
+     target_file.Size(), Constants::READ_SIZE,
+     Constants::WINDOW_SIZE);
 
   while (!done) {
     target_iterator.Get(&target_block);
 
-    if (target_file.Blocks() == 0 ||
-        target_iterator.Blkno() == (target_file.Blocks() - 1)) {
+    xoff_t blks = target_iterator.Blocks();
+
+    //DP(RINT "target in %s: %llu..%llu %"Q"u(%"Q"u) verified %"Q"u\n",
+    //   encoding ? "encoding" : "decoding",
+    //   target_iterator.Offset(), target_iterator.Offset() + target_block.Size(),
+    //   target_iterator.Blkno(), blks, verified_bytes);
+
+    if (blks == 0 || target_iterator.Blkno() == (blks - 1)) {
       xd3_set_flags(&encode_stream, XD3_FLUSH | encode_stream.flags);
     }
 
@@ -93,7 +102,7 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
       ret = xd3_decode_input(&decode_stream);
     }
 
-    //DP(RINT "%s = %s\n", encoding ? "encoding" : "decoding",
+    //DP(RINT "%s = %s\n", encoding ? "E " : " D",
     //   xd3_strerror(ret));
 
     switch (ret) {
@@ -141,6 +150,11 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
         encoding = true;
         goto process;
       } else {
+        if (done_after_input) {
+          done = true;
+          continue;
+        }
+
         if (target_block.Size() < target_iterator.BlockSize()) {
           encoding = false;
         } else {
@@ -152,8 +166,7 @@ void InMemoryEncodeDecode(const FileSpec &source_file,
     case XD3_WINFINISH:
       if (encoding) {
         if (encode_stream.flags & XD3_FLUSH) {
-          done = true;
-          continue;
+          done_after_input = true;
         }
         encoding = false;
       } else {
@@ -285,7 +298,7 @@ void TestFirstByte() {
   spec0.ModifyTo(Modify1stByte(), &spec1);
   CHECK_EQ(1, CmpDifferentBytes(spec0, spec1));
 
-  SizeIterator<size_t, Sizes> si(&rand, 0);
+  SizeIterator<size_t, Sizes> si(&rand, Constants::TEST_ROUNDS);
 
   for (; !si.Done(); si.Next()) {
     size_t size = si.Get();
@@ -517,7 +530,7 @@ void TestNonBlockingProgress() {
   FileSpec spec1(&rand);
   FileSpec spec2(&rand);
 
-  spec0.GenerateFixedSize(Constants::BLOCK_SIZE * 2);
+  spec0.GenerateFixedSize(Constants::BLOCK_SIZE * 3);
 
   // This is a lazy target match
   Change ct(Change::OVERWRITE, 22, 
@@ -581,7 +594,7 @@ void TestBlockInMemory() {
   InMemoryEncodeDecode(spec0, spec1, &block);
 
   Delta delta(block);
-  CHECK_EQ(1, delta.Windows());
+  CHECK_EQ(spec1.Blocks(Constants::WINDOW_SIZE), delta.Windows());
 }
 
 void FourWayMergeTest(const FileSpec &spec0,
@@ -616,7 +629,7 @@ void FourWayMergeTest(const FileSpec &spec0,
   mcmd.push_back(out.Name());
   mcmd.push_back(NULL);
 
-  DP(RINT "Running one merge: %s\n", CommandToString(mcmd).c_str());
+  //DP(RINT "Running one merge: %s\n", CommandToString(mcmd).c_str());
   CHECK_EQ(0, xd3_main_cmdline(mcmd.size() - 1, 
                                const_cast<char**>(&mcmd[0])));
 
@@ -786,6 +799,7 @@ int main(int argc, char **argv) {
   UnitTest<SmallBlock>();
   MainTest<SmallBlock>();
   MainTest<MixedBlock>();
+  MainTest<PrimeBlock>();
   MainTest<OversizeBlock>();
   MainTest<LargeBlock>();
   return 0;
diff --git a/xdelta3/testing/sizes.h b/xdelta3/testing/sizes.h
index 7048c34..a8f79a6 100644
--- a/xdelta3/testing/sizes.h
+++ b/xdelta3/testing/sizes.h
@@ -66,39 +66,65 @@ size_t LargeSizes::sizes[] = {
 
 size_t LargeSizes::max_value = 1<<20;
 
+// Base constants
+struct BaseConstants {
+  static const size_t TEST_ROUNDS;
+};
+
+const size_t BaseConstants::TEST_ROUNDS = 10;
+
 // Regtest<> arguments
-struct SmallBlock {
+struct SmallBlock : public BaseConstants {
   static const xoff_t BLOCK_SIZE;
   static const size_t WINDOW_SIZE;
+  static const size_t READ_SIZE;
   typedef SmallSizes Sizes;
 };
 
+const size_t SmallBlock::READ_SIZE = 1<<7;
 const xoff_t SmallBlock::BLOCK_SIZE = 1<<7;
 const size_t SmallBlock::WINDOW_SIZE = 1<<7;
 
-struct LargeBlock {
+struct LargeBlock : public BaseConstants {
   static const xoff_t BLOCK_SIZE;
   static const size_t WINDOW_SIZE;
+  static const size_t READ_SIZE;
   typedef LargeSizes Sizes;
 };
 
+const size_t LargeBlock::READ_SIZE = (1 << 20);
 const xoff_t LargeBlock::BLOCK_SIZE = (1 << 20);
 const size_t LargeBlock::WINDOW_SIZE = (1 << 20);
 
-struct MixedBlock {
+struct MixedBlock : public BaseConstants {
   static const xoff_t BLOCK_SIZE;
   static const size_t WINDOW_SIZE;
+  static const size_t READ_SIZE;
   typedef SmallSizes Sizes;
 };
 
+const size_t MixedBlock::READ_SIZE = 1<<6;
 const xoff_t MixedBlock::BLOCK_SIZE = 1<<7;
 const size_t MixedBlock::WINDOW_SIZE = 1<<8;
 
-struct OversizeBlock {
+struct OversizeBlock : public BaseConstants {
   static const xoff_t BLOCK_SIZE;
   static const size_t WINDOW_SIZE;
+  static const size_t READ_SIZE;
   typedef SmallSizes Sizes;
 };
 
+const size_t OversizeBlock::READ_SIZE = (1<<6) + (1<<7);
 const xoff_t OversizeBlock::BLOCK_SIZE = 1<<8;
 const size_t OversizeBlock::WINDOW_SIZE = 1<<7;
+
+struct PrimeBlock : public BaseConstants {
+  static const xoff_t BLOCK_SIZE;
+  static const size_t WINDOW_SIZE;
+  static const size_t READ_SIZE;
+  typedef SmallSizes Sizes;
+};
+
+const size_t PrimeBlock::READ_SIZE = 71;
+const xoff_t PrimeBlock::BLOCK_SIZE = 7 * 127;
+const size_t PrimeBlock::WINDOW_SIZE = 73;
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index 8a6d865..d10ec58 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -32,6 +32,8 @@ extern "C" {
   abort(); \
     } } while (false)
 
+#define DCHECK(x)
+
 #include <string>
 using std::string;