Test for encode/decode w/ single first-byte difference. Uncovered a couple of

incorrect assertions in xdelta3 proper.  More tests coming...

3 files changed, 72 insertions, 19 deletions

diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index f64111e..3b4d4c6 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -68,8 +68,8 @@ void InMemoryEncodeDecode(FileSpec &source_file, FileSpec &target_file) {
       ret = xd3_decode_input(&decode_stream);
     }
 
-    DP(RINT "%s = %s\n", encoding ? "encoding" : "decoding",
-       xd3_strerror(ret));
+    //DP(RINT "%s = %s\n", encoding ? "encoding" : "decoding",
+    //   xd3_strerror(ret));
 
     switch (ret) {
     case XD3_OUTPUT:
@@ -117,7 +117,7 @@ void InMemoryEncodeDecode(FileSpec &source_file, FileSpec &target_file) {
         encoding = false;
       } else {
         CHECK_EQ(0, CmpDifferentBlockBytes(decoded_block, target_block));
-        DP(RINT "verified block %"Q"u\n", target_iterator.Blkno());
+        //DP(RINT "verified block %"Q"u\n", target_iterator.Blkno());
         decoded_block.Reset();
         encoding = true;
       }
@@ -236,23 +236,18 @@ void TestFirstByte() {
   spec0.GenerateFixedSize(Constants::BLOCK_SIZE + 1);
   spec0.ModifyTo<Modify1stByte>(&spec1);
   CHECK_EQ(1, CmpDifferentBytes(spec0, spec1));
-}
-
-void TestBasicEncodeDecode() {
-  MTRandom rand;
-  FileSpec spec0(&rand);
-  FileSpec spec1(&rand);
-  spec0.GenerateFixedSize(1024);
-  spec0.ModifyTo<Modify1stByte>(&spec1);
-  InMemoryEncodeDecode(spec0, spec1);
 
-  spec0.GenerateFixedSize(Constants::BLOCK_SIZE);
-  spec0.ModifyTo<Modify1stByte>(&spec1);
-  InMemoryEncodeDecode(spec0, spec1);
+  SizeIterator<size_t, SmallSizes> si(&rand, 20);
 
-  spec0.GenerateFixedSize(Constants::BLOCK_SIZE * 2);
-  spec0.ModifyTo<Modify1stByte>(&spec1);
-  InMemoryEncodeDecode(spec0, spec1);
+  for (; !si.Done(); si.Next()) {
+    size_t size = si.Get();
+    if (size == 0) {
+      continue;
+    }
+    spec0.GenerateFixedSize(size);
+    spec0.ModifyTo<Modify1stByte>(&spec1);
+    InMemoryEncodeDecode(spec0, spec1);
+  }
 }
 
 int main(int argc, char **argv) {
@@ -260,7 +255,6 @@ int main(int argc, char **argv) {
   TEST(TestRandomNumbers);
   TEST(TestRandomFile);
   TEST(TestFirstByte);
-  TEST(TestBasicEncodeDecode);
   return 0;
 }
 
diff --git a/xdelta3/testing/sizes.h b/xdelta3/testing/sizes.h
new file mode 100644
index 0000000..8913baa
--- /dev/null
+++ b/xdelta3/testing/sizes.h
@@ -0,0 +1,55 @@
+// -*- Mode: C++ -*-
+namespace regtest {
+
+template <typename T, typename U>
+class SizeIterator {
+ public:
+  SizeIterator(MTRandom *rand, size_t howmany)
+    : rand_(rand),
+      count_(0),
+      fixed_(U::sizes),
+      fixed_size_(SIZEOF_ARRAY(U::sizes)),
+      howmany_(howmany) { }
+
+  T Get() {
+    if (count_ < fixed_size_) {
+      return fixed_[count_];
+    }
+    return rand_->Rand<T>() % U::max_value;
+  }
+
+  bool Done() {
+    return count_ >= howmany_;
+  }
+
+  void Next() {
+    count_++;
+  }
+
+ private:
+  MTRandom *rand_;
+  size_t count_;
+  T* fixed_;
+  size_t fixed_size_;
+  size_t howmany_;
+};
+
+class SmallSizes {
+public:
+  static size_t sizes[];
+  static size_t max_value;
+};
+
+size_t SmallSizes::sizes[] = {
+  0, 1, 1024, 3333, 
+  Constants::BLOCK_SIZE - 3333,
+  Constants::BLOCK_SIZE,
+  Constants::BLOCK_SIZE + 3333,
+  2 * Constants::BLOCK_SIZE - 3333,
+  2 * Constants::BLOCK_SIZE,
+  2 * Constants::BLOCK_SIZE + 3333,
+};
+
+size_t SmallSizes::max_value = Constants::BLOCK_SIZE * 3;
+
+}  // namespace regtest
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index 74767fd..4d2dc8a 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -59,3 +59,7 @@ using regtest::Modify1stByte;
 
 #include "cmp.h"
 using regtest::CmpDifferentBytes;
+
+#include "sizes.h"
+using regtest::SizeIterator;
+using regtest::SmallSizes;