Changeset 7975

Timestamp:

22/09/11 14:37:23 (8 months ago)

Author:

westram

Message:

• added TEST_ASSERT_MEM_EQUAL

Location:

branches/dev

Files:

• ARBDB/ad_prot.h (modified) (1 diff)
• ARBDB/adfile.cxx (modified) (3 diffs)
• UNIT_TESTER/test_unit.h (modified) (2 diffs)

branches/dev/ARBDB/ad_prot.h

@@ -169 +169 @@
 void GBS_read_dir(StrArray &names, const char *dir, const char *mask);
 bool GB_test_textfile_difflines(const char *file1, const char *file2, int expected_difflines, int special_mode);
+size_t GB_test_mem_equal(const unsigned char *buf1, const unsigned char *buf2, size_t common);
 bool GB_test_files_equal(const char *file1, const char *file2);
 void GBT_transform_names(StrArray &dest, const StrArray &source, char *transform (const char *, void *), void *client_data);

branches/dev/ARBDB/adfile.cxx

@@ -566 +566 @@
 }
 
+size_t GB_test_mem_equal(const unsigned char *buf1, const unsigned char *buf2, size_t common) {
+    size_t equal_bytes;
+    if (memcmp(buf1, buf2, common) == 0) {
+        equal_bytes = common;
+    }
+    else {
+        equal_bytes = 0;
+        size_t x    = 0;    // position inside memory
+        while (buf1[x] == buf2[x]) {
+            x++;
+            equal_bytes++;
+        }
+
+        const size_t DUMP       = 7;
+        size_t       y1         = x >= DUMP ? x-DUMP : 0;
+        size_t       y2         = (x+DUMP)>common ? common : (x+DUMP);
+        size_t       blockstart = equal_bytes-x;
+
+        for (size_t y = y1; y <= y2; y++) {
+            fprintf(stderr, "[0x%04zx]", blockstart+y);
+            arb_test::print_pair(buf1[y], buf2[y]);
+            fputc(' ', stderr);
+            arb_test::print_hex_pair(buf1[y], buf2[y]);
+            if (x == y) fputs("                     <- diff", stderr);
+            fputc('\n', stderr);
+        }
+        if (y2 == common) {
+            fputs("[end of block - truncated]\n", stderr);
+        }
+    }
+    return equal_bytes;
+}
+
 bool GB_test_files_equal(const char *file1, const char *file2) {
     const char        *error = NULL;
@@ -587 +620 @@
 
             while (!error) {
-                int read1  = fread(buf1, 1, BLOCKSIZE, fp1);
-                int read2  = fread(buf2, 1, BLOCKSIZE, fp2);
-                int common = read1<read2 ? read1 : read2;
+                int    read1  = fread(buf1, 1, BLOCKSIZE, fp1);
+                int    read2  = fread(buf2, 1, BLOCKSIZE, fp2);
+                size_t common = read1<read2 ? read1 : read2;
 
                 if (!common) {
@@ -596 +629 @@
                 }
 
-                if (memcmp(buf1, buf2, common) == 0) {
-                    equal_bytes += common;
-                }
-                else {
-                    int x = 0;
-                    while (buf1[x] == buf2[x]) {
-                        x++;
-                        equal_bytes++;
-                    }
+                size_t thiseq = GB_test_mem_equal(buf1, buf2, common);
+                if (thiseq != common) {
                     error = "content differs";
-
-                    // x is the position inside the current block
-                    const int DUMP       = 7;
-                    int       y1         = x >= DUMP ? x-DUMP : 0;
-                    int       y2         = (x+DUMP)>common ? common : (x+DUMP);
-                    int       blockstart = equal_bytes-x;
-
-                    for (int y = y1; y <= y2; y++) {
-                        fprintf(stderr, "[0x%04x]", blockstart+y);
-                        arb_test::print_pair(buf1[y], buf2[y]);
-                        fputc(' ', stderr);
-                        arb_test::print_hex_pair(buf1[y], buf2[y]);
-                        if (x == y) fputs("                     <- diff", stderr);
-                        fputc('\n', stderr);
-                    }
-                    if (y2 == common) {
-                        fputs("[end of block - truncated]\n", stderr);
-                    }
-                }
+                }
+                equal_bytes += thiseq;
             }
 

branches/dev/UNIT_TESTER/test_unit.h

@@ -574 +574 @@
 
 namespace arb_test {
+    inline bool test_mem_equal(const void *mem1, const void *mem2, size_t size) {
+        FlushedOutputNoLF yes;
+        return GB_test_mem_equal(reinterpret_cast<const unsigned char *>(mem1),
+                                 reinterpret_cast<const unsigned char *>(mem2), size) == size;
+    }
     inline bool test_files_equal(const char *file1, const char *file2) {
         FlushedOutputNoLF yes;
@@ -596 +601 @@
 #define TEST_ASSERT_FILES_EQUAL(f1,f2)         TEST_ASSERT(arb_test::test_files_equal(f1,f2))
 #define TEST_ASSERT_FILES_EQUAL__BROKEN(f1,f2) TEST_ASSERT__BROKEN(arb_test::test_files_equal(f1,f2))
+
+#define TEST_ASSERT_MEM_EQUAL(m1,m2,size)         TEST_ASSERT(arb_test::test_mem_equal(m1,m2,size))
+#define TEST_ASSERT_MEM_EQUAL__BROKEN(m1,m2,size) TEST_ASSERT__BROKEN(arb_test::test_mem_equal(m1,m2,size))
 
 #define TEST_ASSERT_TEXTFILES_EQUAL(f1,f2)         TEST_ASSERT_TEXTFILE_DIFFLINES(f1,f2,0)