Changeset 6816 for trunk/UNIT_TESTER/test_global.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)

Location:

trunk/UNIT_TESTER

Files:

• . (modified) (1 prop)
• test_global.h (copied) (copied from branches/refactor/UNIT_TESTER/test_global.h) (2 diffs)

trunk/UNIT_TESTER

@@ -5 +5 @@
 *.gcno
 logs
+test_environment

@@ -5 +5 @@
 *.gcno
 logs
+test_environment

trunk/UNIT_TESTER/test_global.h

@@ -20 +20 @@
 #include <cstdio>
 #endif
+#ifndef _CPP_CERRNO
+#include <cerrno>
+#endif
+#ifndef _CPP_CSTRING
+#include <cstring>
+#endif
 
+#if (UNIT_TESTS == 1)
+
+# if defined(DEVEL_RELEASE)
+#  error Unit testing not allowed in release
+# endif
+
+# ifdef __cplusplus
+
+#  define SET_ASSERTION_FAILED_FLAG() arb_test::test_data().assertion_failed = true  
+#  define PRINT_ASSERTION_FAILED_MSG(cond) arb_test::GlobalTestData::assertfailmsg(__FILE__, __LINE__, #cond)  
+
+# else
+#  define SET_ASSERTION_FAILED_FLAG() // impossible in C (assertions in C code will be handled like normal SEGV)
+#  define PRINT_ASSERTION_FAILED_MSG(cond)                      \
+    do {                                                        \
+        fflush(stdout);                                         \
+        fflush(stderr);                                         \
+        fprintf(stderr, "%s:%i: Assertion '%s' failed [C]\n",   \
+                __FILE__, __LINE__, #cond);                     \
+        fflush(stderr);                                         \
+    } while(0)
+# endif
+
+# define TRIGGER_ASSERTION()                            \
+    do {                                                \
+        SET_ASSERTION_FAILED_FLAG();                    \
+        ARB_SIGSEGV(0);                                 \
+    } while(0)
 
 namespace arb_test {
+    class FlushedOutputNoLF {
+        inline void flushall() { fflush(stdout); fflush(stderr); }
+    public:
+        FlushedOutputNoLF() { flushall(); }
+        ~FlushedOutputNoLF() { flushall(); }
+    };
+    struct FlushedOutput : public FlushedOutputNoLF {
+        ~FlushedOutput() { fputc('\n', stderr); }
+    };
+
     class GlobalTestData {
         GlobalTestData()
@@ -51 +95 @@
         static GlobalTestData& get_instance() { return *instance(false); }
         static void erase_instance() { instance(true); }
+        
+        static void assertfailmsg(const char *filename, int lineno, const char *condition) {
+            FlushedOutput yes;
+            fprintf(stderr, "%s:%i: Assertion '%s' failed", filename, lineno, condition);
+        }
     };
 
     inline GlobalTestData& test_data() { return GlobalTestData::get_instance(); }
+};
 
-    
-    class FlushedOutput {
-        inline void flushall() { fflush(stdout); fflush(stderr); }
-    public:
-        FlushedOutput() { flushall(); }
-        ~FlushedOutput() { flushall(); }
-        
-#define VPRINTFORMAT(format) do { va_list parg; va_start(parg, format); vfprintf(stderr, format, parg); va_end(parg); } while(0)
-    
-        static void printf(const char *format, ...) __attribute__((format(printf, 1, 2))) {
-            FlushedOutput yes;
-            VPRINTFORMAT(format);
-        }
-        static void messagef(const char *filename, int lineno, const char *format, ...) __attribute__((format(printf, 3, 4))) {
-            FlushedOutput yes;
-            fprintf(stderr, "%s:%i: ", filename, lineno);
-            fputc('\n', stderr);
-            VPRINTFORMAT(format);
-        }
-        static void warningf(const char *filename, int lineno, const char *format, ...) __attribute__((format(printf, 3, 4))) {
-            GlobalTestData& global = test_data();
-            if (global.show_warnings) {
-                FlushedOutput yes;
-                fprintf(stderr, "%s:%i: Warning: ", filename, lineno);
-                VPRINTFORMAT(format);
-                fputc('\n', stderr);
-                global.warnings++;
-            }
-        }
-        static void errorf(const char *filename, int lineno, const char *format, ...) __attribute__((format(printf, 3, 4))) {
-            FlushedOutput yes;
-            fprintf(stderr, "%s:%i: Error: ", filename, lineno);
-            VPRINTFORMAT(format);
-            fputc('\n', stderr);
-        }
-#undef VPRINTFORMAT
-    };
+// --------------------------------------------------------------------------------
 
-};
+// special assert for unit tests (additionally to SEGV it sets a global flag)
+# define test_assert(cond)                      \
+    do {                                        \
+        if (!(cond)) {                          \
+            PRINT_ASSERTION_FAILED_MSG(cond);   \
+            TRIGGER_ASSERTION();                \
+        }                                       \
+    } while(0)
+
+
+// redefine arb_assert with test_assert when compiling for unit tests
+# if defined(ASSERTION_USED)
+#  undef arb_assert
+#  define arb_assert(cond) test_assert(cond)
+# endif
+
+#else // UNIT_TESTS != 1
+#error test_global.h may only be included if UNIT_TESTS is 1
+#endif
 
 #else

@@ -5 +5 @@
 *.gcno
 logs
+test_environment