Changeset 6816 for trunk/ARBDB/arb_assert.h

Timestamp:

09/09/10 22:40:57 (21 months ago)

Author:

westram

Message:

• unit-test improvements (merged [6757] [6758] [6759] [6760] [6761] [6762] [6764] [6791] [6795] [6798] [6799] [6800] [6801] [6802] [6809] [6810])
  • moved file compare to test_unit.h
  • fake report for skipped tests
  • added templates for char compare
  • perform minihexdump
  • flush output
  • added
    • TEST_ASSERT_FILES_EQUAL__BROKEN
    • TEST_ASSERT_ZERO_OR_SHOW_ERRNO
  • create a fake.patch if there are no changes
  • all code affecting assertions in UNIT_TESTS-mode went to test_global.h
    • overwrites arb_assert()
  • undefine UNIT_TESTS for GDE submakefiles (foreign code there)
  • arb_test::FlushedOutput::errorf raises assertion itself
  • test against I/O errors
  • moved test code
    • into class StaticCode?: class w/o functionality, only holds global static code.
    • assertfailmsg -> GlobalTestData?
  • refactored message printing
  • unit-tester switches to run directory itself
    • eliminates path hack for valgrind
  • control leak-check by variable
  • added global test-environment (does nothing yet)

Files:

• trunk/ARBDB/arb_assert.h (modified) (1 diff)

trunk/ARBDB/arb_assert.h

@@ -180 +180 @@
 
 #if (UNIT_TESTS == 1)
-# if defined(DEVEL_RELEASE)
-#  error Unit testing not allowed in release
-# else
-
-#  ifdef __cplusplus
-
-#ifndef _CPP_CSTDLIB
-#include <cstdlib>
-#endif
-
-namespace arb_test {
-    class GlobalTestData {
-        GlobalTestData()
-            : show_warnings(true),
-              assertion_failed(false),
-              warnings(0)
-        {}
-
-        static GlobalTestData *instance(bool erase) {
-            static GlobalTestData *data = 0; // singleton
-            if (erase) {
-                delete data;
-                data = 0;
-            }
-            else {
-                if (!data) data = new GlobalTestData;
-            }
-            return data;
-        }
-
-    public:
-        bool show_warnings;
-        bool assertion_failed;
-
-        // counters
-        size_t warnings;
-
-        static GlobalTestData& get_instance() { return *instance(false); }
-        static void erase_instance() { instance(true); }
-    };
-
-    inline GlobalTestData& test_data() { return GlobalTestData::get_instance(); }
-};
-
-#   define ASSERTION_HAS_FAILED() arb_test::test_data().assertion_failed = true  
-
-#  else
-#   define ASSERTION_HAS_FAILED() // impossible in C
-#  endif
-
-#  define test_assert(cond)                                     \
-    do {                                                        \
-        if (!(cond)) {                                          \
-            fflush(stdout);                                     \
-            fflush(stderr);                                     \
-            fprintf(stderr, "%s:%i: Assertion '%s' failed\n",   \
-                    __FILE__, __LINE__, #cond);                 \
-            fflush(stderr);                                     \
-            ASSERTION_HAS_FAILED();                             \
-            ARB_SIGSEGV(0);                                     \
-        }                                                       \
-    } while(0)
-
-#  if defined(ASSERTION_USED)
-#   undef arb_assert
-#   define arb_assert(cond) test_assert(cond)
-#  endif
-
-# endif
+#ifndef TEST_GLOBAL_H
+#include <test_global.h> // overrides arb_assert()!
+#endif
 #endif