Changeset 6757

Timestamp:

04/09/10 11:43:48 (17 months ago)

Author:

westram

Message:

• moved file compare to test_unit.h

Location:

branches/refactor

Files:

• ARBDB/ad_save_load.cxx (modified) (3 diffs)
• UNIT_TESTER/test_unit.h (modified) (2 diffs)

branches/refactor/ARBDB/ad_save_load.cxx

@@ -1293 +1293 @@
 #include <test_unit.h>
 
-static bool files_are_equal(const char *file1, const char *file2) {
-    GB_ERROR   error     = NULL;
-    FILE      *fp1       = fopen(file1, "rb");
-
-    // @@@ FIXME:  use GB_IO_error() here later
-    if (!fp1) error = GBS_global_string("can't open '%s'", file1);
-    else {
-        FILE *fp2 = fopen(file2, "rb");
-        if (!fp2) error = GBS_global_string("can't open '%s'", file2);
-        else {
-            const int BLOCKSIZE = 4096;
-            char *buf1 = (char*)malloc(BLOCKSIZE);
-            char *buf2 = (char*)malloc(BLOCKSIZE);
-
-            while (!error) {
-                int read1 = fread(buf1, 1, BLOCKSIZE, fp1);
-                int read2 = fread(buf2, 1, BLOCKSIZE, fp2);
-
-                if (read1 != read2) error = "filesizes differ";
-                else {
-                    if (!read1) break; // done
-                    if (memcmp(buf1, buf2, read1) != 0) error = "content differs";
-                }
-            }
-            free(buf2);
-            free(buf1);
-            fclose(fp2);
-        }
-        fclose(fp1);
-    }
-
-    if (error) TEST_WARNING("%s", GBS_global_string("files_are_equal(%s, %s): %s", file1, file2, error));
-    return !error;
-}
-
 #define SAVE_AND_COMPARE(gbd, save_as, savetype, compare_with) \
     TEST_ASSERT_NO_ERROR(GB_save_as(gbd, save_as, savetype));  \
-    TEST_ASSERT(files_are_equal(save_as, compare_with))
+    TEST_ASSERT_FILES_EQUAL(save_as, compare_with)
 
 static GB_ERROR modify_db(GBDATA *gb_main) {
@@ -1342 +1307 @@
         if (!gb_entry) error = GB_await_error();
         else    error        = GB_write_string(gb_entry, "text");
+        // else    error        = GB_write_string(gb_entry, "bla"); // provoke error in file compare
     }
     return error;
@@ -1425 +1391 @@
 #endif // TEST_AUTO_UPDATE
 
-        TEST_ASSERT(files_are_equal("TEST_loadsave_quick.a00", "a2b.a00"));
-        TEST_ASSERT(files_are_equal("a2b.a00", "b2b.a00"));
+        TEST_ASSERT_FILES_EQUAL("TEST_loadsave_quick.a00", "a2b.a00");
+        TEST_ASSERT_FILES_EQUAL("a2b.a00", "b2b.a00");
 
         TEST_ASSERT_NO_ERROR(GB_save_quick_as(gb_a2b, "a2b.arb"));

branches/refactor/UNIT_TESTER/test_unit.h

@@ -178 +178 @@
     }
 
+    inline bool files_are_equal(const char *file1, const char *file2) {
+        const char *error = NULL;
+        FILE       *fp1   = fopen(file1, "rb");
+
+        if (!fp1) {
+            FlushedOutput::printf("can't open '%s'", file1);
+            error = "i/o error";
+        }
+        else {
+            FILE *fp2 = fopen(file2, "rb");
+            if (!fp2) {
+                FlushedOutput::printf("can't open '%s'", file2);
+                error = "i/o error";
+            }
+            else {
+                const int BLOCKSIZE = 4096;
+                char *buf1 = (char*)malloc(BLOCKSIZE);
+                char *buf2 = (char*)malloc(BLOCKSIZE);
+
+                while (!error) {
+                    int read1 = fread(buf1, 1, BLOCKSIZE, fp1);
+                    int read2 = fread(buf2, 1, BLOCKSIZE, fp2);
+
+                    if (read1 != read2) error = "filesizes differ";
+                    else {
+                        if (!read1) break; // done
+                        if (memcmp(buf1, buf2, read1) != 0) error = "content differs";
+                    }
+                }
+                free(buf2);
+                free(buf1);
+                fclose(fp2);
+            }
+            fclose(fp1);
+        }
+
+        if (error) FlushedOutput::printf("files_are_equal(%s, %s) fails: %s\n", file1, file2, error);
+        return !error;
+    }
+    
 };
 
@@ -350 +390 @@
 #define TEST_ASSERT_SIMILAR__BROKEN(t1,t2,epsilon) TEST_ASSERT__BROKEN(arb_test::is_similar(t1, t2, epsilon))
 
+#define TEST_ASSERT_FILES_EQUAL(f1,f2) TEST_ASSERT(arb_test::files_are_equal(f1,f2))
+
 #else
 #error test_unit.h included twice