Fix the modify test.

3 files changed, 28 insertions, 13 deletions

diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index dae97de..b775f4f 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -211,8 +211,8 @@ inline void BlockIterator::Get(Block *block) const {
       gen.Rand32();
     }
     
-    for (size_t i = seg_offset; i < pos->second.length; i++) {
-      CHECK_LT(got, blksize_);
+    for (size_t i = seg_offset; 
+         i < pos->second.length && got < blksize_; i++) {
       block->data_[got++] = gen.Rand32();
     }
 
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 0e541ec..12499ba 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -255,14 +255,29 @@ void TestModifyMutator() {
 
   spec0.GenerateFixedSize(Constants::BLOCK_SIZE * 3);
 
-  ChangeList cl1;
-  cl1.push_back(Change(Change::MODIFY, Constants::BLOCK_SIZE, 0));
-  spec0.Print();
-  spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
-  spec1.Print();
-  CHECK_EQ(Constants::BLOCK_SIZE, CmpDifferentBytes(spec0, spec1));
-  InMemoryEncodeDecode(spec0, spec1);
+  struct {
+    size_t size;
+    size_t addr;
+  } test_cases[] = {
+    { Constants::BLOCK_SIZE, 0 },
+    { Constants::BLOCK_SIZE / 2, 1 },
+    { Constants::BLOCK_SIZE, 1 },
+    { Constants::BLOCK_SIZE * 2, 1 },
+  };
+
+  for (size_t i = 0; i < SIZEOF_ARRAY(test_cases); i++) {
+    ChangeList cl1;
+    cl1.push_back(Change(Change::MODIFY, test_cases[i].size, test_cases[i].addr));
+    spec0.Print();
+    spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
+    spec1.Print();
+    
+    size_t diff = CmpDifferentBytes(spec0, spec1);
+    CHECK_LE(diff, test_cases[i].size);
+    CHECK_GE(diff, test_cases[i].size - (2 * test_cases[i].size / 256));
 
+    InMemoryEncodeDecode(spec0, spec1);
+  }
 }
 
 int main(int argc, char **argv) {
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index 53692fa..12f6b34 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -15,15 +15,15 @@ extern "C" {
 
 #define CHECK_OP(x,y,OP) \
 do {if (!((x) OP (y))) {                               \
-  cerr << "Check failed: " << #x " " #OP " " #y << endl; \
-  cerr << "Expected: " << x << endl; \
-  cerr << "Actual: " << y << endl; \
+  cerr << __FILE__ << ":" << __LINE__ << " Check failed: " << #x " " #OP " " #y << endl; \
+  cerr << __FILE__ << ":" << __LINE__ << " Expected: " << x << endl; \
+  cerr << __FILE__ << ":" << __LINE__ << " Actual: " << y << endl; \
   abort(); \
     } } while (false)
 
 #define CHECK(x) \
   do {if (!(x)) {                                      \
-  cerr << "Check failed: " << #x << endl; \
+  cerr << __FILE__ << ":" << __LINE__ << " Check failed: " << #x << endl; \
   abort(); \
     } } while (false)